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)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fd5315b6d00056ea18ce994bfc60e1115a5ad1c9..13d5302945969ad73797139f307ce8b914e3c197 100644 (file)
--- 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 c2d14a78705bc1c4322d528bcfb210e12d737092..af32592d0b7afe513ee578ab5981905ddd62c211 100644 (file)
--- 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 3abae27876b030a0a1a68c41585de210e4f778a5..a4fbd680909cbbde2ba48f18b46df174d91845f6 100644 (file)
--- 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=Ново писмо за потвърждение е изпратено до <b>%s</b>. Моля проверете пощенската си кутия в рамките на следващите %d часа, за да завършите процеса на регистрация.
 active_your_account=Активиране на профил

diff --git a/options/locale/locale_cs-CZ.ini b/options/locale/locale_cs-CZ.ini
index d632b58934c350dcbc9c51e031773007766ee470..05db4b1f7593a1281371dba8695bcd71f930f141 100644 (file)
--- 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 <b>%s</b>, 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 6398dff5480e9c9b3619a7ff68a3bb132bc943d0..efeb859fca449cd1831f9af7e8621bb0a9eae461 100644 (file)
--- 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 <b>%s</b> 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 f8e125076103ee2b866077ae546eeebf620f6f2e..d39589bd3055418e05e192ef692708fc4d9bba89 100644 (file)
--- 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 <b>%s</b>. 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 9f1cf56df49a96c78051f0b5837200d949e77c59..97e562917770b6b3a42c28ad2820bcd682a525ca 100644 (file)
--- 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 <b>%s</b>. 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 0b5f4c9e6970cff6d17273c8c4ca961064135777..884f1d9d35efe3a3f6f4018cca1c1efccaaf028c 100644 (file)
--- 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 <b>%s</b>, 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 808097739005f0685db1492808a7b225242369c5..4e80257c11ca5297ed7afcf18c52ca588396e264 100644 (file)
--- 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é à <b>%s</b>. 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 afb8f6cee55cc282304e2fc72ff3b3d356a9d054..29b9d2024cfbd638f68940a2b4e626dae76b940e 100644 (file)
--- 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 <b>%s</b>, 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 5bdffb1bd3565d7d95743c79f9c1d55a4e4ca311..dc1012ac143f452402ba1c58c5f39d1dc3dbd4f8 100644 (file)
--- 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=新しい確認メールを <b>%s</b> に送りました。登録を完了させるために、%d時間以内にあなたのメールボックスを確認してください。
 active_your_account=アカウントを有効化

diff --git a/options/locale/locale_ko-KR.ini b/options/locale/locale_ko-KR.ini
index 01390d23eeb0fadb715361ccb7bffd4da784c8f2..04fa32934b01fee2c04426a941ab5bc59a8ebb83 100644 (file)
--- 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=새로운 확인 메일이 <b>%s</b>로 전송되었습니다. 받은 편지함으로 도착한 메일을 %d시간 안에 확인해서 등록 절차를 완료하십시오.
 active_your_account=계정 활성화

diff --git a/options/locale/locale_lv-LV.ini b/options/locale/locale_lv-LV.ini
index 9a7e5b0c40ccd59fed1d4d77369163e47a1500e8..5ca65957ed04a02842f21a6025de409315ac1c7e 100644 (file)
--- 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 <b>%s</b>, 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 b2bf41403fe6fbe27ec9c72cf3a59741e87e9fe6..0c497268b8cffb7a70eeb9e3024970c4fca5e7c0 100644 (file)
--- 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 <b>%s</b>, 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 0cf00924bd84d9a10f5670e955bae270f186a48b..15a208af157bb9bfeea9b8388a2c00ad4428847b 100644 (file)
--- 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 <b>%s</b>, 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 4a4e592934dbb40ab2fd82d10caa3fbae95f79d8..11aae9f4bbaf0cf96e4ab542342809de1a50301c 100644 (file)
--- 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 <b>%s</b>, 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 cdfb1116216602e71e264304399efc3c960bc0b6..2df1a5aba5f184d7d23722e6cfabc1635700d0cf 100644 (file)
--- 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=Новое письмо для подтверждения было направлено на <b>%s</b>, пожалуйста, проверьте ваш почтовый ящик в течение %d часов для завершения регистрации.
 active_your_account=Активируйте свой аккаунт

diff --git a/options/locale/locale_sr-SP.ini b/options/locale/locale_sr-SP.ini
index 4cf86d2d3338a3897f768e2fd74a6798d2ba49cf..2dc463f34637049dbac1ba522237bd7cdc98466b 100644 (file)
--- 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=Потврда упућена <b>%s</b> је послата, молимо проверите ваше поруке пре %d сати да завршите регистрацију.
 active_your_account=Активирајте ваш налог

