fixes2

Author: Saket Hatwar

locale/hi/LC_MESSAGES/loris.po

@@ -123,6 +123,9 @@ msgstr "हाँ"
 msgid "No"
 msgstr "नहीं"
 
+msgid "N/A"
+msgstr "लागू नहीं"
+
 # Common candidate terms
 msgid "PSCID"
 msgstr "पीएससीआईडी"
@@ -193,6 +196,9 @@ msgstr "सहेजें"
 msgid "Reset"
 msgstr "रीसेट करें"
 
+msgid "email_text"
+msgstr "ईमेल_पाठ"
+
 # Data table strings
 msgid "{{pageCount}} rows displayed of {{totalCount}}."
 msgstr "{{totalCount}} में से {{pageCount}} पंक्तियाँ प्रदर्शित"
@@ -202,3 +208,49 @@ msgstr "प्रति पृष्ठ अधिकतम पंक्तिय
 
 msgid "Download Table as CSV"
 msgstr "तालिका को CSV के रूप में डाउनलोड करें"
+
+# User Account related
+msgid "Password Rules"
+msgstr "पासवर्ड नियम"
+
+msgid "User name"
+msgstr "उपयोगकर्ता नाम"
+
+msgid "First name"
+msgstr "पहला नाम"
+
+msgid "First name is required and should not exceed 120 characters"
+msgstr "पहला नाम आवश्यक है और 120 अक्षरों से अधिक नहीं होना चाहिए।"
+
+msgid "Last name"
+msgstr "अंतिम नाम"
+
+msgid "Last name is required and should not exceed 120 characters"
+msgstr "अंतिम नाम आवश्यक है और 120 अक्षरों से अधिक नहीं होना चाहिए।"
+
+msgid "Email address"
+msgstr "ईमेल पता"
+
+msgid "New Password"
+msgstr "नया पासवर्ड"
+
+msgid "Confirm Password"
+msgstr "पासवर्ड की पुष्टि करें"
+
+msgid "Email address is required"
+msgstr "ईमेल पता आवश्यक है"
+
+msgid "The password must be at least 8 characters long."
+msgstr "पासवर्ड कम से कम 8 अक्षरों का होना चाहिए।"
+
+msgid "The password cannot be your username or email address."
+msgstr "पासवर्ड आपका उपयोगकर्ता नाम या ईमेल पता नहीं हो सकता।"
+
+msgid "Please choose a unique password."
+msgstr "कृपया एक अद्वितीय पासवर्ड चुनें।"
+
+msgid "No special characters are required but your password must be sufficiently complex to be accepted."
+msgstr "कोई विशेष अक्षर आवश्यक नहीं हैं, लेकिन पासवर्ड पर्याप्त जटिल होना चाहिए ताकि उसे स्वीकार किया जा सके।"
+
+msgid "We suggest using a password manager to generate one for you."
+msgstr "हम सुझाव देते हैं कि आपके लिए पासवर्ड बनाने हेतु पासवर्ड मैनेजर का उपयोग करें।"

locale/loris.pot

@@ -192,6 +192,9 @@ msgstr ""
 msgid "Reset"
 msgstr ""
 
+msgid "email_text"
+msgstr ""
+
 # Data table strings
 msgid "{{pageCount}} rows displayed of {{totalCount}}."
 msgstr ""

modules/my_preferences/locale/hi/LC_MESSAGES/my_preferences.po

@@ -21,60 +21,15 @@ msgstr ""
 msgid "My Preferences"
 msgstr "मेरी प्राथमिकताएँ"
 
