16 files changed, 36 insertions, 8 deletions

diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
index b6e067cc..5c4ca29c 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
@@ -102,6 +102,7 @@ config:
         # feed_limit: 'Number of items in the feed'
     form_user:
         # two_factor_description: "Enabling two factor authentication means you'll receive an email with a code OR need to use an OTP app (like Google Authenticator, Authy or FreeOTP) to get a one time code on every new untrusted connection. You can't choose both option."
+        # login_label: 'Login (can not be changed)'
         name_label: 'Navn'
         email_label: 'Emailadresse'
         two_factor:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
index 072cac0a..a21bd0f1 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
@@ -102,6 +102,7 @@ config:
         feed_limit: 'Anzahl der Einträge pro Feed'
     form_user:
         # two_factor_description: "Enabling two factor authentication means you'll receive an email with a code OR need to use an OTP app (like Google Authenticator, Authy or FreeOTP) to get a one time code on every new untrusted connection. You can't choose both option."
+        # login_label: 'Login (can not be changed)'
         name_label: 'Name'
         email_label: 'E-Mail-Adresse'
         two_factor:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index e1631d10..2f310246 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -5,7 +5,7 @@ security:
         forgot_password: 'Forgot your password?'
         submit: 'Login'
         register: 'Register'
-        username: 'Username'
+        username: 'Login'
         password: 'Password'
         cancel: 'Cancel'
     resetting:
@@ -102,6 +102,7 @@ config:
         feed_limit: 'Number of items in the feed'
     form_user:
         two_factor_description: "Enabling two factor authentication means you'll receive an email with a code OR need to use an OTP app (like Google Authenticator, Authy or FreeOTP) to get a one time code on every new untrusted connection. You can't choose both option."
+        login_label: 'Login (can not be changed)'
         name_label: 'Name'
         email_label: 'Email'
         two_factor:
@@ -545,7 +546,7 @@ user:
         no: No
         create_new_one: Create a new user
     form:
-        username_label: 'Username'
+        username_label: 'Login'
         name_label: 'Name'
         password_label: 'Password'
         repeat_new_password_label: 'Repeat new password'
@@ -560,7 +561,7 @@ user:
         delete_confirm: Are you sure?
         back_to_list: Back to list
     search:
-        placeholder: Filter by username or email
+        placeholder: Filter by login or email
 
 site_credential:
     page_title: Site credentials management
@@ -574,7 +575,7 @@ site_credential:
         no: No
         create_new_one: Create a new credential
     form:
-        username_label: 'Username'
+        username_label: 'Login'
         host_label: 'Host (subdomain.example.org, .example.org, etc.)'
         password_label: 'Password'
         save: Save
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
index ebd4477a..c194041a 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
@@ -102,6 +102,7 @@ config:
         feed_limit: 'Límite de artículos en feed RSS'
     form_user:
         # two_factor_description: "Enabling two factor authentication means you'll receive an email with a code OR need to use an OTP app (like Google Authenticator, Authy or FreeOTP) to get a one time code on every new untrusted connection. You can't choose both option."
+        # login_label: 'Login (can not be changed)'
         name_label: 'Nombre'
         email_label: 'Dirección de e-mail'
         two_factor:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
index e3857e24..9aef7dde 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
@@ -102,6 +102,7 @@ config:
         feed_limit: 'محدودیت آر-اس-اس'
     form_user:
         # two_factor_description: "Enabling two factor authentication means you'll receive an email with a code OR need to use an OTP app (like Google Authenticator, Authy or FreeOTP) to get a one time code on every new untrusted connection. You can't choose both option."
+        # login_label: 'Login (can not be changed)'
         name_label: 'نام'
         email_label: 'نشانی ایمیل'
         two_factor:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index 97cb3272..9848ed9a 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -5,7 +5,7 @@ security:
         forgot_password: "Mot de passe oublié ?"
         submit: "Se connecter"
         register: "Créer un compte"
-        username: "Nom d’utilisateur"
+        username: "Identifiant"
         password: "Mot de passe"
         cancel: "Annuler"
     resetting:
@@ -102,6 +102,7 @@ config:
         feed_limit: "Nombre d’articles dans le flux"
     form_user:
         two_factor_description: "Activer l’authentification double-facteur veut dire que vous allez recevoir un code par courriel OU que vous devriez utiliser une application de mot de passe à usage unique (comme Google Authenticator, Authy or FreeOTP) pour obtenir un code temporaire à chaque nouvelle connexion non approuvée. Vous ne pouvez pas choisir les deux options."
+        login_label: 'Identifiant'
         name_label: "Nom"
         email_label: "Adresse courriel"
         two_factor:
@@ -545,7 +546,7 @@ user:
         no: "Non"
         create_new_one: "Créer un nouvel utilisateur"
     form:
-        username_label: "Nom d’utilisateur"
+        username_label: "Identifiant (ne peut être changé)"
         name_label: "Nom"
         password_label: "Mot de passe"
         repeat_new_password_label: "Confirmez votre nouveau mot de passe"
@@ -561,7 +562,7 @@ user:
         delete_confirm: "Êtes-vous sûr ?"
         back_to_list: "Revenir à la liste"
     search:
-        placeholder: "Filtrer par nom d’utilisateur ou email"
+        placeholder: "Filtrer par identifiant ou email"
 
 site_credential:
     page_title: Gestion des accès aux sites
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
index 7c0110a4..efbf062b 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
@@ -102,6 +102,7 @@ config:
         feed_limit: 'Numero di elementi nel feed'
     form_user:
         # two_factor_description: "Enabling two factor authentication means you'll receive an email with a code OR need to use an OTP app (like Google Authenticator, Authy or FreeOTP) to get a one time code on every new untrusted connection. You can't choose both option."
