From 00bb32b8cae38ecc4f6cbe65670781f0c532170e Mon Sep 17 00:00:00 2001
From: Matt Selsky <selsky@columbia.edu>
Date: Tue, 24 Jul 2012 16:29:33 +0200
Subject: Bug 412054: Say "deny login" instead of "disable" in User Accounts
 admin UI r=gerv a=LpSolit

---
 Bugzilla/WebService/User.pm                        | 6 +++---
 contrib/syncLDAP.pl                                | 6 +++---
 template/en/default/admin/users/userdata.html.tmpl | 4 ++--
 template/en/default/global/messages.html.tmpl      | 8 ++++----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Bugzilla/WebService/User.pm b/Bugzilla/WebService/User.pm
index 58461e2a1..07c36bd9c 100644
--- a/Bugzilla/WebService/User.pm
+++ b/Bugzilla/WebService/User.pm
@@ -412,10 +412,10 @@ to the webservice, for the duration of the session.
 
 The username does not exist, or the password is wrong.
 
-=item 301 (Account Disabled)
+=item 301 (Login Disabled)
 
-The account has been disabled.  A reason may be specified with the
-error.
+The ability to login with this account has been disabled.  A reason may be
+specified with the error.
 
 =item 305 (New Password Required)
 
diff --git a/contrib/syncLDAP.pl b/contrib/syncLDAP.pl
index 68c876868..ec0839ed5 100755
--- a/contrib/syncLDAP.pl
+++ b/contrib/syncLDAP.pl
@@ -51,7 +51,7 @@ foreach my $arg (@ARGV)
          print "usage:\n syncLDAP.pl [options]\n\n";
          print "options:\n";
          print " -r Readonly, do not make changes to Bugzilla tables\n";
-         print " -d No disable, don't disable users, which are not in LDAP\n";
+         print " -d No disable, don't disable login by users who are not in LDAP\n";
          print " -u No update, don't update users, which have different description in LDAP\n";
          print " -c No create, don't create users, which are in LDAP but not in Bugzilla\n";
          print " -q Quiet mode, give less output\n";
@@ -194,7 +194,7 @@ while( my ($create_key, $create_value) = each(%create_users) ) {
 }
 
 if($quiet == 0) {
-   print "\nUsers to disable: \n";
+   print "\nUsers to disable login for: \n";
    while( my ($key, $value) = each(%disable_users) ) {
      print " " . $key . " '" . $value->{'realname'} . "'\n";
    }
@@ -221,7 +221,7 @@ if($quiet == 0) {
 # now do the DB-Update
 ###
 if($readonly == 0) {
-   print "Performing DB update:\nPhase 1: disabling not-existing users... " unless $quiet;
+   print "Performing DB update:\nPhase 1: disabling login for users not in LDAP... " unless $quiet;
 
    my $sth_disable = $dbh->prepare(
        'UPDATE profiles
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
-- 
cgit v1.2.3-24-g4f1b