aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJérémy Benoist <j0k3r@users.noreply.github.com>2019-06-12 21:36:00 +0200
committerGitHub <noreply@github.com>2019-06-12 21:36:00 +0200
commit1009b286c9b6186856c884948e5d7f1c334a7ac1 (patch)
tree8db345468210b404dc163ff4caec18eff6c3b6a8
parent76cc8ca26f82ededc4f6088653877539af1809bc (diff)
parenteeae34375d41a5c30c60c1ad47fe8beffd9d4f3d (diff)
downloadwallabag-1009b286c9b6186856c884948e5d7f1c334a7ac1.tar.gz
wallabag-1009b286c9b6186856c884948e5d7f1c334a7ac1.tar.zst
wallabag-1009b286c9b6186856c884948e5d7f1c334a7ac1.zip
Merge pull request #3995 from wallabag/feature/config-display-login
Display login in config / user
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.da.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.de.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.en.yml9
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.es.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml7
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.it.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.th.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig7
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig9
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:
102 # feed_limit: 'Number of items in the feed' 102 # feed_limit: 'Number of items in the feed'
103 form_user: 103 form_user:
104 # 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." 104 # 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."
105 # login_label: 'Login (can not be changed)'
105 name_label: 'Navn' 106 name_label: 'Navn'
106 email_label: 'Emailadresse' 107 email_label: 'Emailadresse'
107 two_factor: 108 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:
102 feed_limit: 'Anzahl der Einträge pro Feed' 102 feed_limit: 'Anzahl der Einträge pro Feed'
103 form_user: 103 form_user:
104 # 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." 104 # 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."
105 # login_label: 'Login (can not be changed)'
105 name_label: 'Name' 106 name_label: 'Name'
106 email_label: 'E-Mail-Adresse' 107 email_label: 'E-Mail-Adresse'
107 two_factor: 108 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:
5 forgot_password: 'Forgot your password?' 5 forgot_password: 'Forgot your password?'
6 submit: 'Login' 6 submit: 'Login'
7 register: 'Register' 7 register: 'Register'
8 username: 'Username' 8 username: 'Login'
9 password: 'Password' 9 password: 'Password'
10 cancel: 'Cancel' 10 cancel: 'Cancel'
11 resetting: 11 resetting:
@@ -102,6 +102,7 @@ config:
102 feed_limit: 'Number of items in the feed' 102 feed_limit: 'Number of items in the feed'
103 form_user: 103 form_user:
104 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." 104 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."
105 login_label: 'Login (can not be changed)'
105 name_label: 'Name' 106 name_label: 'Name'
106 email_label: 'Email' 107 email_label: 'Email'
107 two_factor: 108 two_factor:
@@ -545,7 +546,7 @@ user:
545 no: No 546 no: No
546 create_new_one: Create a new user 547 create_new_one: Create a new user
547 form: 548 form:
548 username_label: 'Username' 549 username_label: 'Login'
549 name_label: 'Name' 550 name_label: 'Name'
550 password_label: 'Password' 551 password_label: 'Password'
551 repeat_new_password_label: 'Repeat new password' 552 repeat_new_password_label: 'Repeat new password'
@@ -560,7 +561,7 @@ user:
560 delete_confirm: Are you sure? 561 delete_confirm: Are you sure?
561 back_to_list: Back to list 562 back_to_list: Back to list
562 search: 563 search:
563 placeholder: Filter by username or email 564 placeholder: Filter by login or email
564 565
565site_credential: 566site_credential:
566 page_title: Site credentials management 567 page_title: Site credentials management
@@ -574,7 +575,7 @@ site_credential:
574 no: No 575 no: No
575 create_new_one: Create a new credential 576 create_new_one: Create a new credential
576 form: 577 form:
577 username_label: 'Username' 578 username_label: 'Login'
578 host_label: 'Host (subdomain.example.org, .example.org, etc.)' 579 host_label: 'Host (subdomain.example.org, .example.org, etc.)'
579 password_label: 'Password' 580 password_label: 'Password'
580 save: Save 581 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:
102 feed_limit: 'Límite de artículos en feed RSS' 102 feed_limit: 'Límite de artículos en feed RSS'
103 form_user: 103 form_user:
104 # 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." 104 # 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."
105 # login_label: 'Login (can not be changed)'
105 name_label: 'Nombre' 106 name_label: 'Nombre'
106 email_label: 'Dirección de e-mail' 107 email_label: 'Dirección de e-mail'
107 two_factor: 108 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:
102 feed_limit: 'محدودیت آر-اس-اس' 102 feed_limit: 'محدودیت آر-اس-اس'
103 form_user: 103 form_user:
104 # 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." 104 # 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."
105 # login_label: 'Login (can not be changed)'
105 name_label: 'نام' 106 name_label: 'نام'
106 email_label: 'نشانی ایمیل' 107 email_label: 'نشانی ایمیل'
107 two_factor: 108 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:
5 forgot_password: "Mot de passe oublié ?" 5 forgot_password: "Mot de passe oublié ?"
6 submit: "Se connecter" 6 submit: "Se connecter"
7 register: "Créer un compte" 7 register: "Créer un compte"
8 username: "Nom d’utilisateur" 8 username: "Identifiant"
9 password: "Mot de passe" 9 password: "Mot de passe"
10 cancel: "Annuler" 10 cancel: "Annuler"
11 resetting: 11 resetting:
@@ -102,6 +102,7 @@ config:
102 feed_limit: "Nombre d’articles dans le flux" 102 feed_limit: "Nombre d’articles dans le flux"
103 form_user: 103 form_user:
104 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." 104 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."
105 login_label: 'Identifiant'
105 name_label: "Nom" 106 name_label: "Nom"
106 email_label: "Adresse courriel" 107 email_label: "Adresse courriel"
107 two_factor: 108 two_factor:
@@ -545,7 +546,7 @@ user:
545 no: "Non" 546 no: "Non"
546 create_new_one: "Créer un nouvel utilisateur" 547 create_new_one: "Créer un nouvel utilisateur"
547 form: 548 form:
548 username_label: "Nom d’utilisateur" 549 username_label: "Identifiant (ne peut être changé)"
549 name_label: "Nom" 550 name_label: "Nom"
550 password_label: "Mot de passe" 551 password_label: "Mot de passe"
551 repeat_new_password_label: "Confirmez votre nouveau mot de passe" 552 repeat_new_password_label: "Confirmez votre nouveau mot de passe"
@@ -561,7 +562,7 @@ user:
561 delete_confirm: "Êtes-vous sûr ?" 562 delete_confirm: "Êtes-vous sûr ?"
562 back_to_list: "Revenir à la liste" 563 back_to_list: "Revenir à la liste"
563 search: 564 search:
564 placeholder: "Filtrer par nom d’utilisateur ou email" 565 placeholder: "Filtrer par identifiant ou email"
565 566
566site_credential: 567site_credential:
567 page_title: Gestion des accès aux sites 568 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:
102 feed_limit: 'Numero di elementi nel feed' 102 feed_limit: 'Numero di elementi nel feed'
103 form_user: 103 form_user:
104 # 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." 104 # 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."
105 # login_label: 'Login (can not be changed)'
105 name_label: 'Nome' 106 name_label: 'Nome'
106 email_label: 'E-mail' 107 email_label: 'E-mail'
107 # emailTwoFactor_label: 'Using email (receive a code by email)' 108 # 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:
102 feed_limit: "Nombre d'articles dins un flux" 102 feed_limit: "Nombre d'articles dins un flux"
103 form_user: 103 form_user:
104 # 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." 104 # 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."
105 # login_label: 'Login (can not be changed)'
105 name_label: 'Nom' 106 name_label: 'Nom'
106 email_label: 'Adreça de corrièl' 107 email_label: 'Adreça de corrièl'
107 # emailTwoFactor_label: 'Using email (receive a code by email)' 108 # 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:
102 feed_limit: 'Link do RSS' 102 feed_limit: 'Link do RSS'
103 form_user: 103 form_user:
104 # 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." 104 # 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."
105 # login_label: 'Login (can not be changed)'
105 name_label: 'Nazwa' 106 name_label: 'Nazwa'
106 email_label: 'Adres email' 107 email_label: 'Adres email'
107 # emailTwoFactor_label: 'Using email (receive a code by email)' 108 # 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:
102 feed_limit: 'Número de itens no feed' 102 feed_limit: 'Número de itens no feed'
103 form_user: 103 form_user:
104 # 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." 104 # 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."
105 # login_label: 'Login (can not be changed)'
105 name_label: 'Nome' 106 name_label: 'Nome'
106 email_label: 'E-mail' 107 email_label: 'E-mail'
107 # emailTwoFactor_label: 'Using email (receive a code by email)' 108 # 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:
102 feed_limit: 'Limită RSS' 102 feed_limit: 'Limită RSS'
103 form_user: 103 form_user:
104 # 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." 104 # 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."
105 # login_label: 'Login (can not be changed)'
105 name_label: 'Nume' 106 name_label: 'Nume'
106 email_label: 'E-mail' 107 email_label: 'E-mail'
107 # emailTwoFactor_label: 'Using email (receive a code by email)' 108 # 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:
100 feed_limit: 'Количество записей в фиде' 100 feed_limit: 'Количество записей в фиде'
101 form_user: 101 form_user:
102 # 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." 102 # 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."
103 # login_label: 'Login (can not be changed)'
103 name_label: 'Имя' 104 name_label: 'Имя'
104 email_label: 'Email' 105 email_label: 'Email'
105 # emailTwoFactor_label: 'Using email (receive a code by email)' 106 # 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:
102 feed_limit: 'จำนวนไอเทมที่เก็บ' 102 feed_limit: 'จำนวนไอเทมที่เก็บ'
103 form_user: 103 form_user:
104 # 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." 104 # 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."
105 # login_label: 'Login (can not be changed)'
105 name_label: 'ชื่อ' 106 name_label: 'ชื่อ'
106 email_label: 'อีเมล' 107 email_label: 'อีเมล'
107 # emailTwoFactor_label: 'Using email (receive a code by email)' 108 # 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:
102 feed_limit: 'RSS içeriğinden talep edilecek makale limiti' 102 feed_limit: 'RSS içeriğinden talep edilecek makale limiti'
103 form_user: 103 form_user:
104 # 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." 104 # 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."
105 # login_label: 'Login (can not be changed)'
105 name_label: 'İsim' 106 name_label: 'İsim'
106 email_label: 'E-posta' 107 email_label: 'E-posta'
107 # emailTwoFactor_label: 'Using email (receive a code by email)' 108 # 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 @@
118 {% else %} 118 {% else %}
119 – <a href="{{ path('generate_token') }}">{{ 'config.form_feed.token_create'|trans }}</a> 119 – <a href="{{ path('generate_token') }}">{{ 'config.form_feed.token_create'|trans }}</a>
120 {% endif %} 120 {% endif %}
121
122 </div> 121 </div>
123 </fieldset> 122 </fieldset>
124 123
@@ -151,6 +150,12 @@
151 150
152 {{ form_start(form.user) }} 151 {{ form_start(form.user) }}
153 {{ form_errors(form.user) }} 152 {{ form_errors(form.user) }}
153 <fieldset class="w500p inline">
154 <div class="row">
155 <label>{{ 'config.form_user.login_label'|trans }}</label>
156 {{ app.user.username }}
157 </div>
158 </fieldset>
154 159
155 <fieldset class="w500p inline"> 160 <fieldset class="w500p inline">
156 <div class="row"> 161 <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 @@
182 {{ form_errors(form.user) }} 182 {{ form_errors(form.user) }}
183 183
184 <div class="row"> 184 <div class="row">
185 <div class="col s12">
186 <h6 class="grey-text">{{ 'config.form_user.login_label'|trans }}</h6>
187 <div>
188 {{ app.user.username }}
189 </div>
190 </div>
191 </div>
192
193 <div class="row">
185 <div class="input-field col s12"> 194 <div class="input-field col s12">
186 {{ form_label(form.user.name) }} 195 {{ form_label(form.user.name) }}
187 {{ form_errors(form.user.name) }} 196 {{ form_errors(form.user.name) }}