mirror of
https://github.com/wallabag/wallabag.git
synced 2024-12-17 13:16:28 +00:00
Merge pull request #3995 from wallabag/feature/config-display-login
Display login in config / user
This commit is contained in:
Jérémy Benoist
GitHub
commit
1009b286c9
16 changed files with 36 additions and 8 deletions
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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)'
|
||||
|
|
|
|||
|
|
@ -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)'
|
||||
|
|
|
|||
|
|
@ -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)'
|
||||
|
|
|
|||
|
|
@ -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)'
|
||||
|
|
|
|||
|
|
@ -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)'
|
||||
|
|
|
|||
|
|
@ -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)'
|
||||
|
|
|
|||
|
|
@ -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)'
|
||||
|
|
|
|||
|
|
@ -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)'
|
||||
|
|
|
|||
|
|
@ -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">
|
||||
|
|
|
|||
|
|
@ -181,6 +181,15 @@
|
|||
{{ form_start(form.user) }}
|
||||
{{ 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) }}
|
||||
|
|
|
|||
Loading…
Reference in a new issue