From 7d8f9d1c46e38681f2a4033a7da811ab7562d953 Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Mon, 20 Feb 2017 19:27:20 +0100 Subject: [PATCH] Rename /forget_password url to /forgot_password Also renames `forgot_password` translation key to `forgot_password_title` and `forget_password` to `forgot_password` Includes entry in CHANGELOG about the breaking change (and some markdown fixes in there) --- CHANGELOG.md | 9 +++++++-- cmd/web.go | 4 ++-- options/locale/locale_bg-BG.ini | 4 ++-- options/locale/locale_cs-CZ.ini | 4 ++-- options/locale/locale_de-DE.ini | 4 ++-- options/locale/locale_en-US.ini | 4 ++-- options/locale/locale_es-ES.ini | 4 ++-- options/locale/locale_fi-FI.ini | 4 ++-- options/locale/locale_fr-FR.ini | 4 ++-- options/locale/locale_it-IT.ini | 4 ++-- options/locale/locale_ja-JP.ini | 4 ++-- options/locale/locale_ko-KR.ini | 4 ++-- options/locale/locale_lv-LV.ini | 4 ++-- options/locale/locale_nl-NL.ini | 4 ++-- options/locale/locale_pl-PL.ini | 4 ++-- options/locale/locale_pt-BR.ini | 4 ++-- options/locale/locale_ru-RU.ini | 4 ++-- options/locale/locale_sr-SP.ini | 4 ++-- options/locale/locale_sv-SE.ini | 4 ++-- options/locale/locale_tr-TR.ini | 4 ++-- options/locale/locale_zh-CN.ini | 4 ++-- options/locale/locale_zh-HK.ini | 4 ++-- options/locale/locale_zh-TW.ini | 4 ++-- routers/user/auth.go | 4 ++-- templates/user/auth/forgot_passwd.tmpl | 2 +- templates/user/auth/signin_inner.tmpl | 4 ++-- templates/user/settings/delete.tmpl | 2 +- templates/user/settings/password.tmpl | 2 +- 28 files changed, 58 insertions(+), 53 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fd5315b6d00..13d53029459 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## Unreleased + +* BREAKING + * Password reset URL changed from `/user/forget_password` to `/user/forgot_password` + ## [1.1.0](https://github.com/go-gitea/gitea/releases/tag/v1.1.0) - 2017-03-09 * BREAKING @@ -72,7 +77,7 @@ * Added option to config to disable local path imports [#724](https://github.com/go-gitea/gitea/pull/724) * Allow custom public files [#782](https://github.com/go-gitea/gitea/pull/782) * Added pprof endpoint for debugging [#801](https://github.com/go-gitea/gitea/pull/801) - * Added X-GitHub-* headers [#809](https://github.com/go-gitea/gitea/pull/809) + * Added `X-GitHub-*` headers [#809](https://github.com/go-gitea/gitea/pull/809) * Fill SSH key title automatically [#863](https://github.com/go-gitea/gitea/pull/863) * Display Git version on admin panel [#921](https://github.com/go-gitea/gitea/pull/921) * Expose URL field on issue API [#982](https://github.com/go-gitea/gitea/pull/982) @@ -104,7 +109,7 @@ ## [1.0.1](https://github.com/go-gitea/gitea/releases/tag/v1.0.1) - 2017-01-05 * BUGFIXES - * Fixed localized MIN_PASSWORD_LENGTH [#501](https://github.com/go-gitea/gitea/pull/501) + * Fixed localized `MIN_PASSWORD_LENGTH` [#501](https://github.com/go-gitea/gitea/pull/501) * Fixed 500 error on organization delete [#507](https://github.com/go-gitea/gitea/pull/507) * Ignore empty wiki repo on migrate [#544](https://github.com/go-gitea/gitea/pull/544) * Proper check access for forking [#563](https://github.com/go-gitea/gitea/pull/563) diff --git a/cmd/web.go b/cmd/web.go index c2d14a78705..af32592d0b7 100644 --- a/cmd/web.go +++ b/cmd/web.go @@ -254,8 +254,8 @@ func runWeb(ctx *cli.Context) error { m.Any("/activate", user.Activate) m.Any("/activate_email", user.ActivateEmail) m.Get("/email2user", user.Email2User) - m.Get("/forget_password", user.ForgotPasswd) - m.Post("/forget_password", user.ForgotPasswdPost) + m.Get("/forgot_password", user.ForgotPasswd) + m.Post("/forgot_password", user.ForgotPasswdPost) m.Get("/logout", user.SignOut) }) // ***** END: User ***** diff --git a/options/locale/locale_bg-BG.ini b/options/locale/locale_bg-BG.ini index 3abae27876b..a4fbd680909 100644 --- a/options/locale/locale_bg-BG.ini +++ b/options/locale/locale_bg-BG.ini @@ -145,8 +145,8 @@ social_register_helper_msg=Вече имате профил? Свържете с disable_register_prompt=За съжаление създаването на нови регистрации е изключено. Обърнете се към администратора на сайта. disable_register_mail=За съжаление потвърждението на регистрации е изключено. remember_me=Запомни ме -forgot_password=Забравена парола -forget_password=Забравена парола? +forgot_password_title=Забравена парола +forgot_password=Забравена парола? sign_up_now=Нуждаете се от профил? Регистрирайте се сега. confirmation_mail_sent_prompt=Ново писмо за потвърждение е изпратено до %s. Моля проверете пощенската си кутия в рамките на следващите %d часа, за да завършите процеса на регистрация. active_your_account=Активиране на профил diff --git a/options/locale/locale_cs-CZ.ini b/options/locale/locale_cs-CZ.ini index d632b58934c..05db4b1f759 100644 --- a/options/locale/locale_cs-CZ.ini +++ b/options/locale/locale_cs-CZ.ini @@ -146,8 +146,8 @@ social_register_helper_msg=Již máte účet? Připojte se! disable_register_prompt=Omlouváme se, ale registrace jsou vypnuty. Prosíme, spojte se správcem systému. disable_register_mail=Omlouváme se, potvrzovací registrační e-maily byly vypnuty. remember_me=Zapamatovat si mne -forgot_password=Zapomenuté heslo -forget_password=Zapomněli jste heslo? +forgot_password_title=Zapomenuté heslo +forgot_password=Zapomněli jste heslo? sign_up_now=Potřebujete účet? Zaregistrujte se. confirmation_mail_sent_prompt=Nový potvrzovací e-mail byl zaslán na %s, prosíme, zkontrolujte si vaši doručenou poštu během následující %d hodin pro dokončení registračního procesu. active_your_account=Aktivujte si váš účet diff --git a/options/locale/locale_de-DE.ini b/options/locale/locale_de-DE.ini index 6398dff5480..efeb859fca4 100644 --- a/options/locale/locale_de-DE.ini +++ b/options/locale/locale_de-DE.ini @@ -162,8 +162,8 @@ social_register_helper_msg=Hast du bereits ein Konto? Jetzt verknüpfen! disable_register_prompt=Die Registrierung wurde deaktiviert. Bitte wende dich an den Administrator. disable_register_mail=Es tut uns leid, die Bestätigung der Registrierungs-E-Mail wurde deaktiviert. remember_me=Angemeldet bleiben -forgot_password=Passwort vergessen -forget_password=Passwort vergessen? +forgot_password_title=Passwort vergessen +forgot_password=Passwort vergessen? sign_up_now=Möchtest du ein Konto? Registriere dich jetzt. confirmation_mail_sent_prompt=Eine neue Bestätigungs-E-Mail wurde an %s gesendet. Bitte kontrolliere dein Postfach innerhalb der nächsten %d Stunden, um die Registrierung abzuschließen. active_your_account=Aktiviere dein Konto diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index f8e12507610..d39589bd305 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -165,8 +165,8 @@ social_register_helper_msg = Already have an account? Bind now! disable_register_prompt = Sorry, registration has been disabled. Please contact the site administrator. disable_register_mail = Sorry, Register Mail Confirmation has been disabled. remember_me = Remember Me -forgot_password= Forgot Password -forget_password = Forgot password? +forgot_password_title= Forgot Password +forgot_password = Forgot password? sign_up_now = Need an account? Sign up now. confirmation_mail_sent_prompt = A new confirmation email has been sent to %s. Please check your inbox within the next %d hours to complete the registration process. active_your_account = Activate Your Account diff --git a/options/locale/locale_es-ES.ini b/options/locale/locale_es-ES.ini index 9f1cf56df49..97e56291777 100644 --- a/options/locale/locale_es-ES.ini +++ b/options/locale/locale_es-ES.ini @@ -142,8 +142,8 @@ social_register_helper_msg=¿Ya tienes una cuenta? ¡Enlázala! disable_register_prompt=Lo sentimos, el registro está deshabilitado. Por favor, contacta con el administrador del sitio. disable_register_mail=Lo sentimos. Los correos de Confirmación de Registro están deshabilitados. remember_me=Recuérdame -forgot_password=He olvidado mi contraseña -forget_password=¿Has olvidado tu contraseña? +forgot_password_title=He olvidado mi contraseña +forgot_password=¿Has olvidado tu contraseña? sign_up_now=¿Necesitas una cuenta? Regístrate ahora. confirmation_mail_sent_prompt=Un nuevo correo de confirmación se ha enviado a %s. Por favor, comprueba tu bandeja de entrada en las siguientes %d horas para completar el proceso de registro. active_your_account=Activa tu cuenta diff --git a/options/locale/locale_fi-FI.ini b/options/locale/locale_fi-FI.ini index 0b5f4c9e697..884f1d9d35e 100644 --- a/options/locale/locale_fi-FI.ini +++ b/options/locale/locale_fi-FI.ini @@ -152,8 +152,8 @@ social_register_helper_msg=On jo tili? Liitä nyt! disable_register_prompt=Sori, rekisteröinti on poistettu käytöstä. Ole hyvä ja ota yhteyttä sivuston ylläpitoon. disable_register_mail=Sori, rekisteröinti sähköpostivarmistukset on poistettu käytöstä. remember_me=Muista minut -forgot_password=Unohtuiko salasana -forget_password=Unohtuiko salasana? +forgot_password_title=Unohtuiko salasana +forgot_password=Unohtuiko salasana? sign_up_now=Tarvitsetko tilin? Rekisteröidy nyt. confirmation_mail_sent_prompt=Uusi varmistus sähköposti on lähetetty osoitteeseen %s, ole hyvä ja tarkista saapuneet seuraavan %d tunnin sisällä saadaksesi rekisteröintiprosessin valmiiksi. active_your_account=Aktivoi tilisi diff --git a/options/locale/locale_fr-FR.ini b/options/locale/locale_fr-FR.ini index 80809773900..4e80257c11c 100644 --- a/options/locale/locale_fr-FR.ini +++ b/options/locale/locale_fr-FR.ini @@ -161,8 +161,8 @@ social_register_helper_msg=Déjà enregistré ? Associez-le ! disable_register_prompt=Désolé, les enregistrements ont été désactivés. Veuillez contacter l'administrateur du site. disable_register_mail=Désolé, la confirmation par e-mail des enregistrements a été désactivée. remember_me=Se souvenir de moi -forgot_password=Mot de passe oublié -forget_password=Mot de passe oublié ? +forgot_password_title=Mot de passe oublié +forgot_password=Mot de passe oublié ? sign_up_now=Pas de compte ? Inscrivez-vous maintenant. confirmation_mail_sent_prompt=Un nouveau mail de confirmation à été envoyé à %s. Veuillez vérifier votre boîte de réception dans un délai de %d heures pour compléter votre enregistrement. active_your_account=Activer votre compte diff --git a/options/locale/locale_it-IT.ini b/options/locale/locale_it-IT.ini index afb8f6cee55..29b9d2024cf 100644 --- a/options/locale/locale_it-IT.ini +++ b/options/locale/locale_it-IT.ini @@ -151,8 +151,8 @@ social_register_helper_msg=Hai già un account? Associalo ora! disable_register_prompt=Siamo spiacenti, registrazione è stata disabilitata. Si prega di contattare l'amministratore del sito. disable_register_mail=Siamo spiacenti, la conferma di registrazione via Mail è stata disattivata. remember_me=Ricordami -forgot_password=Password dimenticata -forget_password=Password dimenticata? +forgot_password_title=Password dimenticata +forgot_password=Password dimenticata? sign_up_now=Bisogno di un account? Iscriviti ora. confirmation_mail_sent_prompt=Una nuova email di conferma è stata inviata a %s, verifica la tua casella di posta entro le prossime %d ore per completare la registrazione. active_your_account=Attiva il tuo Account diff --git a/options/locale/locale_ja-JP.ini b/options/locale/locale_ja-JP.ini index 5bdffb1bd35..dc1012ac143 100644 --- a/options/locale/locale_ja-JP.ini +++ b/options/locale/locale_ja-JP.ini @@ -145,8 +145,8 @@ social_register_helper_msg=既にアカウントをお持ちですか？連携 disable_register_prompt=申し訳ありませんが、現在登録は受け付けておりません。サイトの管理者にお問い合わせください。 disable_register_mail=申し訳ありませんが、登録メールの確認機能が無効になっています。 remember_me=ログインしたままにする -forgot_password=パスワードを忘れた -forget_password=パスワードを忘れましたか？ +forgot_password_title=パスワードを忘れた +forgot_password=パスワードを忘れましたか？ sign_up_now=アカウントが必要ですか？今すぐ登録しましょう！ confirmation_mail_sent_prompt=新しい確認メールを %s に送りました。登録を完了させるために、%d時間以内にあなたのメールボックスを確認してください。 active_your_account=アカウントを有効化 diff --git a/options/locale/locale_ko-KR.ini b/options/locale/locale_ko-KR.ini index 01390d23eeb..04fa32934b0 100644 --- a/options/locale/locale_ko-KR.ini +++ b/options/locale/locale_ko-KR.ini @@ -145,8 +145,8 @@ social_register_helper_msg=계정을 가지고 계신가요? 연결하세요! disable_register_prompt=죄송합니다, 가입이 비활성화 되어있습니다. 사이트 관리자에게 문의 해주세요. disable_register_mail=죄송합니다. 메일 등록이 비활성화 되었습니다. remember_me=자동 로그인 -forgot_password=비밀번호 찾기 -forget_password=비밀번호를 잊으셨습니까? +forgot_password_title=비밀번호 찾기 +forgot_password=비밀번호를 잊으셨습니까? sign_up_now=계정이 필요하신가요? 지금 가입하세요. confirmation_mail_sent_prompt=새로운 확인 메일이 %s로 전송되었습니다. 받은 편지함으로 도착한 메일을 %d시간 안에 확인해서 등록 절차를 완료하십시오. active_your_account=계정 활성화 diff --git a/options/locale/locale_lv-LV.ini b/options/locale/locale_lv-LV.ini index 9a7e5b0c40c..5ca65957ed0 100644 --- a/options/locale/locale_lv-LV.ini +++ b/options/locale/locale_lv-LV.ini @@ -146,8 +146,8 @@ social_register_helper_msg=Jau ir konts? Sasaisti tagad! disable_register_prompt=Atvainojiet, reģistrācija ir atspējota. Lūdzu, sazinieties ar vietnes administratoru. disable_register_mail=Atvainojiet, reģistrācijas e-pasta apstiprināšana ir atspējota. remember_me=Atcerēties mani -forgot_password=Aizmirsu paroli -forget_password=Aizmirsi paroli? +forgot_password_title=Aizmirsu paroli +forgot_password=Aizmirsi paroli? sign_up_now=Nepieciešams konts? Reģistrējies tagad. confirmation_mail_sent_prompt=Jauns apstiprināšanas e-pasts ir nosūtīts uz %s, lūdzu, pārbaudies savu e-pasta kontu tuvāko %d stundu laikā, lai pabeigtu reģistrācijas procesu. active_your_account=Aktivizēt savu kontu diff --git a/options/locale/locale_nl-NL.ini b/options/locale/locale_nl-NL.ini index b2bf41403fe..0c497268b8c 100644 --- a/options/locale/locale_nl-NL.ini +++ b/options/locale/locale_nl-NL.ini @@ -147,8 +147,8 @@ social_register_helper_msg=Heeft u al een account? Koppel nu! disable_register_prompt=Sorry, registratie is uitgeschakeld. Neem contact op met de beheerder van deze site. disable_register_mail=Sorry, bevestiging van registratie per e-mail is uitgeschakeld. remember_me=Onthoud mij -forgot_password=Wachtwoord vergeten -forget_password=Wachtwoord vergeten? +forgot_password_title=Wachtwoord vergeten +forgot_password=Wachtwoord vergeten? sign_up_now=Een account nodig? Meld u nu aan. confirmation_mail_sent_prompt=Een bevestigingsemail is gestuurd naar %s, Bevestig u aanvraag binnen %d uren om uw registratie te voltooien. active_your_account=Activeer uw account diff --git a/options/locale/locale_pl-PL.ini b/options/locale/locale_pl-PL.ini index 0cf00924bd8..15a208af157 100644 --- a/options/locale/locale_pl-PL.ini +++ b/options/locale/locale_pl-PL.ini @@ -143,8 +143,8 @@ social_register_helper_msg=Masz już konto? Powiąż je teraz! disable_register_prompt=Przepraszamy rejestracja została wyłączona. Prosimy o kontakt z administratorem serwisu. disable_register_mail=Przepraszamy, potwierdzenia rejestracji zostały wyłączone przez administratora. remember_me=Zapamiętaj mnie -forgot_password=Zapomniałem hasła -forget_password=Zapomniałeś hasła? +forgot_password_title=Zapomniałem hasła +forgot_password=Zapomniałeś hasła? sign_up_now=Potrzebujesz konta? Zarejestruj się teraz. confirmation_mail_sent_prompt=Nowa wiadomość e-mail z potwierdzeniem została wysłana do %s, proszę sprawdzić swoją skrzynkę odbiorczą w ciągu najbliższych godzin %d aby dokończyć proces rejestracji. active_your_account=Aktywuj swoje konto diff --git a/options/locale/locale_pt-BR.ini b/options/locale/locale_pt-BR.ini index 4a4e592934d..11aae9f4bba 100644 --- a/options/locale/locale_pt-BR.ini +++ b/options/locale/locale_pt-BR.ini @@ -162,8 +162,8 @@ social_register_helper_msg=Já tem uma conta? Junte-se agora! disable_register_prompt=Desculpe, novos registros estão desabilitados. Por favor entre em contato com o administrador do site. disable_register_mail=Desculpe, a confirmação de registro por e-mail foi desabilitada. remember_me=Lembrar de mim -forgot_password=Esqueci a senha -forget_password=Esqueceu a senha? +forgot_password_title=Esqueci a senha +forgot_password=Esqueceu a senha? sign_up_now=Precisa de uma conta? Cadastre-se agora. confirmation_mail_sent_prompt=Um novo e-mail de confirmação foi enviado para %s, por favor, verifique sua caixa de entrada nas próximas %d horas para completar seu registro. active_your_account=Ativar sua conta diff --git a/options/locale/locale_ru-RU.ini b/options/locale/locale_ru-RU.ini index cdfb1116216..2df1a5aba5f 100644 --- a/options/locale/locale_ru-RU.ini +++ b/options/locale/locale_ru-RU.ini @@ -152,8 +152,8 @@ social_register_helper_msg=Уже есть учетная запись? Свяж disable_register_prompt=Извините, возможность регистрации отключена. Пожалуйста, свяжитесь с администратором сайта. disable_register_mail=К сожалению подтверждение регистрации по почте отключено. remember_me=Запомнить меня -forgot_password=Забыли пароль -forget_password=Забыли пароль? +forgot_password_title=Забыли пароль +forgot_password=Забыли пароль? sign_up_now=Нужен аккаунт? Зарегистрируйтесь. confirmation_mail_sent_prompt=Новое письмо для подтверждения было направлено на %s, пожалуйста, проверьте ваш почтовый ящик в течение %d часов для завершения регистрации. active_your_account=Активируйте свой аккаунт diff --git a/options/locale/locale_sr-SP.ini b/options/locale/locale_sr-SP.ini index 4cf86d2d333..2dc463f3463 100644 --- a/options/locale/locale_sr-SP.ini +++ b/options/locale/locale_sr-SP.ini @@ -145,8 +145,8 @@ social_register_helper_msg=Већ имате налог? Повежите се disable_register_prompt=Извините регистрација је онемогућено. Молимо вас, контактирајте администратора. disable_register_mail=Извините, потврда путем поште је онемогућено. remember_me=Запамти ме -forgot_password=Заборављена лозинка -forget_password=Заборавили сте лозинку? +forgot_password_title=Заборављена лозинка +forgot_password=Заборавили сте лозинку? sign_up_now=Немате налог? Пријавите се. confirmation_mail_sent_prompt=Потврда упућена %s је послата, молимо проверите ваше поруке пре %d сати да завршите регистрацију. active_your_account=Активирајте ваш налог diff --git a/options/locale/locale_sv-SE.ini b/options/locale/locale_sv-SE.ini index a80b1dce5c9..679ad437822 100644 --- a/options/locale/locale_sv-SE.ini +++ b/options/locale/locale_sv-SE.ini @@ -160,8 +160,8 @@ social_register_helper_msg=Har du redan ett konto? Anslut det nu! disable_register_prompt=Tyvärr är användarregistreringen inaktiverad. Vänligen kontakta din administratör. disable_register_mail=Tyvärr så är registreringsbekräftelemailutskick inaktiverat. remember_me=Kom ihåg mig -forgot_password=Glömt lösenord -forget_password=Glömt lösenordet? +forgot_password_title=Glömt lösenord +forgot_password=Glömt lösenordet? sign_up_now=Behöver du ett konto? Registrera dig nu. confirmation_mail_sent_prompt=Ett nytt bekräftelsemail has skickats till %s, vänligen kolla din inkorg inom dom kommande %d timmarna för att slutföra registreringsprocessen. active_your_account=Aktivera ditt konto diff --git a/options/locale/locale_tr-TR.ini b/options/locale/locale_tr-TR.ini index 91ae7d5134d..0f6cd8ef37e 100644 --- a/options/locale/locale_tr-TR.ini +++ b/options/locale/locale_tr-TR.ini @@ -144,8 +144,8 @@ social_register_helper_msg=Zaten bir hesabınız var mı? Şimdi bağlanın! disable_register_prompt=Üzgünüz, kaydolma devre dışı bırakıldı. Lütfen site yöneticisiyle irtibata geçin. disable_register_mail=Üzgünüz, kayıt doğrulama e-postası devre dışı bırakıldı. remember_me=Beni Hatırla -forgot_password=Parolamı Unuttum -forget_password=Parolanızı mı unuttunuz? +forgot_password_title=Parolamı Unuttum +forgot_password=Parolanızı mı unuttunuz? sign_up_now=Bir hesaba mı ihtiyacınız var? Şimdi kaydolun. confirmation_mail_sent_prompt=%s adresinize yeni bir doğrulama e-postası gönderildi, kaydolma aşamalarını tamamlamak için lütfen %d saat içinde e-posta adresinizi kontrol edin. active_your_account=Hesabınızı Aktifleştirin diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index e2633b45d33..c9c3927a682 100644 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -162,8 +162,8 @@ social_register_helper_msg=已经注册？立即绑定！ disable_register_prompt=对不起，注册功能已被关闭。请联系网站管理员。 disable_register_mail=对不起，注册邮箱确认功能已被关闭。 remember_me=记住登录 -forgot_password=忘记密码 -forget_password=忘记密码？ +forgot_password_title=忘记密码 +forgot_password=忘记密码？ sign_up_now=还没帐户？马上注册。 confirmation_mail_sent_prompt=一封新的确认邮件已经被发送至 %s，请检查您的收件箱并在 %d 小时内完成确认注册操作。 active_your_account=激活您的帐户 diff --git a/options/locale/locale_zh-HK.ini b/options/locale/locale_zh-HK.ini index bf8b569f35c..57682525020 100644 --- a/options/locale/locale_zh-HK.ini +++ b/options/locale/locale_zh-HK.ini @@ -153,8 +153,8 @@ social_register_helper_msg=已經註冊？立即綁定！ disable_register_prompt=對不起，註冊功能已被關閉。請聯系網站管理員。 disable_register_mail=對不起，註冊郵箱確認功能已被關閉。 remember_me=記住登錄 -forgot_password=忘記密碼 -forget_password=忘記密碼？ +forgot_password_title=忘記密碼 +forgot_password=忘記密碼？ sign_up_now=還沒帳戶？馬上註冊。 confirmation_mail_sent_prompt=一封新的確認郵件已經被發送至 %s，請檢查您的收件箱並在 %d 小時內完成確認註冊操作。 active_your_account=啟用您的帳戶 diff --git a/options/locale/locale_zh-TW.ini b/options/locale/locale_zh-TW.ini index b9a1604884c..4f337dc29fe 100644 --- a/options/locale/locale_zh-TW.ini +++ b/options/locale/locale_zh-TW.ini @@ -159,8 +159,8 @@ social_register_helper_msg=已經註冊？立即綁定！ disable_register_prompt=對不起，註冊功能已被關閉。請聯系網站管理員。 disable_register_mail=對不起，註冊郵箱確認功能已被關閉。 remember_me=記住登錄 -forgot_password=忘記密碼 -forget_password=忘記密碼？ +forgot_password_title=忘記密碼 +forgot_password=忘記密碼？ sign_up_now=還沒帳戶？馬上註冊。 confirmation_mail_sent_prompt=一封新的確認郵件已經被發送至 %s，請檢查您的收件箱並在 %d 小時內完成確認註冊操作。 active_your_account=啟用您的帳戶 diff --git a/routers/user/auth.go b/routers/user/auth.go index cb7d5961bd4..f8c6db1268f 100644 --- a/routers/user/auth.go +++ b/routers/user/auth.go @@ -864,7 +864,7 @@ func ActivateEmail(ctx *context.Context) { // ForgotPasswd render the forget pasword page func ForgotPasswd(ctx *context.Context) { - ctx.Data["Title"] = ctx.Tr("auth.forgot_password") + ctx.Data["Title"] = ctx.Tr("auth.forgot_password_title") if setting.MailService == nil { ctx.Data["IsResetDisable"] = true @@ -881,7 +881,7 @@ func ForgotPasswd(ctx *context.Context) { // ForgotPasswdPost response for forget password request func ForgotPasswdPost(ctx *context.Context) { - ctx.Data["Title"] = ctx.Tr("auth.forgot_password") + ctx.Data["Title"] = ctx.Tr("auth.forgot_password_title") if setting.MailService == nil { ctx.Handle(403, "ForgotPasswdPost", nil) diff --git a/templates/user/auth/forgot_passwd.tmpl b/templates/user/auth/forgot_passwd.tmpl index f1c25df503d..77de5fceeac 100644 --- a/templates/user/auth/forgot_passwd.tmpl +++ b/templates/user/auth/forgot_passwd.tmpl @@ -5,7 +5,7 @@
{{.CsrfTokenHtml}}

