diff --git a/languages/de.yaml b/languages/de.yaml index dcf260b..a3b693d 100644 --- a/languages/de.yaml +++ b/languages/de.yaml @@ -10,7 +10,12 @@ PLUGIN_LOGIN: BTN_LOGOUT: "Abmelden" BTN_FORGOT: "Vergessen" BTN_REGISTER: "Registrieren" - BTN_RESET: "Passwort zurücksetzen" + BTN_RESET_PASSWORD: "Passwort zurücksetzen" + BTN_RESET: "Reset" + BTN_SEND_INSTRUCTIONS: "Send Reset Instructions" + BTN_SUBMIT: "Submit" + # as in "save profile" + BTN_SUBMIT_PROFILE: "Submit" BTN_SEND_INSTRUCTIONS: "Sende Anweisungen zum Zurücksetzen" RESET_LINK_EXPIRED: "Der Link zum Zurücksetzen ist abgelaufen. Bitte erneut versuchen." RESET_PASSWORD_RESET: "Das Passwort wurde zurückgesetzt" @@ -126,3 +131,10 @@ PLUGIN_LOGIN: 2FA_SECRET_HELP: "Scannen Sie diesen QR-Code in Ihre [Authenticator App](https://learn.getgrav.org/admin-panel/2fa#apps). Es ist sinnvoll, das Secret an einem sicheren Ort zu sichern, falls Sie Ihre App neu installieren müssen. In der [Grav Doku](https://learn.getgrav.org/admin-panel/2fa) finden Sie weitere Informationen." 2FA_REGENERATE: "Neu generieren" BTN_CANCEL: "Abbrechen" + PROFILE_UPDATED: "Your profile has been updated" + ENTER_EMAIL: "Enter your email" + ENTER_NEW_PASSWORD: "Enter new password" + ENTER_PASSWORD: "Enter a password" + ENTER_PASSWORD_AGAIN: "Enter the password again" + REGISTRATION_THANK_YOU: "Thank you for registering." + USER_ACCOUNT_DISABLED: "Your user account is disabled or it has not yet been activated." diff --git a/languages/en.yaml b/languages/en.yaml index 409ea88..5fd12dd 100644 --- a/languages/en.yaml +++ b/languages/en.yaml @@ -10,8 +10,11 @@ PLUGIN_LOGIN: BTN_LOGOUT: "Logout" BTN_FORGOT: "Forgot" BTN_REGISTER: "Register" - BTN_RESET: "Reset Password" + BTN_SUBMIT_PROFILE: "Submit" + BTN_RESET: "Reset" + BTN_RESET_PASSWORD: "Reset Password" BTN_SEND_INSTRUCTIONS: "Send Reset Instructions" + BTN_SUBMIT: "Submit" RESET_LINK_EXPIRED: "Reset link has expired, please try again" RESET_PASSWORD_RESET: "Password has been reset" RESET_INVALID_LINK: "Invalid reset link used, please try again" @@ -140,6 +143,12 @@ PLUGIN_LOGIN: MANUALLY_ENABLE_HELP: "When using 'activation email' and 'notification email', you can ensure the user can self activate, but requires manually enabling the user to login" IPV6_SUBNET_SIZE: "IPv6 Subnet Size" IPV6_SUBNET_SIZE_HELP: "The number of IPv6 addresses typically assigned to a machine" + PROFILE_UPDATED: "Your profile has been updated" + ENTER_EMAIL: "Enter your email" + ENTER_NEW_PASSWORD: "Enter new password" + ENTER_PASSWORD: "Enter a password" + ENTER_PASSWORD_AGAIN: "Enter the password again" + REGISTRATION_THANK_YOU: "Thank you for registering." USER_ACCOUNT_DISABLED: "Your user account is disabled or it has not yet been activated." SESSION_USER_SYNC: "Sync User in Session" - SESSION_USER_SYNC_HELP: "If Enabled, user in the session is kept in sync with the stored user file. WARNING: This feature may break some existing plugins which update user object in the session without saving it to the filesystem using `$user->save()` method." \ No newline at end of file + SESSION_USER_SYNC_HELP: "If Enabled, user in the session is kept in sync with the stored user file. WARNING: This feature may break some existing plugins which update user object in the session without saving it to the filesystem using `$user->save()` method." diff --git a/languages/es.yaml b/languages/es.yaml index c81a8df..9581de4 100644 --- a/languages/es.yaml +++ b/languages/es.yaml @@ -10,7 +10,12 @@ PLUGIN_LOGIN: BTN_LOGOUT: "Salir" BTN_FORGOT: "Olvidado" BTN_REGISTER: "Registro" - BTN_RESET: "Restaurar contraseña" + BTN_RESET_PASSWORD: "Restaurar contraseña" + BTN_RESET: "Reset" + BTN_SEND_INSTRUCTIONS: "Send Reset Instructions" + BTN_SUBMIT: "Submit" + # as in "save profile" + BTN_SUBMIT_PROFILE: "Submit" BTN_SEND_INSTRUCTIONS: "Enviar instrucciones para restauración" RESET_LINK_EXPIRED: "El enlace para la restauración ha caducado, inténtelo de nuevo." RESET_PASSWORD_RESET: "La contraseña ha sido restaurada" @@ -113,3 +118,10 @@ PLUGIN_LOGIN: PAGE_RESTRICTED: "Acceso restringido, acceda con sus credenciales..." DYNAMIC_VISIBILITY: "Visibilidad de páginas dinámicas" DYNAMIC_VISIBILITY_HELP: "Permite el procesamiento de la visibilidad de páginas basada en reglas de acceso si login.visibility_requires_access es true en un página" + PROFILE_UPDATED: "Your profile has been updated" + ENTER_EMAIL: "Enter your email" + ENTER_NEW_PASSWORD: "Enter new password" + ENTER_PASSWORD: "Enter a password" + ENTER_PASSWORD_AGAIN: "Enter the password again" + REGISTRATION_THANK_YOU: "Thank you for registering." + USER_ACCOUNT_DISABLED: "Your user account is disabled or it has not yet been activated." diff --git a/languages/fr.yaml b/languages/fr.yaml index 028af85..f98c5ac 100644 --- a/languages/fr.yaml +++ b/languages/fr.yaml @@ -10,7 +10,9 @@ PLUGIN_LOGIN: BTN_LOGOUT: "Déconnexion" BTN_FORGOT: "Mot de passe oublié" BTN_REGISTER: "S’enregister" - BTN_RESET: "Réinitialiser le mot de passe" + BTN_SUBMIT_PROFILE: "Enregistrer" + BTN_RESET: "Réinitialiser" + BTN_RESET_PASSWORD: "Réinitialiser le mot de passe" BTN_SEND_INSTRUCTIONS: "Envoyer les instructions de Réinitialisation" RESET_LINK_EXPIRED: "Le lien de réinitialisation a expiré, veuillez réessayer" RESET_PASSWORD_RESET: "Le mot de passe a été réinitialisé" @@ -86,4 +88,10 @@ PLUGIN_LOGIN: USE_PARENT_ACL_LABEL: "Appliquer les règles d’accès parentes" USE_PARENT_ACL_HELP: "Utiliser les règles d’accès parentes si aucune règle n’a été définie" PROTECT_PROTECTED_PAGE_MEDIA_LABEL: "Protéger le média d'une page par une protection par connexion" - PROTECT_PROTECTED_PAGE_MEDIA_HELP: "Si activé, les médias d'une page protégée par connexion sera également protégé par un système de connexion et ne pourra pas être visible à moins d'être connecté." \ No newline at end of file + PROTECT_PROTECTED_PAGE_MEDIA_HELP: "Si activé, les médias d'une page protégée par connexion sera également protégé par un système de connexion et ne pourra pas être visible à moins d'être connecté." + PROFILE_UPDATED: "Votre profil a été mis à jour" + ENTER_EMAIL: "Saisir votre e-mail" + ENTER_NEW_PASSWORD: "Saisir un nouveau mot de passe" + ENTER_PASSWORD: "Saisir votre mot de passe" + ENTER_PASSWORD_AGAIN: "Confirmer votre mot de passe" + REGISTRATION_THANK_YOU: "Merci pour votre inscription." diff --git a/languages/hr.yaml b/languages/hr.yaml index 3090885..02258b7 100644 --- a/languages/hr.yaml +++ b/languages/hr.yaml @@ -6,6 +6,12 @@ PLUGIN_LOGIN: BTN_FORGOT: "Zaboravih" BTN_REGISTER: "Registriraj" REMEMBER_ME: "Zapamti me" + BTN_RESET_PASSWORD: "Reset Password" + BTN_RESET: "Reset" + BTN_SEND_INSTRUCTIONS: "Send Reset Instructions" + BTN_SUBMIT: "Submit" + # as in "save profile" + BTN_SUBMIT_PROFILE: "Submit" BUILTIN_CSS: "Koristi ugrađeni CSS" BUILTIN_CSS_HELP: "Uključi CSS koji dolazi sa admin pluginom" ROUTE: "Putanja prijave" @@ -38,4 +44,11 @@ PLUGIN_LOGIN: REGISTRATION_FIELDS: "Registracijska polja" REGISTRATION_FIELDS_HELP: "Add the fields that will be added to the user yaml file. Fields not listed here will not be added even if present in the registration form" REGISTRATION_FIELD_KEY: "Ime polja" - OPTIONS: "Opcije" \ No newline at end of file + OPTIONS: "Opcije" + PROFILE_UPDATED: "Your profile has been updated" + ENTER_EMAIL: "Enter your email" + ENTER_NEW_PASSWORD: "Enter new password" + ENTER_PASSWORD: "Enter a password" + ENTER_PASSWORD_AGAIN: "Enter the password again" + REGISTRATION_THANK_YOU: "Thank you for registering." + USER_ACCOUNT_DISABLED: "Your user account is disabled or it has not yet been activated." diff --git a/languages/hu.yaml b/languages/hu.yaml index e545781..a5c5b21 100644 --- a/languages/hu.yaml +++ b/languages/hu.yaml @@ -7,6 +7,12 @@ PLUGIN_LOGIN: BTN_LOGOUT: "Kilépés" BTN_FORGOT: "Elfelejtettem" BTN_REGISTER: "Regisztráció" + BTN_RESET_PASSWORD: "Reset Password" + BTN_RESET: "Reset" + BTN_SEND_INSTRUCTIONS: "Send Reset Instructions" + BTN_SUBMIT: "Submit" + # as in "save profile" + BTN_SUBMIT_PROFILE: "Submit" REMEMBER_ME: "Jegyezz meg" REMEMBER_ME_HELP: "Elhelyezünk egy hosszú lejáratú sütit a böngésződben, hogy belépve maradhass két munkamenet között." REMEMBER_ME_STOLEN_COOKIE: "Valaki a belépési adataid felhasználásával látogatta meg ezt az oldalt! Minden munkamenetet kiléptettünk. Kérlek, jelentkezz be ismét és ellenőrizd az adataidat." @@ -20,3 +26,10 @@ PLUGIN_LOGIN: USERNAME_NOT_AVAILABLE: "%s nevű felhasználó már létezik, kérlek válassz más felhasználónevet" PASSWORD_NOT_VALID: "A jelszónak tartalmaznia kell legalább egy számot, egy kisbetűt és egy nagybetűt, valamint legalább 8 karakter hosszú kell, hogy legyen" PASSWORDS_DO_NOT_MATCH: "A két jelszó nem egyezik meg. Győzödj meg róla, hogy azonos legyen a kettő" + PROFILE_UPDATED: "Your profile has been updated" + ENTER_EMAIL: "Enter your email" + ENTER_NEW_PASSWORD: "Enter new password" + ENTER_PASSWORD: "Enter a password" + ENTER_PASSWORD_AGAIN: "Enter the password again" + REGISTRATION_THANK_YOU: "Thank you for registering." + USER_ACCOUNT_DISABLED: "Your user account is disabled or it has not yet been activated." diff --git a/languages/no.yaml b/languages/no.yaml index a885ef1..d8f87bb 100644 --- a/languages/no.yaml +++ b/languages/no.yaml @@ -10,7 +10,12 @@ PLUGIN_LOGIN: BTN_LOGOUT: "Logg ut" BTN_FORGOT: "Glemt passord" BTN_REGISTER: "Registrer" - BTN_RESET: "Tilbakestill Passord" + BTN_RESET_PASSWORD: "Tilbakestill Passord" + BTN_RESET: "Reset" + BTN_SEND_INSTRUCTIONS: "Send Reset Instructions" + BTN_SUBMIT: "Submit" + # as in "save profile" + BTN_SUBMIT_PROFILE: "Submit" BTN_SEND_INSTRUCTIONS: "Send instruksjoner for tilbakestilling" RESET_LINK_EXPIRED: "Tilbakestillingslenke har utløpt, vennligst prøv igjen" RESET_PASSWORD_RESET: "Passord har blitt nullstilt" @@ -60,3 +65,10 @@ PLUGIN_LOGIN: ROUTE_RESET: "Adresse for tilbakestilling av passord" ROUTE_PROFILE: "Adresse til brukerprofil" PAGE_RESTRICTED: "Begrenset tilgang, vennligst logg inn..." + PROFILE_UPDATED: "Your profile has been updated" + ENTER_EMAIL: "Enter your email" + ENTER_NEW_PASSWORD: "Enter new password" + ENTER_PASSWORD: "Enter a password" + ENTER_PASSWORD_AGAIN: "Enter the password again" + REGISTRATION_THANK_YOU: "Thank you for registering." + USER_ACCOUNT_DISABLED: "Your user account is disabled or it has not yet been activated." diff --git a/languages/ro.yaml b/languages/ro.yaml index 307e590..2400680 100644 --- a/languages/ro.yaml +++ b/languages/ro.yaml @@ -8,7 +8,12 @@ PLUGIN_LOGIN: BTN_LOGOUT: "Ieșire din cont " BTN_FORGOT: "Am uitat" BTN_REGISTER: "Înregistrare" - BTN_RESET: "Resetează parola" + BTN_RESET_PASSWORD: "Resetează parola" + BTN_RESET: "Reset" + BTN_SEND_INSTRUCTIONS: "Send Reset Instructions" + BTN_SUBMIT: "Submit" + # as in "save profile" + BTN_SUBMIT_PROFILE: "Submit" BTN_SEND_INSTRUCTIONS: "Trimite instrucțiuni pentru resetare" RESET_LINK_EXPIRED: "Link-ul pentru resetarea parolei a expirat, vă rugăm încercați din nou " RESET_PASSWORD_RESET: "Parola a fost modificată" @@ -83,4 +88,11 @@ PLUGIN_LOGIN: USE_PARENT_ACL_LABEL: "Folosește regulile de acces ale părintelui" USE_PARENT_ACL_HELP: "Verifică regulie de acces ale părintelui dacă nu sunt specificate alte reguli de acces" PROTECT_PROTECTED_PAGE_MEDIA_LABEL: " Protejează media ce aparține paginii de logare " - PROTECT_PROTECTED_PAGE_MEDIA_HELP: "Dacă este activată, media ce aparține unei pagini de logare este protejată și nu poate fi accesată decât după logare." \ No newline at end of file + PROTECT_PROTECTED_PAGE_MEDIA_HELP: "Dacă este activată, media ce aparține unei pagini de logare este protejată și nu poate fi accesată decât după logare." + PROFILE_UPDATED: "Your profile has been updated" + ENTER_EMAIL: "Enter your email" + ENTER_NEW_PASSWORD: "Enter new password" + ENTER_PASSWORD: "Enter a password" + ENTER_PASSWORD_AGAIN: "Enter the password again" + REGISTRATION_THANK_YOU: "Thank you for registering." + USER_ACCOUNT_DISABLED: "Your user account is disabled or it has not yet been activated." diff --git a/languages/ru.yaml b/languages/ru.yaml index 9e35ee2..b92004e 100644 --- a/languages/ru.yaml +++ b/languages/ru.yaml @@ -10,7 +10,12 @@ PLUGIN_LOGIN: BTN_LOGOUT: "Выйти" BTN_FORGOT: "Забыл" BTN_REGISTER: "Регистрация" - BTN_RESET: "Сброс пароля" + BTN_RESET_PASSWORD: "Сброс пароля" + BTN_RESET: "Reset" + BTN_SEND_INSTRUCTIONS: "Send Reset Instructions" + BTN_SUBMIT: "Submit" + # as in "save profile" + BTN_SUBMIT_PROFILE: "Submit" BTN_SEND_INSTRUCTIONS: "Отправить инструкции по сбросу" RESET_LINK_EXPIRED: "Время ссылки для сброса истекло, повторите попытку" RESET_PASSWORD_RESET: "Пароль был сброшен" @@ -132,3 +137,10 @@ PLUGIN_LOGIN: BTN_CANCEL: "Отмена" MANUALLY_ENABLE: "Вручную включить" MANUALLY_ENABLE_HELP: "При использовании «активации по электронной почте» и «уведомление по электронной почте» вы можете убедиться, что пользователь может самостоятельно активироваться, но пользователь требует ручного включения для входа в систему" + PROFILE_UPDATED: "Your profile has been updated" + ENTER_EMAIL: "Enter your email" + ENTER_NEW_PASSWORD: "Enter new password" + ENTER_PASSWORD: "Enter a password" + ENTER_PASSWORD_AGAIN: "Enter the password again" + REGISTRATION_THANK_YOU: "Thank you for registering." + USER_ACCOUNT_DISABLED: "Your user account is disabled or it has not yet been activated." diff --git a/languages/uk.yaml b/languages/uk.yaml index 67a6bdd..a5ead4c 100644 --- a/languages/uk.yaml +++ b/languages/uk.yaml @@ -10,7 +10,12 @@ PLUGIN_LOGIN: BTN_LOGOUT: "Вийти" BTN_FORGOT: "Забув" BTN_REGISTER: "Реєстрація" - BTN_RESET: "Скидання пароля" + BTN_RESET_PASSWORD: "Скидання пароля" + BTN_RESET: "Reset" + BTN_SEND_INSTRUCTIONS: "Send Reset Instructions" + BTN_SUBMIT: "Submit" + # as in "save profile" + BTN_SUBMIT_PROFILE: "Submit" BTN_SEND_INSTRUCTIONS: "Надіслати інструкції по скиданню" RESET_LINK_EXPIRED: "Час посилання для скидання минув, спробуйте ще раз" RESET_PASSWORD_RESET: "Пароль був скинутий" @@ -132,3 +137,10 @@ PLUGIN_LOGIN: BTN_CANCEL: "Скасування" MANUALLY_ENABLE: "Вручну включити" MANUALLY_ENABLE_HELP: "При використанні «активації по електронній пошті» і «повідомлення по електронній пошті» ви можете переконатися, що користувач може самостійно активуватися, але користувач вимагає ручного включення для входу в систему" + PROFILE_UPDATED: "Your profile has been updated" + ENTER_EMAIL: "Enter your email" + ENTER_NEW_PASSWORD: "Enter new password" + ENTER_PASSWORD: "Enter a password" + ENTER_PASSWORD_AGAIN: "Enter the password again" + REGISTRATION_THANK_YOU: "Thank you for registering." + USER_ACCOUNT_DISABLED: "Your user account is disabled or it has not yet been activated." diff --git a/pages/login.md b/pages/login.md index a670047..64cc53e 100644 --- a/pages/login.md +++ b/pages/login.md @@ -12,16 +12,16 @@ forms: username: type: text id: username - placeholder: Username + placeholder: PLUGIN_LOGIN.USERNAME_EMAIL label: PLUGIN_LOGIN.USERNAME_EMAIL autofocus: true password: type: password id: password - placeholder: Password + placeholder: PLUGIN_LOGIN.PASSWORD label: PLUGIN_LOGIN.PASSWORD - + login-twofa: action: method: post @@ -35,8 +35,7 @@ forms: type: text id: twofa-code autofocus: true - placeholder: PLUGIN_LOGIN.2FA_CODE_INPUT + placeholder: PLUGIN_LOGIN.2FA_CODE_INPUT --- # User Login - diff --git a/pages/profile.md b/pages/profile.md index d0a2594..503bbc4 100644 --- a/pages/profile.md +++ b/pages/profile.md @@ -2,12 +2,12 @@ title: Profile access: site.login: true - + form: fields: avatar_img: type: avatar - + username: type: text readonly: true @@ -15,24 +15,24 @@ form: email: type: email - placeholder: "Enter your email" + placeholder: PLUGIN_LOGIN.ENTER_EMAIL validate: required: true message: PLUGIN_LOGIN.EMAIL_VALIDATION_MESSAGE - + fullname: type: text - + title: - type: text + type: text password: type: password - label: Enter new password + label: PLUGIN_LOGIN.ENTER_NEW_PASSWORD validate: message: PLUGIN_LOGIN.PASSWORD_VALIDATION_MESSAGE config-pattern@: system.pwd_regex - + twofa_check: type: conditional condition: config.plugins.login.twofa_enabled @@ -61,20 +61,20 @@ form: outerclasses: 'twofa-secret' markdown: true label: PLUGIN_LOGIN.2FA_SECRET - sublabel: PLUGIN_LOGIN.2FA_SECRET_HELP + sublabel: PLUGIN_LOGIN.2FA_SECRET_HELP buttons: - type: submit - value: Submit + value: PLUGIN_LOGIN.BTN_SUBMIT_PROFILE - type: reset - value: Reset + value: PLUGIN_LOGIN.BTN_RESET process: update_user: true - message: "Your profile has been updated" + message: PLUGIN_LOGIN.PROFILE_UPDATED --- -# Profile \ No newline at end of file +# Profile diff --git a/pages/register.md b/pages/register.md index 36bdaff..4425f51 100644 --- a/pages/register.md +++ b/pages/register.md @@ -25,7 +25,7 @@ form: password1: type: password - label: Enter a password + label: PLUGIN_LOGIN.ENTER_PASSWORD validate: required: true message: PLUGIN_LOGIN.PASSWORD_VALIDATION_MESSAGE @@ -33,7 +33,7 @@ form: password2: type: password - label: Enter the password again + label: PLUGIN_LOGIN.ENTER_PASSWORD_AGAIN validate: required: true message: PLUGIN_LOGIN.PASSWORD_VALIDATION_MESSAGE @@ -42,14 +42,14 @@ form: buttons: - type: submit - value: Submit + value: PLUGIN_LOGIN.BTN_REGISTER - type: reset - value: Reset + value: PLUGIN_LOGIN.BTN_RESET process: register_user: true - message: "Thanks for registering..." + message: PLUGIN_LOGIN.REGISTRATION_THANK_YOU reset: true --- diff --git a/pages/reset.md b/pages/reset.md index 1c3048a..277793c 100644 --- a/pages/reset.md +++ b/pages/reset.md @@ -9,13 +9,13 @@ form: - name: username type: hidden id: username - placeholder: Username + placeholder: PLUGIN_LOGIN.USERNAME_EMAIL readonly: true - name: password type: password id: password - placeholder: Password + placeholder: PLUGIN_LOGIN.PASSWORD autofocus: true validate: required: true @@ -32,4 +32,3 @@ process: # Password Reset ### Username: {{uri.param('user')}} - diff --git a/templates/partials/reset-form.html.twig b/templates/partials/reset-form.html.twig index 563e89a..1d7ef96 100644 --- a/templates/partials/reset-form.html.twig +++ b/templates/partials/reset-form.html.twig @@ -16,12 +16,10 @@ {% endif %} {% endfor %}
- +
{{ nonce_field('reset-form', 'reset-form-nonce')|raw }} {% endif %} - -