+        # login_label: 'Login (can not be changed)'
         name_label: 'Nome'
         email_label: 'E-mail'
             # emailTwoFactor_label: 'Using email (receive a code by email)'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
index e74d1a20..86ce4644 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
@@ -102,6 +102,7 @@ config:
         feed_limit: "Nombre d'articles dins un flux"
     form_user:
         # two_factor_description: "Enabling two factor authentication means you'll receive an email with a code OR need to use an OTP app (like Google Authenticator, Authy or FreeOTP) to get a one time code on every new untrusted connection. You can't choose both option."
+        # login_label: 'Login (can not be changed)'
         name_label: 'Nom'
         email_label: 'Adreça de corrièl'
             # emailTwoFactor_label: 'Using email (receive a code by email)'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
index f4da2b18..9ebe0236 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
@@ -102,6 +102,7 @@ config:
         feed_limit: 'Link do RSS'
     form_user:
         # two_factor_description: "Enabling two factor authentication means you'll receive an email with a code OR need to use an OTP app (like Google Authenticator, Authy or FreeOTP) to get a one time code on every new untrusted connection. You can't choose both option."
+        # login_label: 'Login (can not be changed)'
         name_label: 'Nazwa'
         email_label: 'Adres email'
             # emailTwoFactor_label: 'Using email (receive a code by email)'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
index 76d2bebe..d310e016 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
@@ -102,6 +102,7 @@ config:
         feed_limit: 'Número de itens no feed'
     form_user:
         # two_factor_description: "Enabling two factor authentication means you'll receive an email with a code OR need to use an OTP app (like Google Authenticator, Authy or FreeOTP) to get a one time code on every new untrusted connection. You can't choose both option."
+        # login_label: 'Login (can not be changed)'
         name_label: 'Nome'
         email_label: 'E-mail'
             # emailTwoFactor_label: 'Using email (receive a code by email)'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
index c10df5fe..c11ff0b8 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
@@ -102,6 +102,7 @@ config:
         feed_limit: 'Limită RSS'
     form_user:
         # two_factor_description: "Enabling two factor authentication means you'll receive an email with a code OR need to use an OTP app (like Google Authenticator, Authy or FreeOTP) to get a one time code on every new untrusted connection. You can't choose both option."
+        # login_label: 'Login (can not be changed)'
         name_label: 'Nume'
         email_label: 'E-mail'
             # emailTwoFactor_label: 'Using email (receive a code by email)'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml
index 48695b3f..9fe75369 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml
@@ -100,6 +100,7 @@ config:
         feed_limit: 'Количество записей в фиде'
     form_user:
         # two_factor_description: "Enabling two factor authentication means you'll receive an email with a code OR need to use an OTP app (like Google Authenticator, Authy or FreeOTP) to get a one time code on every new untrusted connection. You can't choose both option."
+        # login_label: 'Login (can not be changed)'
         name_label: 'Имя'
         email_label: 'Email'
             # emailTwoFactor_label: 'Using email (receive a code by email)'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml
index da5bbecd..672dcbf0 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml
@@ -102,6 +102,7 @@ config:
         feed_limit: 'จำนวนไอเทมที่เก็บ'
     form_user:
         # two_factor_description: "Enabling two factor authentication means you'll receive an email with a code OR need to use an OTP app (like Google Authenticator, Authy or FreeOTP) to get a one time code on every new untrusted connection. You can't choose both option."
+        # login_label: 'Login (can not be changed)'
         name_label: 'ชื่อ'
         email_label: 'อีเมล'
             # emailTwoFactor_label: 'Using email (receive a code by email)'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
index 8f42d381..c2ad854d 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
@@ -102,6 +102,7 @@ config:
         feed_limit: 'RSS içeriğinden talep edilecek makale limiti'
     form_user:
         # two_factor_description: "Enabling two factor authentication means you'll receive an email with a code OR need to use an OTP app (like Google Authenticator, Authy or FreeOTP) to get a one time code on every new untrusted connection. You can't choose both option."
+        # login_label: 'Login (can not be changed)'
         name_label: 'İsim'
         email_label: 'E-posta'
             # emailTwoFactor_label: 'Using email (receive a code by email)'
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
index a1caf242..eba4539f 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
@@ -118,7 +118,6 @@
                 {% else %}
                     – <a href="{{ path('generate_token') }}">{{ 'config.form_feed.token_create'|trans }}</a>
                 {% endif %}
-
             </div>
         </fieldset>
 
@@ -151,6 +150,12 @@
 
     {{ form_start(form.user) }}
         {{ form_errors(form.user) }}
+        <fieldset class="w500p inline">
+            <div class="row">
+                <label>{{ 'config.form_user.login_label'|trans }}</label>
+                {{ app.user.username }}
+            </div>
+        </fieldset>
 
         <fieldset class="w500p inline">
             <div class="row">
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
index a48c9e28..990546e8 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
@@ -182,6 +182,15 @@
                             {{ form_errors(form.user) }}
 
                             <div class="row">
+                                <div class="col s12">
+                                    <h6 class="grey-text">{{ 'config.form_user.login_label'|trans }}</h6>
+                                    <div>
+                                        {{ app.user.username }}
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div class="row">
                                 <div class="input-field col s12">
                                     {{ form_label(form.user.name) }}
                                     {{ form_errors(form.user.name) }}