leonardo/yii2-usuario
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Consolitation of 2FA messages #103

Browse Source
This commit is contained in:
Lorenzo Milesi
2017-11-04 14:49:31 +01:00
parent b0d1f159aa
commit 5c74c698b8
5 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/User/Controller/SettingsController.php
View File

@ -280,7 +280,7 @@ class SettingsController extends Controller
return [
'success' => $success,
'message' => $success
? Yii::t('usuario', 'Two factor successfully enabled.')
? Yii::t('usuario', '2FA successfully enabled.')
: Yii::t('usuario', 'Verification failed. Please, enter new code.')
];
}
@ -297,11 +297,11 @@ class SettingsController extends Controller
if ($user->updateAttributes(['auth_tf_enabled' => '0'])) {
Yii::$app
->getSession()
->setFlash('success', Yii::t('usuario', 'Two-factor authorization has been disabled.'));
->setFlash('success', Yii::t('usuario', '2FA has been disabled.'));
} else {
Yii::$app
->getSession()
->setFlash('danger', Yii::t('usuario', 'Unable to disable two-factor authorization.'));
->setFlash('danger', Yii::t('usuario', 'Unable to disable 2FA.'));
}
$this->redirect(['account']);

4
src/User/Form/LoginForm.php
View File

@ -73,7 +73,7 @@ class LoginForm extends Model
'login' => Yii::t('usuario', 'Login'),
'password' => Yii::t('usuario', 'Password'),
'rememberMe' => Yii::t('usuario', 'Remember me next time'),
'twoFactorAuthenticationCode' => Yii::t('usuario', 'Two-factor authentication code')
'twoFactorAuthenticationCode' => Yii::t('usuario', '2FA code')
];
}
@ -111,7 +111,7 @@ class LoginForm extends Model
$this->module->twoFactorAuthenticationCycles
))
->validate()) {
$this->addError($attribute, Yii::t('usuario', 'Invalid two-factor code'));
$this->addError($attribute, Yii::t('usuario', 'Invalid 2FA code'));
}
}
],

12
src/User/resources/views/settings/account.php
View File

@ -81,7 +81,7 @@ $module = Yii::$app->getModule('user');
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
aria-hidden="true">&times;</span></button>
<h4 class="modal-title" id="myModalLabel">
<?= Yii::t('usuario', 'Two Factor Authentication') ?></h4>
<?= Yii::t('usuario', 'Two Factor Authentication (2FA)') ?></h4>
</div>
<div class="modal-body">
...
@ -96,25 +96,25 @@ $module = Yii::$app->getModule('user');
</div>
<div class="panel panel-info">
<div class="panel-heading">
<h3 class="panel-title"><?= Yii::t('usuario', 'Two-Factor Authentication') ?></h3>
<h3 class="panel-title"><?= Yii::t('usuario', 'Two Factor Authentication (2FA)') ?></h3>
</div>
<div class="panel-body">
<p>
<?= Yii::t('usuario', 'Two-factor auth protects you against stolen credentials') ?>.
<?= Yii::t('usuario', '2FA protects you against stolen credentials') ?>.
</p>
<div class="text-right">
<?= Html::a(
Yii::t('usuario', 'Disable Two-Factor Auth'),
Yii::t('usuario', 'Disable 2FA'),
['two-factor-disable', 'id' => $model->getUser()->id],
[
'id' => 'disable_tf_btn',
'class' => 'btn btn-warning ' . ($model->getUser()->auth_tf_enabled ? '' : 'hide'),
'data-method' => 'post',
'data-confirm' => Yii::t('usuario', 'This will disable two-factor auth. Are you sure?'),
'data-confirm' => Yii::t('usuario', 'This will disable 2FA. Are you sure?'),
]
) ?>
<?= Html::a(
Yii::t('usuario', 'Enable Two-factor auth'),
Yii::t('usuario', 'Enable 2FA'),
'#tfmodal',
[
'id' => 'enable_tf_btn',

2
src/User/resources/views/settings/two-factor.php
View File

@ -29,7 +29,7 @@
<div class="row">
<div class="col-md-offset-3 col-md-6 text-center">
<div class="input-group">
<input type="text" class="form-control" id="tfcode" placeholder="<?= Yii::t('usuario', 'Two-factor code') ?>"/>
<input type="text" class="form-control" id="tfcode" placeholder="<?= Yii::t('usuario', '2FA code') ?>"/>
<span class="input-group-btn">
<button type="button" class="btn btn-primary btn-submit-code">
<?= Yii::t('usuario', 'Enable') ?>