fixes

Author: Saket Hatwar

modules/user_accounts/locale/hi/LC_MESSAGES/user_accounts.po

@@ -54,8 +54,11 @@ msgstr "नोट्स"
 msgid "It is recommended to use an email address as the username, for clarity and uniqueness."
 msgstr "स्पष्टता और अद्वितीयता के लिए उपयोगकर्ता नाम के रूप में ईमेल पते का उपयोग करने की अनुशंसा की जाती है।"
 
-msgid "When generating a new password, please notify the user by checking 'Send email to user' box below!"
-msgstr "नया पासवर्ड बनाते समय, कृपया नीचे 'उपयोगकर्ता को ईमेल भेजें' बॉक्स को चेक करके उपयोगकर्ता को सूचित करें!"
+msgid "When generating a new password, please notify the user by checking 'Send email to user' box"
+msgstr "नया पासवर्ड बनाते समय, कृपया 'उपयोगकर्ता को ईमेल भेजें' बॉक्स को चुनकर उपयोगकर्ता को सूचित करें।"
+
+msgid "You must leave the password field empty if you want the system to generate one for you"
+msgstr "यदि आप चाहते हैं कि सिस्टम आपके लिए पासवर्ड बनाए, तो पासवर्ड फ़ील्ड खाली छोड़ना आवश्यक है।"
 
 msgid "Add/Edit User"
 msgstr "उपयोगकर्ता जोड़ें/संपादित करें"
@@ -173,3 +176,18 @@ msgstr "कृपया कम से कम एक परीक्षक स्
 
 msgid "Please notice that the \"Active from\" date should be lesser or equal to the \"Active to\" date."
 msgstr "कृपया ध्यान दें कि 'सक्रिय शुरू' तिथि, 'सक्रिय समाप्त' तिथि के बराबर या उससे पहले होनी चाहिए।"
+
+msgid "Your password cannot be your email."
+msgstr "आपका पासवर्ड आपका ईमेल नहीं हो सकता।"
+
+msgid "Your password cannot be your user name."
+msgstr "आपका पासवर्ड आपका उपयोगकर्ता नाम नहीं हो सकता।"
+
+msgid "The passwords do not match."
+msgstr "पासवर्ड मेल नहीं खाते।"
+
+msgid "New and old passwords are identical"
+msgstr "नया और पुराना पासवर्ड समान हैं।"
+
+msgid "This email address is already in use"
+msgstr "यह ईमेल पता पहले से उपयोग में है।"

modules/user_accounts/locale/user_accounts.pot

@@ -54,7 +54,10 @@ msgstr ""
 msgid "It is recommended to use an email address as the username, for clarity and uniqueness."
 msgstr ""
 
-msgid "When generating a new password, please notify the user by checking 'Send email to user' box below!"
+msgid "When generating a new password, please notify the user by checking 'Send email to user' box"
+msgstr ""
+
+msgid "You must leave the password field empty if you want the system to generate one for you"
 msgstr ""
 
 msgid "Add/Edit User"
@@ -173,3 +176,18 @@ msgstr ""
 
 msgid "Please notice that the \"Active from\" date should be lesser or equal to the \"Active to\" date."
 msgstr ""
+
+msgid "Your password cannot be your email."
+msgstr ""
+
+msgid "Your password cannot be your user name."
+msgstr ""
+
+msgid "The passwords do not match."
+msgstr ""
+
+msgid "New and old passwords are identical"
+msgstr ""
+
+msgid "This email address is already in use"
+msgstr ""

modules/user_accounts/php/edit_user.class.inc

@@ -1247,7 +1247,10 @@ class Edit_User extends \NDB_Form
         if ($values['Email'] === $values['Password_hash']
             && $values['Password_hash'] !== ''
         ) {
-            $errors['Password'] = self::PASSWORD_ERROR_IS_EMAIL;
+            $errors['Password'] = dgettext(
+                "user_accounts",
+                "Your password cannot be your email."
+            );
         }
 
         // Make sure the user is not using their username as their password.
@@ -1260,7 +1263,10 @@ class Edit_User extends \NDB_Form
             || (!empty($this->identifier)
             && $this->identifier === $values['Password_hash'])
         ) {
-            $errors['Password'] = self::PASSWORD_ERROR_IS_USER;
+            $errors['Password'] = dgettext(
+                "user_accounts",
+                "Your password cannot be your user name."
+            );
         }
 
         if (!is_null($this->identifier)) {
@@ -1286,7 +1292,10 @@ class Edit_User extends \NDB_Form
         // Ensure that the password and confirm password fields match.
         // TODO This validation should be done on the front-end instead.
         if ($plaintext !== $values['__Confirm']) {
-            $errors['Password'] = self::PASSWORD_ERROR_NO_MATCH;
+            $errors['Password'] = dgettext(
+                "user_accounts",
+                "The passwords do not match."
+            );
         }
 
         // if password is user-defined, and user wants to change password
@@ -1302,7 +1311,10 @@ class Edit_User extends \NDB_Form
                 $isPasswordDifferent = \User::factory($this->identifier)
                     ->isPasswordDifferent($decoded);
                 if (! $isPasswordDifferent) {
-                    $errors['Password'] = self::PASSWORD_ERROR_NO_CHANGE;
+                    $errors['Password'] = dgettext(
+                        "user_accounts",
+                        "New and old passwords are identical"
+                    );
                 }
             } catch (\InvalidArgumentException $e) {
                 $errors['Password'] = $e->getMessage();
@@ -1314,17 +1326,22 @@ class Edit_User extends \NDB_Form
             && $values['NA_Password'] == "on"
             && $values['SendEmail'] != "on"
         ) {
-            $errors['Email']
-                = 'When generating a new password, '
-                . 'please notify the user by checking Send email to user box';
+            $errors['Email'] = dgettext(
+                "user_accounts",
+                "When generating a new password, please notify the user by checking"
+                + " 'Send email to user' box"
+            );
         }
 
         if (isset($values['NA_Password'])
             && $values['NA_Password'] == 'on'
             && $plaintext != ''
         ) {
-            $errors['Password'] = 'You must leave the password field empty '
-                . 'if you want the system to generate one for you';
+            $errors['Password'] = dgettext(
+                "user_accounts",
+                "You must leave the password field empty if you want the system to"
+                + " generate one for you"
+            );
         }
 
         if (is_null($this->identifier)
@@ -1474,7 +1491,10 @@ class Edit_User extends \NDB_Form
 
         // Email already exists in database
         if ($result > 0) {
-            return self::EMAIL_NOT_UNIQUE;
+            return dgettext(
+                "user_accounts",
+                "This email address is already in use"
+            );
         }
 
         return null;