-msgid "Password Rules"
-msgstr "पासवर्ड नियम"
-
-msgid "The password must be at least 8 characters long."
-msgstr "पासवर्ड कम से कम 8 अक्षरों का होना चाहिए।"
-
-msgid "The password cannot be your username or email address."
-msgstr "पासवर्ड आपका उपयोगकर्ता नाम या ईमेल पता नहीं हो सकता।"
-
-msgid "No special characters are required but your password must be sufficiently complex to be accepted."
-msgstr "कोई विशेष अक्षर आवश्यक नहीं हैं, लेकिन पासवर्ड पर्याप्त जटिल होना चाहिए ताकि उसे स्वीकार किया जा सके।"
-
-msgid "Please choose a unique password."
-msgstr "कृपया एक अद्वितीय पासवर्ड चुनें।"
-
-msgid "We suggest using a password manager to generate one for you."
-msgstr "हम सुझाव देते हैं कि आपके लिए पासवर्ड बनाने हेतु पासवर्ड मैनेजर का उपयोग करें।"
-
 msgid "Edit My Information"
 msgstr "मेरी जानकारी संपादित करें"
 
 msgid "Notifications"
 msgstr "सूचनाएँ"
 
-msgid "User name"
-msgstr "उपयोगकर्ता नाम"
-
-msgid "First name"
-msgstr "पहला नाम"
-
-msgid "First name is required and should not exceed 120 characters"
-msgstr "पहला नाम आवश्यक है और 120 अक्षरों से अधिक नहीं होना चाहिए।"
-
-msgid "Last name"
-msgstr "अंतिम नाम"
-
-msgid "Last name is required and should not exceed 120 characters"
-msgstr "अंतिम नाम आवश्यक है और 120 अक्षरों से अधिक नहीं होना चाहिए।"
-
-msgid "Email address"
-msgstr "ईमेल पता"
-
-msgid "Email address is required"
-msgstr "ईमेल पता आवश्यक है"
-
 msgid "Your email address must be less than 255 characters long"
 msgstr "आपका ईमेल पता 255 अक्षरों से कम होना चाहिए।"
 
-msgid "New Password"
-msgstr "नया पासवर्ड"
-
-msgid "Confirm Password"
-msgstr "पासवर्ड की पुष्टि करें"
-
 msgid "Language preference"
 msgstr "भाषा वरीयता"
 
@@ -84,23 +39,20 @@ msgstr "क्रिया"
 msgid "Description"
 msgstr "विवरण"
 
-msgid "N/A"
-msgstr "लागू नहीं"
-
 msgid "Invalid email address"
 msgstr "अमान्य ईमेल पता"
 
 msgid "The email address already exists"
 msgstr "ईमेल पता पहले से मौजूद है"
 
-msgid "Your password can't be your email."
+msgid "Your password cannot be your email"
 msgstr "आपका पासवर्ड आपका ईमेल नहीं हो सकता।"
 
-msgid "Your password can't be your username"
+msgid "Your password cannot be your username"
 msgstr "आपका पासवर्ड आपका उपयोगकर्ता नाम नहीं हो सकता।"
 
-msgid "The passwords do not match."
+msgid "The passwords do not match"
 msgstr "पासवर्ड मेल नहीं खाते।"
 
-msgid "New and old passwords are identical: please choose another one"
-msgstr "नया और पुराना पासवर्ड समान हैं: कृपया कोई और चुनें।"
+msgid "New and old passwords are identical"
+msgstr "नया और पुराना पासवर्ड समान हैं।"

modules/my_preferences/locale/my_preferences.pot

@@ -93,14 +93,14 @@ msgstr ""
 msgid "The email address already exists"
 msgstr ""
 
-msgid "Your password cannot be your email."
+msgid "Your password cannot be your email"
 msgstr ""
 
 msgid "Your password cannot be your username"
 msgstr ""
 
-msgid "The passwords do not match."
+msgid "The passwords do not match"
 msgstr ""
 
-msgid "New and old passwords are identical: please choose another one"
+msgid "New and old passwords are identical"
 msgstr ""

modules/my_preferences/php/my_preferences.class.inc

