Skip to content

Commit 8bd5c90

Browse files
strkstrk
committed
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)
1 parent 1ccdf19 commit 8bd5c90

28 files changed

+58
-53
lines changed

‎CHANGELOG.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Changelog
22

3+
## Unreleased
4+
5+
* BREAKING
6+
* Password reset URL changed from `/user/forget_password` to `/user/forgot_password`
7+
38
## [1.1.0](https://github.com/go-gitea/gitea/releases/tag/v1.1.0) - 2017-03-09
49

510
* BREAKING
@@ -72,7 +77,7 @@
7277
* Added option to config to disable local path imports [#724](https://github.com/go-gitea/gitea/pull/724)
7378
* Allow custom public files [#782](https://github.com/go-gitea/gitea/pull/782)
7479
* Added pprof endpoint for debugging [#801](https://github.com/go-gitea/gitea/pull/801)
75-
* Added X-GitHub-* headers [#809](https://github.com/go-gitea/gitea/pull/809)
80+
* Added `X-GitHub-*` headers [#809](https://github.com/go-gitea/gitea/pull/809)
7681
* Fill SSH key title automatically [#863](https://github.com/go-gitea/gitea/pull/863)
7782
* Display Git version on admin panel [#921](https://github.com/go-gitea/gitea/pull/921)
7883
* Expose URL field on issue API [#982](https://github.com/go-gitea/gitea/pull/982)
@@ -104,7 +109,7 @@
104109
## [1.0.1](https://github.com/go-gitea/gitea/releases/tag/v1.0.1) - 2017-01-05
105110

106111
* BUGFIXES
107-
* Fixed localized MIN_PASSWORD_LENGTH [#501](https://github.com/go-gitea/gitea/pull/501)
112+
* Fixed localized `MIN_PASSWORD_LENGTH` [#501](https://github.com/go-gitea/gitea/pull/501)
108113
* Fixed 500 error on organization delete [#507](https://github.com/go-gitea/gitea/pull/507)
109114
* Ignore empty wiki repo on migrate [#544](https://github.com/go-gitea/gitea/pull/544)
110115
* Proper check access for forking [#563](https://github.com/go-gitea/gitea/pull/563)

‎cmd/web.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -254,8 +254,8 @@ func runWeb(ctx *cli.Context) error {
254254
m.Any("/activate", user.Activate)
255255
m.Any("/activate_email", user.ActivateEmail)
256256
m.Get("/email2user", user.Email2User)
257-
m.Get("/forget_password", user.ForgotPasswd)
258-
m.Post("/forget_password", user.ForgotPasswdPost)
257+
m.Get("/forgot_password", user.ForgotPasswd)
258+
m.Post("/forgot_password", user.ForgotPasswdPost)
259259
m.Get("/logout", user.SignOut)
260260
})
261261
// ***** END: User *****

‎options/locale/locale_bg-BG.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,8 @@ social_register_helper_msg=Вече имате профил? Свържете с
145145
disable_register_prompt=За съжаление създаването на нови регистрации е изключено. Обърнете се към администратора на сайта.
146146
disable_register_mail=За съжаление потвърждението на регистрации е изключено.
147147
remember_me=Запомни ме
148-
forgot_password=Забравена парола
149-
forget_password=Забравена парола?
148+
forgot_password_title=Забравена парола
149+
forgot_password=Забравена парола?
150150
sign_up_now=Нуждаете се от профил? Регистрирайте се сега.
151151
confirmation_mail_sent_prompt=Ново писмо за потвърждение е изпратено до <b>%s</b>. Моля проверете пощенската си кутия в рамките на следващите %d часа, за да завършите процеса на регистрация.
152152
active_your_account=Активиране на профил

‎options/locale/locale_cs-CZ.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,8 @@ social_register_helper_msg=Již máte účet? Připojte se!
146146
disable_register_prompt=Omlouváme se, ale registrace jsou vypnuty. Prosíme, spojte se správcem systému.
147147
disable_register_mail=Omlouváme se, potvrzovací registrační e-maily byly vypnuty.
148148
remember_me=Zapamatovat si mne
149-
forgot_password=Zapomenuté heslo
150-
forget_password=Zapomněli jste heslo?
149+
forgot_password_title=Zapomenuté heslo
150+
forgot_password=Zapomněli jste heslo?
151151
sign_up_now=Potřebujete účet? Zaregistrujte se.
152152
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.
153153
active_your_account=Aktivujte si váš účet

‎options/locale/locale_de-DE.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,8 @@ social_register_helper_msg=Hast du bereits ein Konto? Jetzt verknüpfen!
162162
disable_register_prompt=Die Registrierung wurde deaktiviert. Bitte wende dich an den Administrator.
163163
disable_register_mail=Es tut uns leid, die Bestätigung der Registrierungs-E-Mail wurde deaktiviert.
164164
remember_me=Angemeldet bleiben
165-
forgot_password=Passwort vergessen
166-
forget_password=Passwort vergessen?
165+
forgot_password_title=Passwort vergessen
166+
forgot_password=Passwort vergessen?
167167
sign_up_now=Möchtest du ein Konto? Registriere dich jetzt.
168168
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.
169169
active_your_account=Aktiviere dein Konto

‎options/locale/locale_en-US.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,8 @@ social_register_helper_msg = Already have an account? Bind now!
165165
disable_register_prompt = Sorry, registration has been disabled. Please contact the site administrator.
166166
disable_register_mail = Sorry, Register Mail Confirmation has been disabled.
167167
remember_me = Remember Me
168-
forgot_password= Forgot Password
169-
forget_password = Forgot password?
168+
forgot_password_title= Forgot Password
169+
forgot_password = Forgot password?
170170
sign_up_now = Need an account? Sign up now.
171171
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.
172172
active_your_account = Activate Your Account

‎options/locale/locale_es-ES.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,8 @@ social_register_helper_msg=¿Ya tienes una cuenta? ¡Enlázala!
142142
disable_register_prompt=Lo sentimos, el registro está deshabilitado. Por favor, contacta con el administrador del sitio.
143143
disable_register_mail=Lo sentimos. Los correos de Confirmación de Registro están deshabilitados.
144144
remember_me=Recuérdame
145-
forgot_password=He olvidado mi contraseña
146-
forget_password=¿Has olvidado tu contraseña?
145+
forgot_password_title=He olvidado mi contraseña
146+
forgot_password=¿Has olvidado tu contraseña?
147147
sign_up_now=¿Necesitas una cuenta? Regístrate ahora.
148148
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.
149149
active_your_account=Activa tu cuenta

‎options/locale/locale_fi-FI.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,8 @@ social_register_helper_msg=On jo tili? Liitä nyt!
152152
disable_register_prompt=Sori, rekisteröinti on poistettu käytöstä. Ole hyvä ja ota yhteyttä sivuston ylläpitoon.
153153
disable_register_mail=Sori, rekisteröinti sähköpostivarmistukset on poistettu käytöstä.
154154
remember_me=Muista minut
155-
forgot_password=Unohtuiko salasana
156-
forget_password=Unohtuiko salasana?
155+
forgot_password_title=Unohtuiko salasana
156+
forgot_password=Unohtuiko salasana?
157157
sign_up_now=Tarvitsetko tilin? Rekisteröidy nyt.
158158
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.
159159
active_your_account=Aktivoi tilisi

‎options/locale/locale_fr-FR.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,8 @@ social_register_helper_msg=Déjà enregistré ? Associez-le !
161161
disable_register_prompt=Désolé, les enregistrements ont été désactivés. Veuillez contacter l'administrateur du site.
162162
disable_register_mail=Désolé, la confirmation par e-mail des enregistrements a été désactivée.
163163
remember_me=Se souvenir de moi
164-
forgot_password=Mot de passe oublié
165-
forget_password=Mot de passe oublié ?
164+
forgot_password_title=Mot de passe oublié
165+
forgot_password=Mot de passe oublié ?
166166
sign_up_now=Pas de compte ? Inscrivez-vous maintenant.
167167
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.
168168
active_your_account=Activer votre compte

‎options/locale/locale_it-IT.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,8 @@ social_register_helper_msg=Hai già un account? Associalo ora!
151151
disable_register_prompt=Siamo spiacenti, registrazione è stata disabilitata. Si prega di contattare l'amministratore del sito.
152152
disable_register_mail=Siamo spiacenti, la conferma di registrazione via Mail è stata disattivata.
153153
remember_me=Ricordami
154-
forgot_password=Password dimenticata
155-
forget_password=Password dimenticata?
154+
forgot_password_title=Password dimenticata
155+
forgot_password=Password dimenticata?
156156
sign_up_now=Bisogno di un account? Iscriviti ora.
157157
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.
158158
active_your_account=Attiva il tuo Account

‎options/locale/locale_ja-JP.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,8 @@ social_register_helper_msg=既にアカウントをお持ちですか？連携
145145
disable_register_prompt=申し訳ありませんが、現在登録は受け付けておりません。サイトの管理者にお問い合わせください。
146146
disable_register_mail=申し訳ありませんが、登録メールの確認機能が無効になっています。
147147
remember_me=ログインしたままにする
148-
forgot_password=パスワードを忘れた
149-
forget_password=パスワードを忘れましたか？
148+
forgot_password_title=パスワードを忘れた
149+
forgot_password=パスワードを忘れましたか？
150150
sign_up_now=アカウントが必要ですか？今すぐ登録しましょう！
151151
confirmation_mail_sent_prompt=新しい確認メールを <b>%s</b> に送りました。登録を完了させるために、%d時間以内にあなたのメールボックスを確認してください。
152152
active_your_account=アカウントを有効化

‎options/locale/locale_ko-KR.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,8 @@ social_register_helper_msg=계정을 가지고 계신가요? 연결하세요!
145145
disable_register_prompt=죄송합니다, 가입이 비활성화 되어있습니다. 사이트 관리자에게 문의 해주세요.
146146
disable_register_mail=죄송합니다. 메일 등록이 비활성화 되었습니다.
147147
remember_me=자동 로그인
148-
forgot_password=비밀번호 찾기
149-
forget_password=비밀번호를 잊으셨습니까?
148+
forgot_password_title=비밀번호 찾기
149+
forgot_password=비밀번호를 잊으셨습니까?
150150
sign_up_now=계정이 필요하신가요? 지금 가입하세요.
151151
confirmation_mail_sent_prompt=새로운 확인 메일이 <b>%s</b>로 전송되었습니다. 받은 편지함으로 도착한 메일을 %d시간 안에 확인해서 등록 절차를 완료하십시오.
152152
active_your_account=계정 활성화

‎options/locale/locale_lv-LV.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,8 @@ social_register_helper_msg=Jau ir konts? Sasaisti tagad!
146146
disable_register_prompt=Atvainojiet, reģistrācija ir atspējota. Lūdzu, sazinieties ar vietnes administratoru.
147147
disable_register_mail=Atvainojiet, reģistrācijas e-pasta apstiprināšana ir atspējota.
148148
remember_me=Atcerēties mani
149-
forgot_password=Aizmirsu paroli
150-
forget_password=Aizmirsi paroli?
149+
forgot_password_title=Aizmirsu paroli
150+
forgot_password=Aizmirsi paroli?
151151
sign_up_now=Nepieciešams konts? Reģistrējies tagad.
152152
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.
153153
active_your_account=Aktivizēt savu kontu

‎options/locale/locale_nl-NL.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@ social_register_helper_msg=Heeft u al een account? Koppel nu!
147147
disable_register_prompt=Sorry, registratie is uitgeschakeld. Neem contact op met de beheerder van deze site.
148148
disable_register_mail=Sorry, bevestiging van registratie per e-mail is uitgeschakeld.
149149
remember_me=Onthoud mij
150-
forgot_password=Wachtwoord vergeten
151-
forget_password=Wachtwoord vergeten?
150+
forgot_password_title=Wachtwoord vergeten
151+
forgot_password=Wachtwoord vergeten?
152152
sign_up_now=Een account nodig? Meld u nu aan.
153153
confirmation_mail_sent_prompt=Een bevestigingsemail is gestuurd naar <b>%s</b>, Bevestig u aanvraag binnen %d uren om uw registratie te voltooien.
154154
active_your_account=Activeer uw account

‎options/locale/locale_pl-PL.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,8 @@ social_register_helper_msg=Masz już konto? Powiąż je teraz!
143143
disable_register_prompt=Przepraszamy rejestracja została wyłączona. Prosimy o kontakt z administratorem serwisu.
144144
disable_register_mail=Przepraszamy, potwierdzenia rejestracji zostały wyłączone przez administratora.
145145
remember_me=Zapamiętaj mnie
146-
forgot_password=Zapomniałem hasła
147-
forget_password=Zapomniałeś hasła?
146+
forgot_password_title=Zapomniałem hasła
147+
forgot_password=Zapomniałeś hasła?
148148
sign_up_now=Potrzebujesz konta? Zarejestruj się teraz.
149149
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.
150150
active_your_account=Aktywuj swoje konto

‎options/locale/locale_pt-BR.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,8 @@ social_register_helper_msg=Já tem uma conta? Junte-se agora!
162162
disable_register_prompt=Desculpe, novos registros estão desabilitados. Por favor entre em contato com o administrador do site.
163163
disable_register_mail=Desculpe, a confirmação de registro por e-mail foi desabilitada.
164164
remember_me=Lembrar de mim
165-
forgot_password=Esqueci a senha
166-
forget_password=Esqueceu a senha?
165+
forgot_password_title=Esqueci a senha
166+
forgot_password=Esqueceu a senha?
167167
sign_up_now=Precisa de uma conta? Cadastre-se agora.
168168
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.
169169
active_your_account=Ativar sua conta

‎options/locale/locale_ru-RU.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,8 @@ social_register_helper_msg=Уже есть учетная запись? Свяж
152152
disable_register_prompt=Извините, возможность регистрации отключена. Пожалуйста, свяжитесь с администратором сайта.
153153
disable_register_mail=К сожалению подтверждение регистрации по почте отключено.
154154
remember_me=Запомнить меня
155-
forgot_password=Забыли пароль
156-
forget_password=Забыли пароль?
155+
forgot_password_title=Забыли пароль
156+
forgot_password=Забыли пароль?
157157
sign_up_now=Нужен аккаунт? Зарегистрируйтесь.
158158
confirmation_mail_sent_prompt=Новое письмо для подтверждения было направлено на <b>%s</b>, пожалуйста, проверьте ваш почтовый ящик в течение %d часов для завершения регистрации.
159159
active_your_account=Активируйте свой аккаунт

‎options/locale/locale_sr-SP.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,8 @@ social_register_helper_msg=Већ имате налог? Повежите се
145145
disable_register_prompt=Извините регистрација је онемогућено. Молимо вас, контактирајте администратора.
146146
disable_register_mail=Извините, потврда путем поште је онемогућено.
147147
remember_me=Запамти ме
148-
forgot_password=Заборављена лозинка
149-
forget_password=Заборавили сте лозинку?
148+
forgot_password_title=Заборављена лозинка
149+
forgot_password=Заборавили сте лозинку?
150150
sign_up_now=Немате налог? Пријавите се.
151151
confirmation_mail_sent_prompt=Потврда упућена <b>%s</b> је послата, молимо проверите ваше поруке пре %d сати да завршите регистрацију.
152152
active_your_account=Активирајте ваш налог

‎options/locale/locale_sv-SE.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,8 @@ social_register_helper_msg=Har du redan ett konto? Anslut det nu!
160160
disable_register_prompt=Tyvärr är användarregistreringen inaktiverad. Vänligen kontakta din administratör.
161161
disable_register_mail=Tyvärr så är registreringsbekräftelemailutskick inaktiverat.
162162
remember_me=Kom ihåg mig
163-
forgot_password=Glömt lösenord
164-
forget_password=Glömt lösenordet?
163+
forgot_password_title=Glömt lösenord
164+
forgot_password=Glömt lösenordet?
165165
sign_up_now=Behöver du ett konto? Registrera dig nu.
166166
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.
167167
active_your_account=Aktivera ditt konto

‎options/locale/locale_tr-TR.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,8 @@ social_register_helper_msg=Zaten bir hesabınız var mı? Şimdi bağlanın!
144144
disable_register_prompt=Üzgünüz, kaydolma devre dışı bırakıldı. Lütfen site yöneticisiyle irtibata geçin.
145145
disable_register_mail=Üzgünüz, kayıt doğrulama e-postası devre dışı bırakıldı.
146146
remember_me=Beni Hatırla
147-
forgot_password=Parolamı Unuttum
148-
forget_password=Parolanızı mı unuttunuz?
147+
forgot_password_title=Parolamı Unuttum
148+
forgot_password=Parolanızı mı unuttunuz?
149149
sign_up_now=Bir hesaba mı ihtiyacınız var? Şimdi kaydolun.
150150
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.
151151
active_your_account=Hesabınızı Aktifleştirin

‎options/locale/locale_zh-CN.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,8 @@ social_register_helper_msg=已经注册？立即绑定！
162162
disable_register_prompt=对不起，注册功能已被关闭。请联系网站管理员。
163163
disable_register_mail=对不起，注册邮箱确认功能已被关闭。
164164
remember_me=记住登录
165-
forgot_password=忘记密码
166-
forget_password=忘记密码？
165+
forgot_password_title=忘记密码
166+
forgot_password=忘记密码？
167167
sign_up_now=还没帐户？马上注册。
168168
confirmation_mail_sent_prompt=一封新的确认邮件已经被发送至 <b>%s</b>，请检查您的收件箱并在 %d 小时内完成确认注册操作。
169169
active_your_account=激活您的帐户

‎options/locale/locale_zh-HK.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,8 @@ social_register_helper_msg=已經註冊？立即綁定！
153153
disable_register_prompt=對不起，註冊功能已被關閉。請聯系網站管理員。
154154
disable_register_mail=對不起，註冊郵箱確認功能已被關閉。
155155
remember_me=記住登錄
156-
forgot_password=忘記密碼
157-
forget_password=忘記密碼？
156+
forgot_password_title=忘記密碼
157+
forgot_password=忘記密碼？
158158
sign_up_now=還沒帳戶？馬上註冊。
159159
confirmation_mail_sent_prompt=一封新的確認郵件已經被發送至 <b>%s</b>，請檢查您的收件箱並在 %d 小時內完成確認註冊操作。
160160
active_your_account=啟用您的帳戶

‎options/locale/locale_zh-TW.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,8 @@ social_register_helper_msg=已經註冊？立即綁定！
159159
disable_register_prompt=對不起，註冊功能已被關閉。請聯系網站管理員。
160160
disable_register_mail=對不起，註冊郵箱確認功能已被關閉。
161161
remember_me=記住登錄
162-
forgot_password=忘記密碼
163-
forget_password=忘記密碼？
162+
forgot_password_title=忘記密碼
163+
forgot_password=忘記密碼？
164164
sign_up_now=還沒帳戶？馬上註冊。
165165
confirmation_mail_sent_prompt=一封新的確認郵件已經被發送至 <b>%s</b>，請檢查您的收件箱並在 %d 小時內完成確認註冊操作。
166166
active_your_account=啟用您的帳戶

‎routers/user/auth.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -864,7 +864,7 @@ func ActivateEmail(ctx *context.Context) {
864864

865865
// ForgotPasswd render the forget pasword page
866866
func ForgotPasswd(ctx *context.Context) {
867-
ctx.Data["Title"] = ctx.Tr("auth.forgot_password")
867+
ctx.Data["Title"] = ctx.Tr("auth.forgot_password_title")
868868

869869
if setting.MailService == nil {
870870
ctx.Data["IsResetDisable"] = true
@@ -881,7 +881,7 @@ func ForgotPasswd(ctx *context.Context) {
881881

882882
// ForgotPasswdPost response for forget password request
883883
func ForgotPasswdPost(ctx *context.Context) {
884-
ctx.Data["Title"] = ctx.Tr("auth.forgot_password")
884+
ctx.Data["Title"] = ctx.Tr("auth.forgot_password_title")
885885

886886
if setting.MailService == nil {
887887
ctx.Handle(403, "ForgotPasswdPost", nil)

‎templates/user/auth/forgot_passwd.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<form class="ui form" action="{{.Link}}" method="post">
66
{{.CsrfTokenHtml}}
77
<h2 class="ui top attached header">
8-
{{.i18n.Tr "auth.forgot_password"}}
8+
{{.i18n.Tr "auth.forgot_password_title"}}
99
</h2>
1010
<div class="ui attached segment">
1111
{{template "base/alert" .}}

‎templates/user/auth/signin_inner.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<div class="inline field">
3232
<label></label>
3333
<button class="ui green button">{{.i18n.Tr "sign_in"}}</button>
34-
<a href="{{AppSubUrl}}/user/forget_password">{{.i18n.Tr "auth.forget_password"}}</a>
34+
<a href="{{AppSubUrl}}/user/forgot_password">{{.i18n.Tr "auth.forgot_password"}}</a>
3535
</div>
3636

3737
{{if .ShowRegistrationButton}}
@@ -54,4 +54,4 @@
5454
</form>
5555
</div>
5656
</div>
57-
</div>
57+
</div>

0 commit comments

Comments
 (0)