additional translations

Author: Saket Hatwar

locale/hi/LC_MESSAGES/loris.po

@@ -113,6 +113,9 @@ msgstr "रिपोर्ट्स"
 msgid "TimePoint"
 msgstr "समय बिंदु"
 
+msgid "Module"
+msgstr "मॉड्यूल"
+
 # Common select option labels
 msgid "Yes"
 msgstr "हाँ"

locale/loris.pot

@@ -112,6 +112,9 @@ msgstr ""
 msgid "TimePoint"
 msgstr ""
 
+msgid "Module"
+msgstr ""
+
 # Common select option labels
 msgid "Yes"
 msgstr ""

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

@@ -22,7 +22,7 @@ msgid "My Preferences"
 msgstr "मेरी प्राथमिकताएँ"
 
 msgid "Password Rules"
-msgstr "पासवर्ड के नियम"
+msgstr "पासवर्ड नियम"
 
 msgid "The password must be at least 8 characters long."
 msgstr "पासवर्ड कम से कम 8 अक्षरों का होना चाहिए।"
@@ -31,16 +31,76 @@ 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 "कोई विशेष अक्षर आवश्यक नहीं हैं, लेकिन पासवर्ड पर्याप्त जटिल होना चाहिए ताकि स्वीकार किया जा सके।"
+msgstr "कोई विशेष अक्षर आवश्यक नहीं हैं, लेकिन पासवर्ड पर्याप्त जटिल होना चाहिए ताकि उसे स्वीकार किया जा सके।"
 
 msgid "Please choose a unique password."
 msgstr "कृपया एक अद्वितीय पासवर्ड चुनें।"
 
 msgid "We suggest using a password manager to generate one for you."
-msgstr "हम सुझाव देते हैं कि आपके लिए पासवर्ड बनाने के लिए पासवर्ड प्रबंधक का उपयोग करें।"
+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 "भाषा वरीयता"
+
+msgid "Operation"
+msgstr "क्रिया"
+
+msgid "Description"
+msgstr "विवरण"
+
+msgid "N/A"
+msgstr "लागू नहीं"
+
+msgid "Invalid email address"
+msgstr "अमान्य ईमेल पता"
+
+msgid "The email address already exists"
+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: please choose another one"
+msgstr "नया और पुराना पासवर्ड समान हैं: कृपया कोई और चुनें।"

modules/my_preferences/locale/my_preferences.pot

@@ -44,3 +44,63 @@ msgstr ""
 
 msgid "Notifications"
 msgstr ""
+
+msgid "User name"
+msgstr ""
+
+msgid "First name"
+msgstr ""
+
+msgid "First name is required and should not exceed 120 characters"
+msgstr ""
+
+msgid "Last name"
+msgstr ""
+
+msgid "Last name is required and should not exceed 120 characters"
+msgstr ""
+
+msgid "Email address"
+msgstr ""
+
+msgid "Email address is required"
+msgstr ""
+
+msgid "Your email address must be less than 255 characters long"
+msgstr ""
+
+msgid "New Password"
+msgstr ""
+
+msgid "Confirm Password"
+msgstr ""
+
+msgid "Language preference"
+msgstr ""
+
+msgid "Operation"
+msgstr ""
+
+msgid "Description"
+msgstr ""
+
+msgid "N/A"
+msgstr ""
+
+msgid "Invalid email address"
+msgstr ""
+
+msgid "The email address already exists"
+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: please choose another one"
+msgstr ""

modules/my_preferences/php/my_preferences.class.inc

@@ -9,12 +9,11 @@ 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_USER   = 'Your password cannot be ' .
-                                        'your user name.';
+    private const PASSWORD_ERROR_IS_USER   = 'Your password cannot be your user name.';
     private const PASSWORD_ERROR_NO_MATCH  = 'The passwords do not match.';
