#458 fix on sms 2fa management

docs/installation/configuration-options.md

@@ -216,6 +216,7 @@ Configures the parameter values used on [MailFactory](../../src/User/Factory/Mai
     'confirmationMailSubject' => Yii::t('usuario', 'Confirm account on {0}', $app->name),
     'reconfirmationMailSubject' => Yii::t('usuario', 'Confirm email change on {0}', $app->name),
     'recoveryMailSubject' => Yii::t('usuario', 'Complete password reset on {0}', $app->name),
+    'twoFactorMailSubject' => Yii::t('usuario', 'Code for two factor authentication', $app->name),
 ]
 ```
 

docs/installation/mailer.md

@@ -14,6 +14,7 @@ values:
     'confirmationMailSubject' => Yii::t('usuario', 'Confirm account on {0}', $app->name),
     'reconfirmationMailSubject' => Yii::t('usuario', 'Confirm email change on {0}', $app->name),
     'recoveryMailSubject' => Yii::t('usuario', 'Complete password reset on {0}', $app->name),
+    'twoFactorMailSubject' => Yii::t('usuario', 'Code for two factor authentication', $app->name),
 ]
 ```
 

src/User/Bootstrap.php

@@ -192,11 +192,9 @@ class Bootstrap implements BootstrapInterface
                     ]
                 ];
 
-            $app->getModule('user')->twoFactorAuthenticationValidators =  
+            $app->getModule('user')->twoFactorAuthenticationValidators = ArrayHelper::merge(
-                    ArrayHelper::merge($app->getModule('user')->twoFactorAuthenticationValidators, $defaultTwoFactorAuthenticationValidators); 
+                        $defaultTwoFactorAuthenticationValidators, $app->getModule('user')->twoFactorAuthenticationValidators); 
-              
+ 
-
-
             if ($app instanceof WebApplication) {
                 // override Yii
                 $di->set(
@@ -294,6 +292,7 @@ class Bootstrap implements BootstrapInterface
             'confirmationMailSubject' => Yii::t('usuario', 'Confirm account on {0}', $app->name),
             'reconfirmationMailSubject' => Yii::t('usuario', 'Confirm email change on {0}', $app->name),
             'recoveryMailSubject' => Yii::t('usuario', 'Complete password reset on {0}', $app->name),
+            'twoFactorMailSubject' => Yii::t('usuario', 'Code for two factor authentication', $app->name),
         ];
 
         $module->mailParams = array_merge($defaults, $module->mailParams);

src/User/Controller/SettingsController.php

@@ -583,14 +583,14 @@ class SettingsController extends Controller
             $success=true;    
         }else{
             $success = $user->updateAttributes(['auth_tf_mobile_phone' => $mobilePhone]);
-            $this->make(TwoFactorSmsCodeGeneratorService::class, [$user])->run();
+        }    
-        }
+        $success = $success && $this->make(TwoFactorSmsCodeGeneratorService::class, [$user])->run();
-        
+     
         return [
                     'success' => $success,
                     'message' => $success
                     ? Yii::t('usuario', 'Mobile phone number successfully enabled.')
-                    : Yii::t('usuario', 'Error while enabling SMS two factor authentication.'),
+                    : Yii::t('usuario', 'Error while enabling SMS two factor authentication. Please reload the page.'),
                 ];
     }
 }

src/User/Factory/MailFactory.php

@@ -128,7 +128,7 @@ class MailFactory
         $to = $user->email;
         
         $from = $module->mailParams['fromEmail'];
-        $subject = $module->mailParams['reconfirmationMailSubject'];
+        $subject = $module->mailParams['twoFactorMailSubject'];
         $params = [
             'code' => $code,
         ];

src/User/Module.php

@@ -88,7 +88,7 @@ class Module extends BaseModule
     /**
      * @var array list of channels for two factor authentication availables
      */