@@ -10,9 +10,9 @@ namespace LORIS\my_preferences;
 class My_Preferences extends \NDB_Form
 {
     // Use gettext for error messages
-    private const PASSWORD_ERROR_IS_EMAIL  = 'Your password cannot be your email.';
+    private const PASSWORD_ERROR_IS_EMAIL  = 'Your password cannot be your email';
     private const PASSWORD_ERROR_IS_USER   = 'Your password cannot be your username';
-    private const PASSWORD_ERROR_NO_MATCH  = 'The passwords do not match.';
+    private const PASSWORD_ERROR_NO_MATCH  = 'The passwords do not match';
     private const PASSWORD_ERROR_NO_CHANGE = 'New and old passwords are identical';
 
     /**
@@ -225,20 +225,20 @@ class My_Preferences extends \NDB_Form
         $notifier_services = \NDB_Notifier::getNotificationServices();
 
         // user name
-        $this->addScoreColumn('UserID', dgettext('my_preferences', 'User name'));
+        $this->addScoreColumn('UserID', dgettext('loris', 'User name'));
 
         // full name
         // The supplied pattern is:
         //   - must have at least one non-whitespace characters (i.e. required)
         //   - once leading and trailing spaces are stripped, the field should
         //       not exceed 120 chars
         $firstNameInvalidMsg = dgettext(
-            'my_preferences',
+            'loris',
             "First name is required and should not exceed 120 characters"
         );
         $this->addBasicText(
             'First_name',
-            dgettext('my_preferences', 'First name'),
+            dgettext('loris', 'First name'),
             [],
             [
                 'oninvalid' => "this.setCustomValidity('$firstNameInvalidMsg')",
@@ -252,12 +252,12 @@ class My_Preferences extends \NDB_Form
         //   - once leading and trailing spaces are stripped, the field should
         //       not exceed 120 chars
         $lastNameInvalidMsg = dgettext(
-            'my_preferences',
+            'loris',
             "Last name is required and should not exceed 120 characters"
         );
         $this->addBasicText(
             'Last_name',
-            dgettext('my_preferences', 'Last name'),
+            dgettext('loris', 'Last name'),
             [],
             [
                 'oninvalid' => "this.setCustomValidity('$lastNameInvalidMsg')",
@@ -286,7 +286,7 @@ class My_Preferences extends \NDB_Form
         $this->addRule(
             'Email',
             dgettext(
-                'my_preferences',
+                'loris',
                 'Email address is required'
             ),
             'required'
@@ -305,12 +305,12 @@ class My_Preferences extends \NDB_Form
         $this->form->addElement(
             'password',
             'Password_hash',
-            dgettext('my_preferences', 'New Password')
+            dgettext('loris', 'New Password')
         );
         $this->form->addElement(
             'password',
             '__Confirm',
-            dgettext('my_preferences', 'Confirm Password')
+            dgettext('loris', 'Confirm Password')
         );
 
         // language preference
@@ -326,7 +326,7 @@ class My_Preferences extends \NDB_Form
 
         // Notification headers
         $nGroup   = [];
-        $nGroup[] = $this->createLabel(dgettext('my_preferences', "Module"));
+        $nGroup[] = $this->createLabel(dgettext('loris', "Module"));
         $nGroup[] = $this->createLabel(dgettext('my_preferences', "Operation"));
         $nGroup[] = $this->createLabel(dgettext('my_preferences', "Description"));
 
@@ -369,7 +369,7 @@ class My_Preferences extends \NDB_Form
                         );
                     } else {
                         $nGroup[] = $this->createLabel(
-                            dgettext('my_preferences', "N/A")
+                            dgettext('loris', "N/A")
                         );
                     }
                 }

php/libraries/NDB_Notifier.class.inc

@@ -71,6 +71,8 @@ class NDB_Notifier extends NDB_Notifier_Abstract
             $this->tpl_data['custom_message'] =$custom_message;
         }
 
+        $this->tpl_data['email_text_label'] = dgettext('loris', 'email_text');
+
         // Basic email handler
         if (!empty($this->notified['email_text'])) {
             $this->_sendEmails($projectID);