Fix Translations

Author: Dave MacFarlane

modules/login/php/mfa.class.inc

@@ -50,6 +50,7 @@ class MFA extends \NDB_Page
             [$baseURL . '/login/css/login.css']
         );
     }
+
     /**
      * This function will return a json object for login module.
      *

modules/my_preferences/jsx/mfa.tsx

@@ -29,6 +29,7 @@ function genPotentialSecret() {
 function CodeValidator(props: {
   secret: string
 }): React.ReactElement {
+  const {t} = useTranslation();
   const formSubmit = useCallback(
     (code: string, onError: (msg: string) => void) => {
       const formObject = new FormData();
@@ -46,7 +47,12 @@ function CodeValidator(props: {
         return resp.json();
       }).then( (json) => {
         if (json.ok == 'success') {
-          swal.fire('Success!', json.message, 'success').then( () => {
+          swal.fire({
+            title: t('Success!', {ns: 'loris'}),
+            text: json.message,
+	    type: 'success',
+	    confirmButtonText: t('OK', {ns: 'loris'}),
+	  }).then( () => {
             window.location.href = loris.BaseURL + '/my_preferences/';
           });
         } else if (json.error) {
@@ -60,7 +66,7 @@ function CodeValidator(props: {
     }, [props.secret]);
   return (
     <div>
-      <h3>Validate Code</h3>
+      <h3>{t('Validate Code', {ns: 'my_preferences'})}</h3>
       <MFAPrompt validate={formSubmit} />
     </div>
   );
@@ -92,13 +98,16 @@ function MFAIndex(): React.ReactElement {
     </Modal>
     <p>{t('Scan the following QR code below in your MFA authenticator and enter the code to validate.', {ns: 'my_preferences'})}</p>
     <p>
-      <b>Note that this will <i>overwrite</i> any previously
-      setup MFA in LORIS!</b>
+      <strong><Trans
+          ns="my_preferences"
+	  components={[<strong>overwrite</strong>]}
+          defaults="Note that this will <0>overwrite</0> any previously setup MFA in LORIS!" /></strong>
     </p>
     <QRCode value={mfaUrl} />
-    <p>Can't scan the QR code? <a href="#" onClick={() => setShowModal(true)}>
-    Setup manually.</a>
-    </p>
+    <p><Trans
+    	ns="my_preferences"
+	defaults="Can't scan the QR code? <0>Setup manually.</0>"
+	components={[<a href="#" onClick={() => setShowModal(true)} />]} /></p>
     <CodeValidator secret={key} />
   </div>;
 }

modules/my_preferences/locale/ja/LC_MESSAGES/my_preferences.po

@@ -66,3 +66,15 @@ msgstr "認証アプリで次のコードを使用してください: <0>{{code}
 
 msgid "Scan the following QR code below in your MFA authenticator and enter the code to validate."
 msgstr "多要素認証システムで以下の QR コードをスキャンし、コードを入力して検証します。"
+
+msgid "Note that this will <0>overwrite</0> any previously setup MFA in LORIS!"
+msgstr "これにより、ロリスで以前に設定された多要素認証が <0>上書き</0> されることに注意してください。"
+
+msgid "Can't scan the QR code? <0>Setup manually.</0>"
+msgstr "QR コードをスキャンできませんか? <0>手動で設定してください。</0>"
+
+msgid "Validate Code"
+msgstr "コードの検証"
+
+msgid "Successfully registered multifactor authenticator"
+msgstr "多要素認証の登録に成功しました"

modules/my_preferences/php/mfa.class.inc

@@ -55,6 +55,7 @@ class MFA extends \NDB_Page
 
         }
     }
+
     /**
      * {@inheritDoc}
      *
@@ -111,8 +112,12 @@ class MFA extends \NDB_Page
         $login = $_SESSION['State']->getProperty('login');
         $login->setPassedMFA();
         return new \LORIS\Http\Response\JSON\OK(
-            ['ok' => 'success',
-                'message' => 'Successfully registered multifactor authenticator'
+            [
+                'ok'      => 'success',
+                'message' => dgettext(
+                    'my_preferences',
+                    'Successfully registered multifactor authenticator'
+                )
             ]
         );
     }

php/libraries/SinglePointLogin.class.inc

@@ -623,5 +623,4 @@ class SinglePointLogin
         $_SESSION['PassedMFA'] = true;
         session_write_close();
     }
-
 }

php/libraries/User.class.inc

@@ -689,7 +689,6 @@ class User extends UserPermissions implements
         return $this->userInfo['Pending_approval'] == 'Y';
     }
 
-
     /**
      * Returns a TOTP validator for this account, or null if 2FA
      * has never been enabled by the user.

test/unittests/security/TOTP_Test.php

@@ -15,7 +15,6 @@
  */
 class TOTP_Test extends TestCase
 {
-
     /**
      * Test that test vector counters from RFC6238 pass
      *