-    private const PASSWORD_ERROR_NO_CHANGE = 'New and old passwords are ' .
-                                        'identical: please choose another one';
+    private const PASSWORD_ERROR_NO_CHANGE = 'New and old passwords are identical: please choose another one';
 
     /**
      * Computes the initial values this page will be filled with.
@@ -223,21 +222,19 @@ class My_Preferences extends \NDB_Form
         //get notification details
         $notifier_list     = \NDB_Notifier::getNotificationModuleServices();
         $notifier_services = \NDB_Notifier::getNotificationServices();
-        //------------------------------------------------------------
 
         // user name
-        $this->addScoreColumn('UserID', 'User name');
+        $this->addScoreColumn('UserID', dgettext('my_preferences', '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 = "First name is required and "
-            . "should not exceed 120 characters";
+        $firstNameInvalidMsg = dgettext('my_preferences', "First name is required and should not exceed 120 characters");
         $this->addBasicText(
             'First_name',
-            'First name',
+            dgettext('my_preferences', 'First name'),
             [],
             [
                 'oninvalid' => "this.setCustomValidity('$firstNameInvalidMsg')",
@@ -250,11 +247,10 @@ class My_Preferences extends \NDB_Form
         //   - 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
-        $lastNameInvalidMsg = "Last name is required and "
-            . "should not exceed 120 characters";
+        $lastNameInvalidMsg = dgettext('my_preferences', "Last name is required and should not exceed 120 characters");
         $this->addBasicText(
             'Last_name',
-            'Last name',
+            dgettext('my_preferences', 'Last name'),
             [],
             [
                 'oninvalid' => "this.setCustomValidity('$lastNameInvalidMsg')",
@@ -267,36 +263,36 @@ class My_Preferences extends \NDB_Form
         // email address
         $this->addBasicText(
             'Email',
-            'Email address',
+            dgettext('my_preferences', 'Email address'),
             [],
             [
-                'oninvalid' => "this.setCustomValidity('Email address is required')",
+                'oninvalid' => "this.setCustomValidity('" . dgettext('my_preferences', 'Email address is required') . "')",
                 'onchange'  => "this.setCustomValidity('')",
             ]
         );
 
         // email address rules
-        $this->addRule('Email', 'Email address is required', 'required');
+        $this->addRule('Email', dgettext('my_preferences', 'Email address is required'), 'required');
         $this->addRule(
             'Email',
-            'Your email address must be less than 255 characters long',
+            dgettext('my_preferences', 'Your email address must be less than 255 characters long'),
             'maxlength',
             "255"
         );
 
         // password
-        $this->form->addElement('password', 'Password_hash', 'New Password');
-        $this->form->addElement('password', '__Confirm', 'Confirm Password');
+        $this->form->addElement('password', 'Password_hash', dgettext('my_preferences', 'New Password'));
+        $this->form->addElement('password', '__Confirm', dgettext('my_preferences', 'Confirm Password'));
 
         // language preference
         $languages = \Utility::getLanguageList();
-        $this->addSelect('language_preference', 'Language preference', $languages);
+        $this->addSelect('language_preference', dgettext('my_preferences', 'Language preference'), $languages);
 
         // Notification headers
         $nGroup   = [];
-        $nGroup[] = $this->createLabel("Module");
-        $nGroup[] = $this->createLabel("Operation");
-        $nGroup[] = $this->createLabel("Description");
+        $nGroup[] = $this->createLabel(dgettext('my_preferences', "Module"));
+        $nGroup[] = $this->createLabel(dgettext('my_preferences', "Operation"));
+        $nGroup[] = $this->createLabel(dgettext('my_preferences', "Description"));
 
         foreach ($notifier_services as $serv) {
             $nGroup[] = $this->createLabel($serv);
@@ -337,7 +333,7 @@ class My_Preferences extends \NDB_Form
                         );
                     } else {
                         $nGroup[] = $this->createLabel(
-                            "N/A"
+                            dgettext('my_preferences', "N/A")
                         );
                     }
 
@@ -397,18 +393,18 @@ class My_Preferences extends \NDB_Form
         $plaintext = $values['Password_hash'];
 
         if ($values['Email'] === $plaintext) {
-            $errors['Password_Group'] = self::PASSWORD_ERROR_IS_EMAIL;
+            $errors['Password_Group'] = dgettext('my_preferences', self::PASSWORD_ERROR_IS_EMAIL);
         }
 
         // Make sure the user is not using their username as their password.
         if ($this->identifier === $plaintext) {
-            $errors['Password_Group'] = self::PASSWORD_ERROR_IS_USER;
+            $errors['Password_Group'] = dgettext('my_preferences', self::PASSWORD_ERROR_IS_USER);
         }
 
         // Ensure that the password and confirm password fields match.
         // TODO This validation should be done on the front-end instead.
         if ($values['Password_hash'] !== $values['__Confirm']) {
-            $errors['Password_Group'] = self::PASSWORD_ERROR_NO_MATCH;
+            $errors['Password_Group'] = dgettext('my_preferences', self::PASSWORD_ERROR_NO_MATCH);
             return $errors;
         }
 
@@ -425,17 +421,17 @@ class My_Preferences extends \NDB_Form
                     $decoded
                 )
                 ) {
-                    $errors['Password_Group'] = self::PASSWORD_ERROR_NO_CHANGE;
+                    $errors['Password_Group'] = dgettext('my_preferences', self::PASSWORD_ERROR_NO_CHANGE);
                 }
             } catch (\InvalidArgumentException $e) {
-                $errors['Password_Group'] = $e->getMessage();
+                $errors['Password_Group'] = dgettext('my_preferences', $e->getMessage());
             }
         }
 
         // Validate email
         $emailError = $this->_getEmailError($DB, $values['Email']);
         if (!is_null($emailError)) {
-            $errors['Email'] = $emailError;
+            $errors['Email'] = dgettext('my_preferences', $emailError);
         }
 
         return $errors;
@@ -456,7 +452,7 @@ class My_Preferences extends \NDB_Form
         $email = filter_var($email, FILTER_SANITIZE_EMAIL);
         if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
             // If email not syntactically valid
-            return "Invalid email address";
+            return dgettext('my_preferences', "Invalid email address");
         }
 
         // check email address' uniqueness
@@ -470,7 +466,7 @@ class My_Preferences extends \NDB_Form
 
         // Email already exists in database
         if ($result > 0) {
-            return 'The email address already exists';
+            return dgettext('my_preferences', 'The email address already exists');
         }
 
         return null;