Dev Some translation fixes

LimeSurvey · Apr 1, 2021 · cb9c31a · cb9c31a
1 parent 4a4a1a7
commit cb9c31a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/application/core/plugins/TwoFactorAdminLogin/models/TFAUser.php b/application/core/plugins/TwoFactorAdminLogin/models/TFAUser.php
@@ -124,21 +124,21 @@ public function getColums()
                  "name" => 'email',
                  "header" => gT("Email"),
              ),
-             array(
-                 "name" => 'userkeys.authType',
-                 "header" => gT("2FA-Method"),
-                 "filter" => TbHtml::dropDownList('userkeys_authType', Yii::app()->request->getParam('userkeys_authType'), array_merge([''=>''], TFAUserKey::$authTypeOptions)),
-             ),
              array(
                  "name" => 'hasAuthSet',
                  "header" => gT("2FA enabled"),
                  "filter" => TbHtml::dropDownList('userkeys_secretKey', Yii::app()->request->getParam('userkeys_secretKey'), [
                      '' => '',
-                     '0' => gT('Has 2FA disabled'),
-                     '1' => gT('Has 2FA enabled'),
+                     '1' => gT('Yes'),
+                     '0' => gT('No'),
                     ]),
              ),
-         );
+             array(
+                "name" => 'userkeys.authType',
+                "header" => gT("2FA method"),
+                "filter" => TbHtml::dropDownList('userkeys_authType', Yii::app()->request->getParam('userkeys_authType'), array_merge([''=>''], TFAUserKey::$authTypeOptions)),
+            ),
+        );
         return $cols;
     }
 

diff --git a/application/core/plugins/TwoFactorAdminLogin/views/userindex.php b/application/core/plugins/TwoFactorAdminLogin/views/userindex.php
@@ -26,7 +26,7 @@
                         <?=($force2FA == true ? gt("Please activate it now.") : gT("Do you want to activate it now?"))?> 
                     </h2>
                     <p>
-                        <a class="btn btn-default TFA--actionopenmodal TFA--excludefromlock" data-href="<?=App()->createUrl("plugins/direct/plugin/TwoFactorAdminLogin/function/directCallCreateNewKey")?>" data-toggle="modal" id="TFA--register2fa"> Register 2FA now </a>
+                        <a class="btn btn-default TFA--actionopenmodal TFA--excludefromlock" data-href="<?=App()->createUrl("plugins/direct/plugin/TwoFactorAdminLogin/function/directCallCreateNewKey")?>" data-toggle="modal" id="TFA--register2fa"><?=gt("Activate 2FA now");?> </a>
                     <?php if ($force2FA == true) { ?> 
                         <a class="btn btn-danger TFA--excludefromlock" href="<?=App()->createUrl("admin")?>" id="TFA--excludeNotNow"><?=gT("Not now");?> </a>
                     <?php } ?>

diff --git a/application/views/admin/authentication/forgotpassword.php b/application/views/admin/authentication/forgotpassword.php
@@ -31,11 +31,11 @@
                                 <?php eT('To receive a new password by email you have to enter your user name and original email address.'); ?>
                             </div>
                             <span>
-                                <label for="user"><?php eT('User name'); ?></label>
+                                <label for="user"><?php eT('Username'); ?></label>
                                 <input name="user" id="user" type="text"  size="40" maxlength="64" class="form-control" value="" />
                             </span>
                             <span>
-                                <label for="email"><?php eT('Email'); ?>
+                                <label for="email"><?php eT('Email address'); ?>
 
                                 </label><input name="email" id="email" type="email"  size="40" maxlength="254" class="form-control" value="" />
                             </span>