diff options
| author | Byron Jones <glob@mozilla.com> | 2015-08-25 07:40:13 +0200 |
|---|---|---|
| committer | Byron Jones <glob@mozilla.com> | 2015-08-25 07:40:13 +0200 |
| commit | e6d45b6d6028527079744af20dc9407a2a3867f2 (patch) | |
| tree | 9f229ada0012cac216a73c442c56e8ac6f1cfe2a /template/en/default/global | |
| parent | 90a618266ecb83f138cd5d0a3ff5bf26012625e9 (diff) | |
| download | bugzilla-e6d45b6d6028527079744af20dc9407a2a3867f2.tar.gz bugzilla-e6d45b6d6028527079744af20dc9407a2a3867f2.tar.xz | |
Bug 1196134 - add ability for admins to force a user to change their password on next login
Diffstat (limited to 'template/en/default/global')
| -rw-r--r-- | template/en/default/global/messages.html.tmpl | 4 | ||||
| -rw-r--r-- | template/en/default/global/user-error.html.tmpl | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl index 0f408842f..4cefe2a3f 100644 --- a/template/en/default/global/messages.html.tmpl +++ b/template/en/default/global/messages.html.tmpl @@ -70,6 +70,10 @@ [% ELSE %] [% terms.Bug %]mail has been enabled. [% END %] + [% ELSIF field == 'password_change_required' %] + The user [% otheruser.password_change_required ? "must" : "no longer needs to" %] update their password. + [% ELSIF field == 'password_change_reason' %] + The password change reason has been modified. [% END %] </li> [% END %] diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index 814a02c13..98076ce1c 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -1352,6 +1352,10 @@ [% title = "New Password Missing" %] You must enter a new password. + [% ELSIF error == "new_password_same" %] + [% title = "Password Unchanged" %] + Your new password cannot be the same as your old password. + [% ELSIF error == "no_axes_defined" %] [% title = "No Axes Defined" %] [% docslinks = {'reporting.html' => 'Reporting'} %] |