- {{.i18n.Tr "auth.forgot_password"}} + {{.i18n.Tr "auth.forgot_password_title"}}

{{template "base/alert" .}} diff --git a/templates/user/auth/signin_inner.tmpl b/templates/user/auth/signin_inner.tmpl index 34fcea08fcb..91feb7c5274 100644 --- a/templates/user/auth/signin_inner.tmpl +++ b/templates/user/auth/signin_inner.tmpl @@ -31,7 +31,7 @@
- {{.i18n.Tr "auth.forget_password"}} + {{.i18n.Tr "auth.forgot_password"}}
{{if .ShowRegistrationButton}} @@ -54,4 +54,4 @@
- \ No newline at end of file + diff --git a/templates/user/settings/delete.tmpl b/templates/user/settings/delete.tmpl index 67f5782d6ec..08e8f75d9ad 100644 --- a/templates/user/settings/delete.tmpl +++ b/templates/user/settings/delete.tmpl @@ -23,7 +23,7 @@ {{.i18n.Tr "settings.confirm_delete_account"}}
- {{.i18n.Tr "auth.forget_password"}} + {{.i18n.Tr "auth.forgot_password"}}
diff --git a/templates/user/settings/password.tmpl b/templates/user/settings/password.tmpl index f4883d7bf06..d97eb4f1408 100644 --- a/templates/user/settings/password.tmpl +++ b/templates/user/settings/password.tmpl @@ -29,7 +29,7 @@
- {{.i18n.Tr "auth.forget_password"}} + {{.i18n.Tr "auth.forgot_password"}}
{{else}}