summaryrefslogtreecommitdiffstats
path: root/templates/user
diff options
context:
space:
mode:
authorSandro Santilli <strk@kbt.io>2017-02-20 19:27:20 +0100
committerKim "BKC" Carlbäcker <kim.carlbacker@gmail.com>2017-03-14 22:54:07 +0100
commit7d8f9d1c46e38681f2a4033a7da811ab7562d953 (patch)
treea44e9fa6b24b431c3483ae184a7502822a15d968 /templates/user
parent8746fb3385ffbb7c2fc9354bf51a5225543cfb72 (diff)
downloadgitea-7d8f9d1c46e38681f2a4033a7da811ab7562d953.tar.gz
gitea-7d8f9d1c46e38681f2a4033a7da811ab7562d953.zip
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)
Diffstat (limited to 'templates/user')
-rw-r--r--templates/user/auth/forgot_passwd.tmpl2
-rw-r--r--templates/user/auth/signin_inner.tmpl4
-rw-r--r--templates/user/settings/delete.tmpl2
-rw-r--r--templates/user/settings/password.tmpl2
4 files changed, 5 insertions, 5 deletions
diff --git a/templates/user/auth/forgot_passwd.tmpl b/templates/user/auth/forgot_passwd.tmpl
index f1c25df503..77de5fceea 100644
--- 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 34fcea08fc..91feb7c527 100644
--- 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 67f5782d6e..08e8f75d9a 100644
--- 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 f4883d7bf0..d97eb4f140 100644
--- 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}}