diff --git a/options/locale/locale_sv-SE.ini b/options/locale/locale_sv-SE.ini
index a80b1dce5c9783943567d580ec1f22935b6941bb..679ad43782287abc55463a1e9f0d342818503e94 100644 (file)
--- 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 <b>%s</b>, 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 91ae7d5134d2e78e758761cd910ffd71052e6436..0f6cd8ef37e7eb151e6c04702d2ee1151fec851c 100644 (file)
--- 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=<b>%s</b> 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 e2633b45d33f46e3af7cfa838eb245ce1fe283f3..c9c3927a68225c0387ae9184ba2b631bb18cf2e8 100644 (file)
--- 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=一封新的确认邮件已经被发送至 <b>%s</b>，请检查您的收件箱并在 %d 小时内完成确认注册操作。
 active_your_account=激活您的帐户

diff --git a/options/locale/locale_zh-HK.ini b/options/locale/locale_zh-HK.ini
index bf8b569f35cd39922b695229a4000b71d2ccd7e6..57682525020451169af50c8f7569c1efe77860ed 100644 (file)
--- 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=一封新的確認郵件已經被發送至 <b>%s</b>，請檢查您的收件箱並在 %d 小時內完成確認註冊操作。
 active_your_account=啟用您的帳戶

diff --git a/options/locale/locale_zh-TW.ini b/options/locale/locale_zh-TW.ini
index b9a1604884c0babbc1744b4dee704cf471315479..4f337dc29fea2f2379641d777a0cb5ce114b8b40 100644 (file)
--- 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=一封新的確認郵件已經被發送至 <b>%s</b>，請檢查您的收件箱並在 %d 小時內完成確認註冊操作。
 active_your_account=啟用您的帳戶

diff --git a/routers/user/auth.go b/routers/user/auth.go
index cb7d5961bd4ec30dc0e51be4f93e6bf7cac8df6d..f8c6db1268f2d2ce2011d6d7db551a79dab2998e 100644 (file)
--- 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 f1c25df503db7fb479af939e916180764ff5fa93..77de5fceeac1b0ef1bb06e74307850ba79a99d4c 100644 (file)
--- a/templates/user/auth/forgot_passwd.tmpl
+++ b/templates/user/auth/forgot_passwd.tmpl
@@ -5,7 +5,7 @@
                        <form class="ui form" action="{{.Link}}" method="post">
                                {{.CsrfTokenHtml}}
                                <h2 class="ui top attached header">
-                                       {{.i18n.Tr "auth.forgot_password"}}
+                                       {{.i18n.Tr "auth.forgot_password_title"}}
                                </h2>
                                <div class="ui attached segment">
                                        {{template "base/alert" .}}

diff --git a/templates/user/auth/signin_inner.tmpl b/templates/user/auth/signin_inner.tmpl
index 34fcea08fcbe130f429c540f1ca65f26d0644c91..91feb7c52744001ff491dc3a86d5f665f6e6f41d 100644 (file)
--- a/templates/user/auth/signin_inner.tmpl
+++ b/templates/user/auth/signin_inner.tmpl
@@ -31,7 +31,7 @@
                                        <div class="inline field">
                                                <label></label>
                                                <button class="ui green button">{{.i18n.Tr "sign_in"}}</button>
-                                               <a href="{{AppSubUrl}}/user/forget_password">{{.i18n.Tr "auth.forget_password"}}</a>
+                                               <a href="{{AppSubUrl}}/user/forgot_password">{{.i18n.Tr "auth.forgot_password"}}</a>
                                        </div>
 
                                        {{if .ShowRegistrationButton}}
@@ -54,4 +54,4 @@
                        </form>
                </div>
        </div>
-</div>
\ No newline at end of file
+</div>

diff --git a/templates/user/settings/delete.tmpl b/templates/user/settings/delete.tmpl
index 67f5782d6ec75981f8300e22321febb57910790b..08e8f75d9ad6e41abb889003b1aa8d893dec3ea5 100644 (file)
--- a/templates/user/settings/delete.tmpl
+++ b/templates/user/settings/delete.tmpl
@@ -23,7 +23,7 @@
                                                        {{.i18n.Tr "settings.confirm_delete_account"}}
                                                </div>
                                                <div>
-                                                       <a href="{{AppSubUrl}}/user/forget_password?email={{.Email}}">{{.i18n.Tr "auth.forget_password"}}</a>
+                                                       <a href="{{AppSubUrl}}/user/forgot_password?email={{.Email}}">{{.i18n.Tr "auth.forgot_password"}}</a>
                                                </div>
                                        </form>
                                </div>

diff --git a/templates/user/settings/password.tmpl b/templates/user/settings/password.tmpl
index f4883d7bf06ef10c646bb4d3d0771b6d94743b64..d97eb4f1408c29079ce35df7809f0c18e74c9db3 100644 (file)
--- a/templates/user/settings/password.tmpl
+++ b/templates/user/settings/password.tmpl
@@ -29,7 +29,7 @@
 
                                                <div class="field">
                                                        <button class="ui green button">{{$.i18n.Tr "settings.change_password"}}</button>
-                                                       <a href="{{AppSubUrl}}/user/forget_password?email={{.Email}}">{{.i18n.Tr "auth.forget_password"}}</a>
+                                                       <a href="{{AppSubUrl}}/user/forgot_password?email={{.Email}}">{{.i18n.Tr "auth.forgot_password"}}</a>
                                                </div>
                                        </form>
                                        {{else}}