summaryrefslogtreecommitdiffstats
path: root/template
diff options
context:
space:
mode:
authorMatt Selsky <selsky@columbia.edu>2012-07-24 16:29:33 +0200
committerFrédéric Buclin <LpSolit@gmail.com>2012-07-24 16:29:33 +0200
commit00bb32b8cae38ecc4f6cbe65670781f0c532170e (patch)
treef075c353f51847e2e09cdfe103b80220ce291521 /template
parent8496cc97db437a508ad7346afc3802f90bd2910e (diff)
downloadbugzilla-00bb32b8cae38ecc4f6cbe65670781f0c532170e.tar.gz
bugzilla-00bb32b8cae38ecc4f6cbe65670781f0c532170e.tar.xz
Bug 412054: Say "deny login" instead of "disable" in User Accounts admin UI
r=gerv a=LpSolit
Diffstat (limited to 'template')
-rw-r--r--template/en/default/admin/users/userdata.html.tmpl4
-rw-r--r--template/en/default/global/messages.html.tmpl8
2 files changed, 6 insertions, 6 deletions
diff --git a/template/en/default/admin/users/userdata.html.tmpl b/template/en/default/admin/users/userdata.html.tmpl
index b94655db8..ae952d151 100644
--- a/template/en/default/admin/users/userdata.html.tmpl
+++ b/template/en/default/admin/users/userdata.html.tmpl
@@ -102,8 +102,8 @@
defaultcontent = otheruser.disabledtext
onchange = "userDisabledTextOnChange(this);"
%]<br>
- (If non-empty, then the account will be disabled, and this text should
- explain why.)
+ (If non-empty, then it will not be possible to log in using this account,
+ and this text should explain why.)
</td>
</tr>
[% END %]
diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl
index 7f7cf09d9..d39890c13 100644
--- a/template/en/default/global/messages.html.tmpl
+++ b/template/en/default/global/messages.html.tmpl
@@ -42,9 +42,9 @@
[% ELSIF field == 'cryptpassword' %]
A new password has been set.
[% ELSIF field == 'disabledtext' %]
- The disable text has been modified.
+ The "login disabled" text has been modified.
[% ELSIF field == 'is_enabled' %]
- The user has been [% otheruser.is_enabled ? 'enabled' : 'disabled' %].
+ Logging in with this user account has been [% otheruser.is_enabled ? 'enabled' : 'disabled' %].
[% ELSIF field == 'extern_id' %]
The user's External Login ID has been modified.
[% ELSIF field == 'disable_mail' %]
@@ -97,8 +97,8 @@
successfully.
[% ELSIF message_tag == "account_disabled" %]
- The user account [% account FILTER html %] is disabled, so you
- cannot change its password.
+ Logging in with this user account [% account FILTER html %] is disabled, so
+ you cannot change its password.
[% ELSIF message_tag == "attachment_creation_failed" %]
The [% terms.bug %] was created successfully, but attachment creation