-    public $twoFactorAuthenticationValidators = null;
+    public $twoFactorAuthenticationValidators = [];
     /**
      * @var int cycles of key generation are set on 30 sec. To avoid sync issues, increased validity up to 60 sec.
      * @see http://2fa-library.readthedocs.io/en/latest/

src/User/resources/i18n/ca/usuario.php

@@ -63,6 +63,7 @@ return [
     'Children' => '',
     'Class' => '',
     'Close' => '',
+    'Code for two factor authentication' => '',
     'Complete password reset on {0}' => '',
     'Confirm' => '',
     'Confirm account on {0}' => '',
@@ -105,7 +106,7 @@ return [
     'Error occurred while deleting user' => '',
     'Error sending registration message to "{email}". Please try again later.' => '',
     'Error sending welcome message to "{email}". Please try again later.' => '',
-    'Error while enabling SMS two factor authentication.' => '',
+    'Error while enabling SMS two factor authentication. Please reload the page.' => '',
     'Export my data' => '',
     'Finish' => '',
     'Force password change at next login' => '',
@@ -293,8 +294,8 @@ return [
     'Your password has expired, you must change it now' => '',
     'Your personal information has been removed' => '',
     'Your profile has been updated' => '',
-    'Your two factor authentication method is based on "{0}".' => '',
     'Your role requires 2FA, you won\'t be able to use the application until you enable it' => '',
+    'Your two factor authentication method is based on "{0}".' => '',
     'privacy policy' => '',
     '{0, date, MMM dd, YYYY HH:mm}' => '',
     '{0, date, MMMM dd, YYYY HH:mm}' => '',

src/User/resources/i18n/da/usuario.php

@@ -63,6 +63,7 @@ return [
     'Children' => '',
     'Class' => '',
     'Close' => '',
+    'Code for two factor authentication' => '',
     'Complete password reset on {0}' => '',
     'Confirm' => '',
     'Confirm account on {0}' => '',
@@ -105,7 +106,7 @@ return [
     'Error occurred while deleting user' => '',
     'Error sending registration message to "{email}". Please try again later.' => '',
     'Error sending welcome message to "{email}". Please try again later.' => '',
-    'Error while enabling SMS two factor authentication.' => '',
+    'Error while enabling SMS two factor authentication. Please reload the page.' => '',
     'Export my data' => '',
     'Finish' => '',
     'Force password change at next login' => '',
@@ -293,8 +294,8 @@ return [
     'Your password has expired, you must change it now' => '',
     'Your personal information has been removed' => '',
     'Your profile has been updated' => '',
-    'Your two factor authentication method is based on "{0}".' => '',
     'Your role requires 2FA, you won\'t be able to use the application until you enable it' => '',
+    'Your two factor authentication method is based on "{0}".' => '',
     'privacy policy' => '',
     '{0, date, MMM dd, YYYY HH:mm}' => '',
     '{0, date, MMMM dd, YYYY HH:mm}' => '',

src/User/resources/i18n/de-DU/usuario.php

@@ -274,8 +274,9 @@ return [
     '{0, date, MMMM dd, YYYY HH:mm}' => '{0, date, dd. MMMM YYYY, HH:mm}',
     '{0} cannot be blank.' => '{0} darf nicht leer sein.',
     'According to the European General Data Protection Regulation (GDPR) we need your consent to work with your personal data.' => '',
+    'Code for two factor authentication' => '',
     'Data privacy' => '',
-    'Error while enabling SMS two factor authentication.' => '',
+    'Error while enabling SMS two factor authentication. Please reload the page.' => '',
     'Google Authenticator' => '',
     'Insert' => '',
     'Insert the code you received by SMS.' => '',
@@ -297,6 +298,6 @@ return [
     'Two factor authentication code by email' => '',
     'Unfortunately, you can not work with this site without giving us consent to process your data.' => '',
     'Your consent is required to work with this site' => '',
-    'Your two factor authentication method is based on "{0}".' => '',
     'Your role requires 2FA, you won\'t be able to use the application until you enable it' => '',
+    'Your two factor authentication method is based on "{0}".' => '',
 ];

src/User/resources/i18n/de/usuario.php

@@ -277,7 +277,8 @@ return [
     '{0, date, MMM dd, YYYY HH:mm}' => '{0, date, dd. MMM YYYY, HH:mm}',
     '{0, date, MMMM dd, YYYY HH:mm}' => '{0, date, dd. MMMM YYYY, HH:mm}',
     '{0} cannot be blank.' => '{0} darf nicht leer sein.',
-    'Error while enabling SMS two factor authentication.' => '',
+    'Code for two factor authentication' => '',
+    'Error while enabling SMS two factor authentication. Please reload the page.' => '',
     'Google Authenticator' => '',
     'Information' => '',
     'Insert' => '',
@@ -297,7 +298,6 @@ return [
     'This is the code to insert to enable two factor authentication' => '',
     'Two factor authentication code by SMS' => '',
     'Two factor authentication code by email' => '',
-    'Your two factor authentication method is based on "{0}".' => '',
-    'Information' => '',
     'Your role requires 2FA, you won\'t be able to use the application until you enable it' => '',
+    'Your two factor authentication method is based on "{0}".' => '',
 ];

src/User/resources/i18n/es/usuario.php

@@ -276,7 +276,8 @@ return [
     'privacy policy' => 'política de privacidad',
     '{0, date, MMMM dd, YYYY HH:mm}' => '{0, date, dd MMMM, YYYY HH:mm}',
     '{0} cannot be blank.' => '{0} no puede estar vacío.',
-    'Error while enabling SMS two factor authentication.' => '',
+    'Code for two factor authentication' => '',
+    'Error while enabling SMS two factor authentication. Please reload the page.' => '',
     'Google Authenticator' => '',
     'Insert' => '',
     'Insert the code you received by SMS.' => '',
@@ -296,7 +297,7 @@ return [
     'Two factor authentication code by SMS' => '',
     'Two factor authentication code by email' => '',
     'Your consent is required to work with this site' => '',
+    'Your role requires 2FA, you won\'t be able to use the application until you enable it' => '',
     'Your two factor authentication method is based on "{0}".' => '',
     '{0, date, MMM dd, YYYY HH:mm}' => '',
-    'Your role requires 2FA, you won\'t be able to use the application until you enable it' => '',
 ];

src/User/resources/i18n/et/usuario.php

@@ -269,8 +269,9 @@ return [
     '{0} cannot be blank.' => '{0} ei või olla tühi.',
     'According to the European General Data Protection Regulation (GDPR) we need your consent to work with your personal data.' => '',
     'Authentication rule class {0} can not be instantiated' => '',
+    'Code for two factor authentication' => '',
     'Data privacy' => '',
-    'Error while enabling SMS two factor authentication.' => '',
+    'Error while enabling SMS two factor authentication. Please reload the page.' => '',
     'Google Authenticator' => '',
     'Insert' => '',
     'Insert the code you received by SMS.' => '',
@@ -295,8 +296,8 @@ return [
     'VKontakte' => '',
     'Yandex' => '',
     'Your consent is required to work with this site' => '',
+    'Your role requires 2FA, you won\'t be able to use the application until you enable it' => '',
     'Your two factor authentication method is based on "{0}".' => '',
     '{0, date, MMM dd, YYYY HH:mm}' => '',
     '{0, date, MMMM dd, YYYY HH:mm}' => '',
-    'Your role requires 2FA, you won\'t be able to use the application until you enable it' => '',
 ];

src/User/resources/i18n/fa-IR/usuario.php

@@ -173,6 +173,7 @@ return [
     'Children' => '',
     'Class' => '',
     'Close' => '',
+    'Code for two factor authentication' => '',
     'Create new permission' => '',
     'Create new role' => '',
     'Create new rule' => '',
@@ -190,7 +191,7 @@ return [
     'Enable two factor authentication' => '',
     'Error sending registration message to "{email}". Please try again later.' => '',
     'Error sending welcome message to "{email}". Please try again later.' => '',
-    'Error while enabling SMS two factor authentication.' => '',
+    'Error while enabling SMS two factor authentication. Please reload the page.' => '',
     'Export my data' => '',
     'Force password change at next login' => '',
     'Google Authenticator' => '',
@@ -294,23 +295,9 @@ return [
     'Your consent is required to work with this site' => '',
     'Your password has expired, you must change it now' => '',
     'Your personal information has been removed' => '',
-<<<<<<< HEAD
-    'Your two factor authentication method is based on "{0}".' => '',
-=======
     'Your role requires 2FA, you won\'t be able to use the application until you enable it' => '',
->>>>>>> upstream/master
+    'Your two factor authentication method is based on "{0}".' => '',
     'privacy policy' => '',
     '{0, date, MMM dd, YYYY HH:mm}' => '',
     '{0} cannot be blank.' => '',
-    'An email has been sent with instructions for resetting your password' => '@@ایمیلی حاوی راهنمایی برای تنظیم مجدد رمز عبور به شما ارسال شد@@',
-<<<<<<< HEAD
-    'Insert the mobile phone number on which to receive text message.' => '@@@@',
-    'Insert the mobile phone number where you want to receive text message in international format.' => '@@@@',
-    'Insert the mobile phone number where you want to receive text message.' => '@@@@',
-    'Mobile phone number not registered.' => '@@@@',
-=======
-    'Every user having your role has two factor authentication mandatory, you must enable it' => '@@@@',
-    'Now you can resume the login process' => '@@@@',
->>>>>>> upstream/master
-    'Registration ip' => '@@ای پی ثبت نام@@',
 ];

src/User/resources/i18n/fi/usuario.php

@@ -63,6 +63,7 @@ return [
     'Children' => '',
     'Class' => '',
     'Close' => '',
+    'Code for two factor authentication' => '',
     'Complete password reset on {0}' => '',
     'Confirm' => '',
     'Confirm account on {0}' => '',
@@ -105,7 +106,7 @@ return [
     'Error occurred while deleting user' => '',
     'Error sending registration message to "{email}". Please try again later.' => '',
     'Error sending welcome message to "{email}". Please try again later.' => '',
-    'Error while enabling SMS two factor authentication.' => '',
+    'Error while enabling SMS two factor authentication. Please reload the page.' => '',
     'Export my data' => '',
     'Finish' => '',
     'Force password change at next login' => '',
@@ -293,8 +294,8 @@ return [
     'Your password has expired, you must change it now' => '',
     'Your personal information has been removed' => '',
     'Your profile has been updated' => '',
-    'Your two factor authentication method is based on "{0}".' => '',
     'Your role requires 2FA, you won\'t be able to use the application until you enable it' => '',
+    'Your two factor authentication method is based on "{0}".' => '',
     'privacy policy' => '',
     '{0, date, MMM dd, YYYY HH:mm}' => '',
     '{0, date, MMMM dd, YYYY HH:mm}' => '',

src/User/resources/i18n/fr/usuario.php

@@ -273,8 +273,9 @@ return [
     '{0, date, MMMM dd, YYYY HH:mm}' => '{0, date, dd MMMM YYYY HH:mm}',
     '{0} cannot be blank.' => '{0} ne peut être vide.',
     'According to the European General Data Protection Regulation (GDPR) we need your consent to work with your personal data.' => '',
+    'Code for two factor authentication' => '',
     'Data privacy' => '',
-    'Error while enabling SMS two factor authentication.' => '',
+    'Error while enabling SMS two factor authentication. Please reload the page.' => '',
     'Google Authenticator' => '',
     'Insert' => '',
     'Insert the code you received by SMS.' => '',
@@ -296,8 +297,7 @@ return [
     'Two factor authentication code by email' => '',
     'Unfortunately, you can not work with this site without giving us consent to process your data.' => '',
     'Your consent is required to work with this site' => '',
+    'Your role requires 2FA, you won\'t be able to use the application until you enable it' => '',
     'Your two factor authentication method is based on "{0}".' => '',
     '{0, date, MMM dd, YYYY HH:mm}' => '',
-    'Your role requires 2FA, you won\'t be able to use the application until you enable it' => '',
-    '{0, date, MMM dd, YYYY HH:mm}' => '',
 ];

src/User/resources/i18n/hr/usuario.php

@@ -63,6 +63,7 @@ return [
     'Children' => '',
     'Class' => '',
     'Close' => '',
+    'Code for two factor authentication' => '',
     'Complete password reset on {0}' => '',
     'Confirm' => '',
     'Confirm account on {0}' => '',
@@ -105,7 +106,7 @@ return [
     'Error occurred while deleting user' => '',
     'Error sending registration message to "{email}". Please try again later.' => '',
     'Error sending welcome message to "{email}". Please try again later.' => '',
-    'Error while enabling SMS two factor authentication.' => '',
+    'Error while enabling SMS two factor authentication. Please reload the page.' => '',
     'Export my data' => '',
     'Finish' => '',
     'Force password change at next login' => '',
@@ -293,8 +294,8 @@ return [
     'Your password has expired, you must change it now' => '',
     'Your personal information has been removed' => '',
     'Your profile has been updated' => '',
-    'Your two factor authentication method is based on "{0}".' => '',
     'Your role requires 2FA, you won\'t be able to use the application until you enable it' => '',
+    'Your two factor authentication method is based on "{0}".' => '',
     'privacy policy' => '',
     '{0, date, MMM dd, YYYY HH:mm}' => '',
     '{0, date, MMMM dd, YYYY HH:mm}' => '',

src/User/resources/i18n/hu/usuario.php

@@ -271,8 +271,9 @@ return [
     '{0} cannot be blank.' => '{0} nem lehet üres.',
     'According to the European General Data Protection Regulation (GDPR) we need your consent to work with your personal data.' => '',
     'An email with instructions to create a new password has been sent to {email} if it is associated with an {appName} account. Your existing password has not been changed.' => '',
+    'Code for two factor authentication' => '',
     'Data privacy' => '',
-    'Error while enabling SMS two factor authentication.' => '',
+    'Error while enabling SMS two factor authentication. Please reload the page.' => '',
     'Google Authenticator' => '',
     'Insert' => '',
     'Insert the code you received by SMS.' => '',
@@ -297,6 +298,6 @@ return [
     'Two factor authentication protects you in case of stolen credentials' => '',
     'Unfortunately, you can not work with this site without giving us consent to process your data.' => '',
     'Your consent is required to work with this site' => '',
-    'Your two factor authentication method is based on "{0}".' => '',
     'Your role requires 2FA, you won\'t be able to use the application until you enable it' => '',
+    'Your two factor authentication method is based on "{0}".' => '',
 ];

src/User/resources/i18n/it/usuario.php

@@ -63,6 +63,7 @@ return [
     'Children' => 'Figli',
     'Class' => 'Classe',
     'Close' => 'Chiudi',
+    'Code for two factor authentication' => 'Codice per l\'autenticazione a due fattori',
     'Complete password reset on {0}' => 'Completa la procedura di reset della password su {0}',
     'Confirm' => 'Conferma',
     'Confirm account on {0}' => 'Conferma l\'account su {0}',
@@ -105,7 +106,7 @@ return [
     'Error occurred while deleting user' => 'Si è verificato un errore durante l\'eliminazione dell\'utente',
     'Error sending registration message to "{email}". Please try again later.' => 'C\'è stato un errore nell\'invio del messaggio di registrazione all\'indirizzo "{email}". Per favore ritenta più tardi.',
     'Error sending welcome message to "{email}". Please try again later.' => 'C\'è stato un errore nell\'invio del messaggio di benvenuto all\'indirizzo "{email}". Per favore ritenta più tardi.',
-    'Error while enabling SMS two factor authentication.' => 'Errore in fase di attivazione dell\'autenticazione a due fattori tramite SMS',
+    'Error while enabling SMS two factor authentication. Please reload the page.' => 'Errore in fase di attivazione dell\'autenticazione a due fattori tramite SMS. Ricarica la pagina',
     'Export my data' => 'Esporta i miei dati',
     'Finish' => 'Completa',
     'Force password change at next login' => 'Forza il cambio password al prossimo accesso',
@@ -211,7 +212,7 @@ return [
     'The email address set is: "{0}".' => 'L\'indirizzo email impostato è: "{0}".',
     'The email sending failed, please check your configuration.' => 'L\'invio della email non è riuscito, verifica la configurazione',
     'The phone number set is: "{0}".' => 'Il numero di telefono impostato è: "{0}".',
-    'The sms sending failed, please check your configuration.' => 'L\'invio del messaggio di testo non è riuscito, verifica la configurazione',
+    'The sms sending failed, please check your configuration.' => 'L\'invio del messaggio di testo non è riuscito, verifica il numero di cellulare o contatta l\'assistenza',
     'The verification code is incorrect.' => 'Il codice di verifica non è corretto.',
     'There is neither role nor permission with name "{0}"' => 'Non esiste un ruolo o permesso di nome "{0}',
     'There was an error in saving user' => 'Errore in salvataggio utente',
@@ -292,8 +293,8 @@ return [
     'Your password has expired, you must change it now' => 'La tua password è scaduta, devi cambiarla',
     'Your personal information has been removed' => 'I tuoi dati personali sono stati rimossi',
     'Your profile has been updated' => 'Il tuo profilo è stato aggiornato',
-    'Your two factor authentication method is based on "{0}".' => 'La tua autenticazione a due fattori è basata su "{0}".',
     'Your role requires 2FA, you won\'t be able to use the application until you enable it' => 'Il tuo ruolo richiede l\'autenticazione a due fattori, non potrai usare l\'applicazione finché non l\'avrai abilitata',
+    'Your two factor authentication method is based on "{0}".' => 'La tua autenticazione a due fattori è basata su "{0}".',
     'privacy policy' => 'politica della privacy',
     '{0, date, MMM dd, YYYY HH:mm}' => '{0, date, MMM dd, YYYY HH:mm}',
     '{0, date, MMMM dd, YYYY HH:mm}' => '{0, date, dd MMMM YYYY HH:mm}',

src/User/resources/i18n/kk/usuario.php

@@ -63,6 +63,7 @@ return [
     'Children' => '',
     'Class' => '',
     'Close' => '',
+    'Code for two factor authentication' => '',
     'Complete password reset on {0}' => '',
     'Confirm' => '',
     'Confirm account on {0}' => '',
@@ -105,7 +106,7 @@ return [
     'Error occurred while deleting user' => '',
     'Error sending registration message to "{email}". Please try again later.' => '',
     'Error sending welcome message to "{email}". Please try again later.' => '',
-    'Error while enabling SMS two factor authentication.' => '',
+    'Error while enabling SMS two factor authentication. Please reload the page.' => '',
     'Export my data' => '',
     'Finish' => '',
     'Force password change at next login' => '',
@@ -293,8 +294,8 @@ return [
     'Your password has expired, you must change it now' => '',
     'Your personal information has been removed' => '',
     'Your profile has been updated' => '',
-    'Your two factor authentication method is based on "{0}".' => '',
     'Your role requires 2FA, you won\'t be able to use the application until you enable it' => '',
+    'Your two factor authentication method is based on "{0}".' => '',
     'privacy policy' => '',
     '{0, date, MMM dd, YYYY HH:mm}' => '',
     '{0, date, MMMM dd, YYYY HH:mm}' => '',

src/User/resources/i18n/lt/usuario.php

@@ -63,6 +63,7 @@ return [
     'Children' => '',
     'Class' => '',
     'Close' => '',
+    'Code for two factor authentication' => '',
     'Complete password reset on {0}' => '',
     'Confirm' => '',
     'Confirm account on {0}' => '',
@@ -105,7 +106,7 @@ return [
     'Error occurred while deleting user' => '',
     'Error sending registration message to "{email}". Please try again later.' => '',
     'Error sending welcome message to "{email}". Please try again later.' => '',
-    'Error while enabling SMS two factor authentication.' => '',
+    'Error while enabling SMS two factor authentication. Please reload the page.' => '',
     'Export my data' => '',
     'Finish' => '',
     'Force password change at next login' => '',
@@ -293,8 +294,8 @@ return [
     'Your password has expired, you must change it now' => '',
     'Your personal information has been removed' => '',
     'Your profile has been updated' => '',
-    'Your two factor authentication method is based on "{0}".' => '',
     'Your role requires 2FA, you won\'t be able to use the application until you enable it' => '',
+    'Your two factor authentication method is based on "{0}".' => '',
     'privacy policy' => '',
     '{0, date, MMM dd, YYYY HH:mm}' => '',
     '{0, date, MMMM dd, YYYY HH:mm}' => '',

src/User/resources/i18n/nl/usuario.php

@@ -271,8 +271,9 @@ return [
     '{0} cannot be blank.' => '{0} kan niet leeg zijn.',
     'According to the European General Data Protection Regulation (GDPR) we need your consent to work with your personal data.' => '',
     'An email with instructions to create a new password has been sent to {email} if it is associated with an {appName} account. Your existing password has not been changed.' => '',
+    'Code for two factor authentication' => '',
     'Data privacy' => '',
-    'Error while enabling SMS two factor authentication.' => '',
+    'Error while enabling SMS two factor authentication. Please reload the page.' => '',
     'Google Authenticator' => '',
     'Insert' => '',
     'Insert the code you received by SMS.' => '',
@@ -297,6 +298,6 @@ return [
     'Two factor authentication protects you in case of stolen credentials' => '',
     'Unfortunately, you can not work with this site without giving us consent to process your data.' => '',
     'Your consent is required to work with this site' => '',
-    'Your two factor authentication method is based on "{0}".' => '',
     'Your role requires 2FA, you won\'t be able to use the application until you enable it' => '',
+    'Your two factor authentication method is based on "{0}".' => '',
 ];

src/User/resources/i18n/pl/usuario.php

@@ -271,8 +271,9 @@ return [
     '{0} cannot be blank.' => '{0} nie może pozostać bez wartości',
     'According to the European General Data Protection Regulation (GDPR) we need your consent to work with your personal data.' => '',
     'An email with instructions to create a new password has been sent to {email} if it is associated with an {appName} account. Your existing password has not been changed.' => '',
+    'Code for two factor authentication' => '',
     'Data privacy' => '',
-    'Error while enabling SMS two factor authentication.' => '',
+    'Error while enabling SMS two factor authentication. Please reload the page.' => '',
     'Google Authenticator' => '',
     'Insert' => '',
     'Insert the code you received by SMS.' => '',
@@ -297,6 +298,6 @@ return [
     'Two factor authentication protects you in case of stolen credentials' => '',
     'Unfortunately, you can not work with this site without giving us consent to process your data.' => '',
     'Your consent is required to work with this site' => '',
-    'Your two factor authentication method is based on "{0}".' => '',
     'Your role requires 2FA, you won\'t be able to use the application until you enable it' => '',
+    'Your two factor authentication method is based on "{0}".' => '',
 ];

src/User/resources/i18n/pt-BR/usuario.php

@@ -271,8 +271,9 @@ return [
     '{0} cannot be blank.' => '{0} não pode estar em branco',
     'According to the European General Data Protection Regulation (GDPR) we need your consent to work with your personal data.' => '',
     'An email with instructions to create a new password has been sent to {email} if it is associated with an {appName} account. Your existing password has not been changed.' => '',
+    'Code for two factor authentication' => '',
     'Data privacy' => '',
-    'Error while enabling SMS two factor authentication.' => '',
+    'Error while enabling SMS two factor authentication. Please reload the page.' => '',
     'Google Authenticator' => '',
     'Insert' => '',
     'Insert the code you received by SMS.' => '',
@@ -297,6 +298,6 @@ return [
     'Two factor authentication protects you in case of stolen credentials' => '',
     'Unfortunately, you can not work with this site without giving us consent to process your data.' => '',
     'Your consent is required to work with this site' => '',
-    'Your two factor authentication method is based on "{0}".' => '',
     'Your role requires 2FA, you won\'t be able to use the application until you enable it' => '',
+    'Your two factor authentication method is based on "{0}".' => '',
 ];

src/User/resources/i18n/pt-PT/usuario.php

@@ -262,9 +262,10 @@ return [
     'Awesome, almost there. Now you need to click the confirmation link sent to your old email address.' => '',
     'Children' => '',
     'Class' => '',
+    'Code for two factor authentication' => '',
     'Data privacy' => '',
     'Email' => '',
-    'Error while enabling SMS two factor authentication.' => '',
+    'Error while enabling SMS two factor authentication. Please reload the page.' => '',
     'Google Authenticator' => '',
     'Gravatar email' => '',
     'Insert' => '',
@@ -295,8 +296,8 @@ return [
     'Website' => '',
     'Yandex' => '',
     'Your consent is required to work with this site' => '',
+    'Your role requires 2FA, you won\'t be able to use the application until you enable it' => '',
     'Your two factor authentication method is based on "{0}".' => '',
     '{0, date, MMM dd, YYYY HH:mm}' => '',
     '{0, date, MMMM dd, YYYY HH:mm}' => '',
-    'Your role requires 2FA, you won\'t be able to use the application until you enable it' => '',
 ];

src/User/resources/i18n/ro/usuario.php

@@ -271,8 +271,9 @@ return [
     '{0} cannot be blank.' => '{0} nu poate fi gol.',
     'According to the European General Data Protection Regulation (GDPR) we need your consent to work with your personal data.' => '',
     'An email with instructions to create a new password has been sent to {email} if it is associated with an {appName} account. Your existing password has not been changed.' => '',
+    'Code for two factor authentication' => '',
     'Data privacy' => '',
-    'Error while enabling SMS two factor authentication.' => '',
+    'Error while enabling SMS two factor authentication. Please reload the page.' => '',
     'Google Authenticator' => '',
     'Insert' => '',
     'Insert the code you received by SMS.' => '',
@@ -297,6 +298,6 @@ return [
     'Two factor authentication protects you in case of stolen credentials' => '',
     'Unfortunately, you can not work with this site without giving us consent to process your data.' => '',
     'Your consent is required to work with this site' => '',
-    'Your two factor authentication method is based on "{0}".' => '',
     'Your role requires 2FA, you won\'t be able to use the application until you enable it' => '',
+    'Your two factor authentication method is based on "{0}".' => '',
 ];

src/User/resources/i18n/ru/usuario.php

@@ -274,8 +274,9 @@ return [
     '{0, date, MMMM dd, YYYY HH:mm}' => '{0, date, d MMMM YYYY в HH:mm}',
     '{0} cannot be blank.' => '{0} не может быть пустым.',
     'According to the European General Data Protection Regulation (GDPR) we need your consent to work with your personal data.' => '',
+    'Code for two factor authentication' => '',
     'Data privacy' => '',
-    'Error while enabling SMS two factor authentication.' => '',
+    'Error while enabling SMS two factor authentication. Please reload the page.' => '',
     'Google Authenticator' => '',
     'Insert' => '',
     'Insert the code you received by SMS.' => '',
@@ -297,6 +298,6 @@ return [
     'Two factor authentication code by email' => '',
     'Unfortunately, you can not work with this site without giving us consent to process your data.' => '',
     'Your consent is required to work with this site' => '',
-    'Your two factor authentication method is based on "{0}".' => '',
     'Your role requires 2FA, you won\'t be able to use the application until you enable it' => '',
+    'Your two factor authentication method is based on "{0}".' => '',
 ];

src/User/resources/i18n/th/usuario.php

@@ -63,6 +63,7 @@ return [
     'Children' => '',
     'Class' => '',
     'Close' => '',
+    'Code for two factor authentication' => '',
     'Complete password reset on {0}' => '',
     'Confirm' => '',
     'Confirm account on {0}' => '',
@@ -105,7 +106,7 @@ return [
     'Error occurred while deleting user' => '',
     'Error sending registration message to "{email}". Please try again later.' => '',
     'Error sending welcome message to "{email}". Please try again later.' => '',
-    'Error while enabling SMS two factor authentication.' => '',
+    'Error while enabling SMS two factor authentication. Please reload the page.' => '',
     'Export my data' => '',
     'Finish' => '',
     'Force password change at next login' => '',
@@ -293,8 +294,8 @@ return [
     'Your password has expired, you must change it now' => '',
     'Your personal information has been removed' => '',
     'Your profile has been updated' => '',
-    'Your two factor authentication method is based on "{0}".' => '',
     'Your role requires 2FA, you won\'t be able to use the application until you enable it' => '',
+    'Your two factor authentication method is based on "{0}".' => '',
     'privacy policy' => '',
     '{0, date, MMM dd, YYYY HH:mm}' => '',
     '{0, date, MMMM dd, YYYY HH:mm}' => '',

src/User/resources/i18n/tr-TR/usuario.php

@@ -63,6 +63,7 @@ return [
     'Children' => '',
     'Class' => '',
     'Close' => '',
+    'Code for two factor authentication' => '',
     'Complete password reset on {0}' => '',
     'Confirm' => '',
     'Confirm account on {0}' => '',
@@ -105,7 +106,7 @@ return [
     'Error occurred while deleting user' => '',
     'Error sending registration message to "{email}". Please try again later.' => '',
     'Error sending welcome message to "{email}". Please try again later.' => '',
-    'Error while enabling SMS two factor authentication.' => '',
+    'Error while enabling SMS two factor authentication. Please reload the page.' => '',
     'Export my data' => '',
     'Finish' => '',
     'Force password change at next login' => '',
@@ -293,8 +294,8 @@ return [
     'Your password has expired, you must change it now' => '',
     'Your personal information has been removed' => '',
     'Your profile has been updated' => '',
-    'Your two factor authentication method is based on "{0}".' => '',
     'Your role requires 2FA, you won\'t be able to use the application until you enable it' => '',
+    'Your two factor authentication method is based on "{0}".' => '',
     'privacy policy' => '',
     '{0, date, MMM dd, YYYY HH:mm}' => '',
     '{0, date, MMMM dd, YYYY HH:mm}' => '',

src/User/resources/i18n/uk/usuario.php

@@ -273,8 +273,9 @@ return [
     '{0, date, MMMM dd, YYYY HH:mm}' => '{0, date, MMMM dd, YYYY HH:mm}',
     '{0} cannot be blank.' => '{0} не може бути порожнім.',
     'According to the European General Data Protection Regulation (GDPR) we need your consent to work with your personal data.' => '',
+    'Code for two factor authentication' => '',
     'Data privacy' => '',
-    'Error while enabling SMS two factor authentication.' => '',
+    'Error while enabling SMS two factor authentication. Please reload the page.' => '',
     'Google Authenticator' => '',
     'Insert' => '',
     'Insert the code you received by SMS.' => '',
@@ -297,8 +298,8 @@ return [
     'Two factor authentication code by email' => '',
     'Unfortunately, you can not work with this site without giving us consent to process your data.' => '',
     'Your consent is required to work with this site' => '',
-    'Your two factor authentication method is based on "{0}".' => '',
     'Your role requires 2FA, you won\'t be able to use the application until you enable it' => '',
+    'Your two factor authentication method is based on "{0}".' => '',
     'A message has been sent to your email address. ' => '@@На вашу електронну адресу надіслано повідомлення@@',
     'An email has been sent with instructions for resetting your password' => '@@Лист з інструкціями по зміні пароля надіслано на електронну адресу@@',
     'Awesome, almost there. ' => '@@Чудово, майже все.@@',

src/User/resources/i18n/vi/usuario.php

@@ -63,6 +63,7 @@ return [
     'Children' => '',
     'Class' => '',
     'Close' => '',
+    'Code for two factor authentication' => '',
     'Complete password reset on {0}' => '',
     'Confirm' => '',
     'Confirm account on {0}' => '',
@@ -105,7 +106,7 @@ return [
     'Error occurred while deleting user' => '',
     'Error sending registration message to "{email}". Please try again later.' => '',
     'Error sending welcome message to "{email}". Please try again later.' => '',
-    'Error while enabling SMS two factor authentication.' => '',
+    'Error while enabling SMS two factor authentication. Please reload the page.' => '',
     'Export my data' => '',
     'Finish' => '',
     'Force password change at next login' => '',
@@ -293,8 +294,8 @@ return [
     'Your password has expired, you must change it now' => '',
     'Your personal information has been removed' => '',
     'Your profile has been updated' => '',
-    'Your two factor authentication method is based on "{0}".' => '',
     'Your role requires 2FA, you won\'t be able to use the application until you enable it' => '',
+    'Your two factor authentication method is based on "{0}".' => '',
     'privacy policy' => '',
     '{0, date, MMM dd, YYYY HH:mm}' => '',
     '{0, date, MMMM dd, YYYY HH:mm}' => '',

src/User/resources/i18n/zh-CN/usuario.php

@@ -63,6 +63,7 @@ return [
     'Children' => '',
     'Class' => '',
     'Close' => '',
+    'Code for two factor authentication' => '',
     'Complete password reset on {0}' => '',
     'Confirm' => '',
     'Confirm account on {0}' => '',
@@ -105,7 +106,7 @@ return [
     'Error occurred while deleting user' => '',
     'Error sending registration message to "{email}". Please try again later.' => '',
     'Error sending welcome message to "{email}". Please try again later.' => '',
-    'Error while enabling SMS two factor authentication.' => '',
+    'Error while enabling SMS two factor authentication. Please reload the page.' => '',
     'Export my data' => '',
     'Finish' => '',
     'Force password change at next login' => '',
@@ -293,8 +294,8 @@ return [
     'Your password has expired, you must change it now' => '',
     'Your personal information has been removed' => '',
     'Your profile has been updated' => '',
-    'Your two factor authentication method is based on "{0}".' => '',
     'Your role requires 2FA, you won\'t be able to use the application until you enable it' => '',
+    'Your two factor authentication method is based on "{0}".' => '',
     'privacy policy' => '',
     '{0, date, MMM dd, YYYY HH:mm}' => '',
     '{0, date, MMMM dd, YYYY HH:mm}' => '',