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

wip

Browse Source
This commit is contained in:
resurtm
2017-01-11 22:42:15 +06:00
parent a3434504e6
commit 1cb60f0740
78 changed files with 354 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/User/resources/i18n/message.php
View File

@ -10,7 +10,7 @@
*/
return [
'sourcePath' => __DIR__.'/../User',
'sourcePath' => __DIR__ . '/../../../User',
'messagePath' => __DIR__,
'languages' => [
'ca',
@ -24,7 +24,7 @@ return [
'hr',
'hu',
'it',
'kz',
'kk',
'lt',
'nl',
'pl',

2
lib/User/resources/views/admin/_account.php
View File

@ -37,7 +37,7 @@ use yii\helpers\Html;
<div class="form-group">
<div class="col-lg-offset-3 col-lg-9">
<?= Html::submitButton(Yii::t('user', 'Update'), ['class' => 'btn btn-block btn-success']) ?>
<?= Html::submitButton(Yii::t('usuario', 'Update'), ['class' => 'btn btn-block btn-success']) ?>
</div>
</div>

2
lib/User/resources/views/admin/_assignments.php
View File

@ -26,7 +26,7 @@ use Da\User\Widget\AssignmentsWidget;
'options' => [
'class' => 'alert-info alert-dismissible',
],
'body' => Yii::t('user', 'You can assign multiple roles or permissions to user by using the form below'),
'body' => Yii::t('usuario', 'You can assign multiple roles or permissions to user by using the form below'),
]
) ?>

18
lib/User/resources/views/admin/_info.php
View File

@ -19,38 +19,38 @@
<table class="table">
<tr>
<td><strong><?= Yii::t('user', 'Registration time') ?>:</strong></td>
<td><?= Yii::t('user', '{0, date, MMMM dd, YYYY HH:mm}', [$user->created_at]) ?></td>
<td><strong><?= Yii::t('usuario', 'Registration time') ?>:</strong></td>
<td><?= Yii::t('usuario', '{0, date, MMMM dd, YYYY HH:mm}', [$user->created_at]) ?></td>
</tr>
<?php if ($user->registration_ip !== null): ?>
<tr>
<td><strong><?= Yii::t('user', 'Registration IP') ?>:</strong></td>
<td><strong><?= Yii::t('usuario', 'Registration IP') ?>:</strong></td>
<td><?= $user->registration_ip ?></td>
</tr>
<?php endif ?>
<tr>
<td><strong><?= Yii::t('user', 'Confirmation status') ?>:</strong></td>
<td><strong><?= Yii::t('usuario', 'Confirmation status') ?>:</strong></td>
<?php if ($user->isConfirmed): ?>
<td class="text-success"><?= Yii::t(
'user',
'usuario',
'Confirmed at {0, date, MMMM dd, YYYY HH:mm}',
[$user->confirmed_at]
) ?></td>
<?php else: ?>
<td class="text-danger"><?= Yii::t('user', 'Unconfirmed') ?></td>
<td class="text-danger"><?= Yii::t('usuario', 'Unconfirmed') ?></td>
<?php endif ?>
</tr>
<tr>
<td><strong><?= Yii::t('user', 'Block status') ?>:</strong></td>
<td><strong><?= Yii::t('usuario', 'Block status') ?>:</strong></td>
<?php if ($user->isBlocked): ?>
<td class="text-danger"><?= Yii::t(
'user',
'usuario',
'Blocked at {0, date, MMMM dd, YYYY HH:mm}',
[$user->blocked_at]
) ?>
</td>
<?php else: ?>
<td class="text-success"><?= Yii::t('user', 'Not blocked') ?></td>
<td class="text-success"><?= Yii::t('usuario', 'Not blocked') ?></td>
<?php endif ?>
</tr>
</table>

2
lib/User/resources/views/admin/_profile.php
View File

@ -45,7 +45,7 @@ use yii\helpers\Html;
<div class="form-group">
<div class="col-lg-offset-3 col-lg-9">
<?= Html::submitButton(Yii::t('user', 'Update'), ['class' => 'btn btn-block btn-success']) ?>
<?= Html::submitButton(Yii::t('usuario', 'Update'), ['class' => 'btn btn-block btn-success']) ?>
</div>
</div>

16
lib/User/resources/views/admin/create.php
View File

@ -18,8 +18,8 @@ use yii\helpers\Html;
* @var \Da\User\Model\User $user
*/
$this->title = Yii::t('user', 'Create a user account');
$this->params['breadcrumbs'][] = ['label' => Yii::t('user', 'Users'), 'url' => ['index']];
$this->title = Yii::t('usuario', 'Create a user account');
$this->params['breadcrumbs'][] = ['label' => Yii::t('usuario', 'Users'), 'url' => ['index']];
$this->params['breadcrumbs'][] = $this->title;
?>
@ -50,18 +50,18 @@ $this->params['breadcrumbs'][] = $this->title;
],
'items' => [
[
'label' => Yii::t('user', 'Account details'),
'label' => Yii::t('usuario', 'Account details'),
'url' => ['/user/admin/create'],
],
[
'label' => Yii::t('user', 'Profile details'),
'label' => Yii::t('usuario', 'Profile details'),
'options' => [
'class' => 'disabled',
'onclick' => 'return false;',
],
],
[
'label' => Yii::t('user', 'Information'),
'label' => Yii::t('usuario', 'Information'),
'options' => [
'class' => 'disabled',
'onclick' => 'return false;',
@ -77,8 +77,8 @@ $this->params['breadcrumbs'][] = $this->title;
<div class="panel panel-default">
<div class="panel-body">
<div class="alert alert-info">
<?= Yii::t('user', 'Credentials will be sent to the user by email') ?>.
<?= Yii::t('user', 'A password will be generated automatically if not provided') ?>.
<?= Yii::t('usuario', 'Credentials will be sent to the user by email') ?>.
<?= Yii::t('usuario', 'A password will be generated automatically if not provided') ?>.
</div>
<?php $form = ActiveForm::begin(
[
@ -98,7 +98,7 @@ $this->params['breadcrumbs'][] = $this->title;
<div class="form-group">
<div class="col-lg-offset-3 col-lg-9">
<?= Html::submitButton(
Yii::t('user', 'Save'),
Yii::t('usuario', 'Save'),
['class' => 'btn btn-block btn-success']
) ?>
</div>

24
lib/User/resources/views/admin/index.php
View File

@ -20,7 +20,7 @@ use yii\widgets\Pjax;
* @var $searchModel Da\User\Search\UserSearch
*/
$this->title = Yii::t('user', 'Manage users');
$this->title = Yii::t('usuario', 'Manage users');
$this->params['breadcrumbs'][] = $this->title;
?>
@ -40,7 +40,7 @@ $this->params['breadcrumbs'][] = $this->title;
'attribute' => 'registration_ip',
'value' => function ($model) {
return $model->registration_ip == null
? '<span class="not-set">'.Yii::t('user', '(not set)').'</span>'
? '<span class="not-set">'.Yii::t('usuario', '(not set)').'</span>'
: $model->registration_ip;
},
'format' => 'html',
@ -49,27 +49,27 @@ $this->params['breadcrumbs'][] = $this->title;
'attribute' => 'created_at',
'value' => function ($model) {
if (extension_loaded('intl')) {
return Yii::t('user', '{0, date, MMMM dd, YYYY HH:mm}', [$model->created_at]);
return Yii::t('usuario', '{0, date, MMMM dd, YYYY HH:mm}', [$model->created_at]);
} else {
return date('Y-m-d G:i:s', $model->created_at);
}
},
],
[
'header' => Yii::t('user', 'Confirmation'),
'header' => Yii::t('usuario', 'Confirmation'),
'value' => function ($model) {
if ($model->isConfirmed) {
return '<div class="text-center">
<span class="text-success">' .Yii::t('user', 'Confirmed').'</span>
<span class="text-success">' .Yii::t('usuario', 'Confirmed').'</span>
</div>';
} else {
return Html::a(
Yii::t('user', 'Confirm'),
Yii::t('usuario', 'Confirm'),
['confirm', 'id' => $model->id],
[
'class' => 'btn btn-xs btn-success btn-block',
'data-method' => 'post',
'data-confirm' => Yii::t('user', 'Are you sure you want to confirm this user?'),
'data-confirm' => Yii::t('usuario', 'Are you sure you want to confirm this user?'),
]
);
}
@ -78,26 +78,26 @@ $this->params['breadcrumbs'][] = $this->title;
'visible' => Yii::$app->getModule('user')->enableEmailConfirmation,
],
[
'header' => Yii::t('user', 'Block status'),
'header' => Yii::t('usuario', 'Block status'),
'value' => function ($model) {
if ($model->isBlocked) {
return Html::a(
Yii::t('user', 'Unblock'),
Yii::t('usuario', 'Unblock'),
['block', 'id' => $model->id],
[
'class' => 'btn btn-xs btn-success btn-block',
'data-method' => 'post',
'data-confirm' => Yii::t('user', 'Are you sure you want to unblock this user?'),
'data-confirm' => Yii::t('usuario', 'Are you sure you want to unblock this user?'),
]
);
} else {
return Html::a(
Yii::t('user', 'Block'),
Yii::t('usuario', 'Block'),
['block', 'id' => $model->id],
[
'class' => 'btn btn-xs btn-danger btn-block',
'data-method' => 'post',
'data-confirm' => Yii::t('user', 'Are you sure you want to block this user?'),
'data-confirm' => Yii::t('usuario', 'Are you sure you want to block this user?'),
]
);
}

28
lib/User/resources/views/admin/update.php
View File

@ -20,8 +20,8 @@ use yii\helpers\Html;
* @var string $content
*/
$this->title = Yii::t('user', 'Update user account');
$this->params['breadcrumbs'][] = ['label' => Yii::t('user', 'Users'), 'url' => ['index']];
$this->title = Yii::t('usuario', 'Update user account');
$this->params['breadcrumbs'][] = ['label' => Yii::t('usuario', 'Users'), 'url' => ['index']];
$this->params['breadcrumbs'][] = $this->title;
?>
@ -52,69 +52,69 @@ $this->params['breadcrumbs'][] = $this->title;
],
'items' => [
[
'label' => Yii::t('user', 'Account details'),
'label' => Yii::t('usuario', 'Account details'),
'url' => ['/user/admin/update', 'id' => $user->id],
],
[
'label' => Yii::t('user', 'Profile details'),
'label' => Yii::t('usuario', 'Profile details'),
'url' => ['/user/admin/update-profile', 'id' => $user->id],
],
[
'label' => Yii::t('user', 'Information'),
'label' => Yii::t('usuario', 'Information'),
'url' => ['/user/admin/info', 'id' => $user->id],
],
[
'label' => Yii::t('user', 'Assignments'),
'label' => Yii::t('usuario', 'Assignments'),
'url' => ['/user/admin/assignments', 'id' => $user->id],
],
'<hr>',
[
'label' => Yii::t('user', 'Confirm'),
'label' => Yii::t('usuario', 'Confirm'),
'url' => ['/user/admin/confirm', 'id' => $user->id],
'visible' => !$user->isConfirmed,
'linkOptions' => [
'class' => 'text-success',
'data-method' => 'post',
'data-confirm' => Yii::t(
'user',
'usuario',
'Are you sure you want to confirm this user?'
),
],
],
[
'label' => Yii::t('user', 'Block'),
'label' => Yii::t('usuario', 'Block'),
'url' => ['/user/admin/block', 'id' => $user->id],
'visible' => !$user->isBlocked,
'linkOptions' => [
'class' => 'text-danger',
'data-method' => 'post',
'data-confirm' => Yii::t(
'user',
'usuario',
'Are you sure you want to block this user?'
),
],
],
[
'label' => Yii::t('user', 'Unblock'),
'label' => Yii::t('usuario', 'Unblock'),
'url' => ['/user/admin/block', 'id' => $user->id],
'visible' => $user->isBlocked,
'linkOptions' => [
'class' => 'text-success',
'data-method' => 'post',
'data-confirm' => Yii::t(
'user',
'usuario',
'Are you sure you want to unblock this user?'
),
],
],
[
'label' => Yii::t('user', 'Delete'),
'label' => Yii::t('usuario', 'Delete'),
'url' => ['/user/admin/delete', 'id' => $user->id],
'linkOptions' => [
'class' => 'text-danger',
'data-method' => 'post',
'data-confirm' => Yii::t(
'user',
'usuario',
'Are you sure you want to delete this user?'
),
],

10
lib/User/resources/views/mail/confirmation.php
View File

@ -17,18 +17,18 @@ use yii\helpers\Html;
*/
?>
<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">
<?= Yii::t('user', 'Hello') ?>,
<?= Yii::t('usuario', 'Hello') ?>,
</p>
<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">
<?= Yii::t('user', 'Thank you for signing up on {0}', Yii::$app->name) ?>.
<?= Yii::t('user', 'In order to complete your registration, please click the link below') ?>.
<?= Yii::t('usuario', 'Thank you for signing up on {0}', Yii::$app->name) ?>.
<?= Yii::t('usuario', 'In order to complete your registration, please click the link below') ?>.
</p>
<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">
<?= Html::a(Html::encode($token->url), $token->url) ?>
</p>
<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">
<?= Yii::t('user', 'If you cannot click the link, please try pasting the text into your browser') ?>.
<?= Yii::t('usuario', 'If you cannot click the link, please try pasting the text into your browser') ?>.
</p>
<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">
<?= Yii::t('user', 'If you did not make this request you can ignore this email') ?>.
<?= Yii::t('usuario', 'If you did not make this request you can ignore this email') ?>.
</p>

10
lib/User/resources/views/mail/reconfirmation.php
View File

@ -16,22 +16,22 @@ use yii\helpers\Html;
*/
?>
<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">
<?= Yii::t('user', 'Hello') ?>,
<?= Yii::t('usuario', 'Hello') ?>,
</p>
<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">
<?= Yii::t(
'user',
'usuario',
'We have received a request to change the email address for your account on {0}',
Yii::$app->name
) ?>.
<?= Yii::t('user', 'In order to complete your request, please click the link below') ?>.
<?= Yii::t('usuario', 'In order to complete your request, please click the link below') ?>.
</p>
<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">
<?= Html::a(Html::encode($token->getUrl()), $token->getUrl()); ?>
</p>
<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">
<?= Yii::t('user', 'If you cannot click the link, please try pasting the text into your browser') ?>.
<?= Yii::t('usuario', 'If you cannot click the link, please try pasting the text into your browser') ?>.
</p>
<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">
<?= Yii::t('user', 'If you did not make this request you can ignore this email') ?>.
<?= Yii::t('usuario', 'If you did not make this request you can ignore this email') ?>.
</p>

10
lib/User/resources/views/mail/recovery.php
View File

@ -17,18 +17,18 @@ use yii\helpers\Html;
*/
?>
<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">
<?= Yii::t('user', 'Hello') ?>,
<?= Yii::t('usuario', 'Hello') ?>,
</p>
<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">
<?= Yii::t('user', 'We have received a request to reset the password for your account on {0}', Yii::$app->name) ?>.
<?= Yii::t('user', 'Please click the link below to complete your password reset') ?>.
<?= Yii::t('usuario', 'We have received a request to reset the password for your account on {0}', Yii::$app->name) ?>.
<?= Yii::t('usuario', 'Please click the link below to complete your password reset') ?>.
</p>
<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">
<?= Html::a(Html::encode($token->url), $token->url); ?>
</p>
<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">
<?= Yii::t('user', 'If you cannot click the link, please try pasting the text into your browser') ?>.
<?= Yii::t('usuario', 'If you cannot click the link, please try pasting the text into your browser') ?>.
</p>
<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">
<?= Yii::t('user', 'If you did not make this request you can ignore this email') ?>.
<?= Yii::t('usuario', 'If you did not make this request you can ignore this email') ?>.
</p>

10
lib/User/resources/views/mail/text/confirmation.php
View File

@ -14,13 +14,13 @@
* @var \Da\User\Model\Token $token
*/
?>
<?= Yii::t('user', 'Hello') ?>,
<?= Yii::t('usuario', 'Hello') ?>,
<?= Yii::t('user', 'Thank you for signing up on {0}', Yii::$app->name) ?>.
<?= Yii::t('user', 'In order to complete your registration, please click the link below') ?>.
<?= Yii::t('usuario', 'Thank you for signing up on {0}', Yii::$app->name) ?>.
<?= Yii::t('usuario', 'In order to complete your registration, please click the link below') ?>.
<?= $token->url ?>
<?= Yii::t('user', 'If you cannot click the link, please try pasting the text into your browser') ?>.
<?= Yii::t('usuario', 'If you cannot click the link, please try pasting the text into your browser') ?>.
<?= Yii::t('user', 'If you did not make this request you can ignore this email') ?>.
<?= Yii::t('usuario', 'If you did not make this request you can ignore this email') ?>.

10
lib/User/resources/views/mail/text/reconfirmation.php
View File

@ -13,17 +13,17 @@
* @var \Da\User\Model\Token
*/
?>
<?= Yii::t('user', 'Hello') ?>,
<?= Yii::t('usuario', 'Hello') ?>,
<?= Yii::t(
'user',
'usuario',
'We have received a request to change the email address for your account on {0}',
Yii::$app->name
) ?>.
<?= Yii::t('user', 'In order to complete your request, please click the link below') ?>.
<?= Yii::t('usuario', 'In order to complete your request, please click the link below') ?>.
<?= $token->url ?>
<?= Yii::t('user', 'If you cannot click the link, please try pasting the text into your browser') ?>.
<?= Yii::t('usuario', 'If you cannot click the link, please try pasting the text into your browser') ?>.
<?= Yii::t('user', 'If you did not make this request you can ignore this email') ?>.
<?= Yii::t('usuario', 'If you did not make this request you can ignore this email') ?>.

10
lib/User/resources/views/mail/text/recovery.php
View File

@ -14,13 +14,13 @@
* @var \Da\User\Model\Token $token
*/
?>
<?= Yii::t('user', 'Hello') ?>,
<?= Yii::t('usuario', 'Hello') ?>,
<?= Yii::t('user', 'We have received a request to reset the password for your account on {0}', Yii::$app->name) ?>.
<?= Yii::t('user', 'Please click the link below to complete your password reset') ?>.
<?= Yii::t('usuario', 'We have received a request to reset the password for your account on {0}', Yii::$app->name) ?>.
<?= Yii::t('usuario', 'Please click the link below to complete your password reset') ?>.
<?= $token->url ?>
<?= Yii::t('user', 'If you cannot click the link, please try pasting the text into your browser') ?>.
<?= Yii::t('usuario', 'If you cannot click the link, please try pasting the text into your browser') ?>.
<?= Yii::t('user', 'If you did not make this request you can ignore this email') ?>.
<?= Yii::t('usuario', 'If you did not make this request you can ignore this email') ?>.

12
lib/User/resources/views/mail/text/welcome.php
View File

@ -15,18 +15,18 @@
* @var \Da\User\Module $module
*/
?>
<?= Yii::t('user', 'Hello') ?>,
<?= Yii::t('usuario', 'Hello') ?>,
<?= Yii::t('user', 'Your account on {0} has been created', Yii::$app->name) ?>.
<?= Yii::t('usuario', 'Your account on {0} has been created', Yii::$app->name) ?>.
<?php if ($module->generatePasswords): ?>
<?= Yii::t('user', 'We have generated a password for you') ?>:
<?= Yii::t('usuario', 'We have generated a password for you') ?>:
<?= $user->password ?>
<?php endif ?>
<?php if ($token !== null): ?>
<?= Yii::t('user', 'In order to complete your registration, please click the link below') ?>.
<?= Yii::t('usuario', 'In order to complete your registration, please click the link below') ?>.
<?= $token->url ?>
<?= Yii::t('user', 'If you cannot click the link, please try pasting the text into your browser') ?>.
<?= Yii::t('usuario', 'If you cannot click the link, please try pasting the text into your browser') ?>.
<?php endif ?>
<?= Yii::t('user', 'If you did not make this request you can ignore this email') ?>.
<?= Yii::t('usuario', 'If you did not make this request you can ignore this email') ?>.

12
lib/User/resources/views/mail/welcome.php
View File

@ -20,29 +20,29 @@ use yii\helpers\Html;
?>
<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">
<?= Yii::t('user', 'Hello') ?>,
<?= Yii::t('usuario', 'Hello') ?>,
</p>
<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">
<?= Yii::t('user', 'Your account on {0} has been created', Yii::$app->name) ?>.
<?= Yii::t('usuario', 'Your account on {0} has been created', Yii::$app->name) ?>.
<?php if ($showPassword || $module->generatePasswords): ?>
<?= Yii::t('user', 'We have generated a password for you') ?>: <strong><?= $user->password ?></strong>
<?= Yii::t('usuario', 'We have generated a password for you') ?>: <strong><?= $user->password ?></strong>
<?php endif ?>
</p>
<?php if ($token !== null): ?>
<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">
<?= Yii::t('user', 'In order to complete your registration, please click the link below') ?>.
<?= Yii::t('usuario', 'In order to complete your registration, please click the link below') ?>.
</p>
<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">
<?= Html::a(Html::encode($token->url), $token->url); ?>
</p>
<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">
<?= Yii::t('user', 'If you cannot click the link, please try pasting the text into your browser') ?>.
<?= Yii::t('usuario', 'If you cannot click the link, please try pasting the text into your browser') ?>.
</p>
<?php endif ?>
<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">
<?= Yii::t('user', 'If you did not make this request you can ignore this email') ?>.
<?= Yii::t('usuario', 'If you did not make this request you can ignore this email') ?>.
</p>

2
lib/User/resources/views/permission/_form.php
View File

@ -40,6 +40,6 @@ use yii\widgets\ActiveForm;
],
]) ?>
<?= Html::submitButton(Yii::t('user', 'Save'), ['class' => 'btn btn-success btn-block']) ?>
<?= Html::submitButton(Yii::t('usuario', 'Save'), ['class' => 'btn btn-success btn-block']) ?>
<?php ActiveForm::end() ?>

2
lib/User/resources/views/permission/create.php
View File

@ -15,7 +15,7 @@
* @var $unassignedItems string[]
*/
$this->title = Yii::t('user', 'Create new permission');
$this->title = Yii::t('usuario', 'Create new permission');
$this->params['breadcrumbs'][] = $this->title;
?>

8
lib/User/resources/views/permission/index.php
View File

@ -18,7 +18,7 @@ use yii\grid\ActionColumn;
use yii\grid\GridView;
use yii\helpers\Url;
$this->title = Yii::t('user', 'Permissions');
$this->title = Yii::t('usuario', 'Permissions');
$this->params['breadcrumbs'][] = $this->title;
?>
@ -33,21 +33,21 @@ $this->params['breadcrumbs'][] = $this->title;
'columns' => [
[
'attribute' => 'name',
'header' => Yii::t('user', 'Name'),
'header' => Yii::t('usuario', 'Name'),
'options' => [
'style' => 'width: 20%',
],
],
[
'attribute' => 'description',
'header' => Yii::t('user', 'Description'),
'header' => Yii::t('usuario', 'Description'),
'options' => [
'style' => 'width: 55%',
],
],
[
'attribute' => 'rule_name',
'header' => Yii::t('user', 'Rule name'),
'header' => Yii::t('usuario', 'Rule name'),
'options' => [
'style' => 'width: 20%',
],

2
lib/User/resources/views/permission/update.php
View File

@ -15,7 +15,7 @@
* @var $unassignedItems string[]
*/
$this->title = Yii::t('user', 'Update permission');
$this->title = Yii::t('usuario', 'Update permission');
$this->params['breadcrumbs'][] = $this->title;
?>

2
lib/User/resources/views/profile/show.php
View File

@ -53,7 +53,7 @@ $this->params['breadcrumbs'][] = $this->title;
<?php endif; ?>
<li>
<i class="glyphicon glyphicon-time text-muted"></i>
<?= Yii::t('user', 'Joined on {0, date}', $profile->user->created_at) ?>
<?= Yii::t('usuario', 'Joined on {0, date}', $profile->user->created_at) ?>
</li>
</ul>
<?php if (!empty($profile->bio)): ?>

4
lib/User/resources/views/recovery/request.php
View File

@ -18,7 +18,7 @@ use yii\widgets\ActiveForm;
* @var \Da\User\Form\RecoveryForm $model
*/
$this->title = Yii::t('user', 'Recover your password');
$this->title = Yii::t('usuario', 'Recover your password');
$this->params['breadcrumbs'][] = $this->title;
?>
<div class="row">
@ -38,7 +38,7 @@ $this->params['breadcrumbs'][] = $this->title;
<?= $form->field($model, 'email')->textInput(['autofocus' => true]) ?>
<?= Html::submitButton(Yii::t('user', 'Continue'), ['class' => 'btn btn-primary btn-block']) ?><br>
<?= Html::submitButton(Yii::t('usuario', 'Continue'), ['class' => 'btn btn-primary btn-block']) ?><br>
<?php ActiveForm::end(); ?>
</div>

4
lib/User/resources/views/recovery/reset.php
View File

@ -18,7 +18,7 @@ use yii\widgets\ActiveForm;
* @var \Da\User\Form\RecoveryForm $model
*/
$this->title = Yii::t('user', 'Reset your password');
$this->title = Yii::t('usuario', 'Reset your password');
$this->params['breadcrumbs'][] = $this->title;
?>
<div class="row">
@ -38,7 +38,7 @@ $this->params['breadcrumbs'][] = $this->title;
<?= $form->field($model, 'password')->passwordInput() ?>
<?= Html::submitButton(Yii::t('user', 'Finish'), ['class' => 'btn btn-success btn-block']) ?><br>
<?= Html::submitButton(Yii::t('usuario', 'Finish'), ['class' => 'btn btn-success btn-block']) ?><br>
<?php ActiveForm::end(); ?>
</div>

8
lib/User/resources/views/registration/connect.php
View File

@ -19,7 +19,7 @@ use yii\widgets\ActiveForm;
* @var \Da\User\Model\SocialNetworkAccount $account
*/
$this->title = Yii::t('user', 'Sign in');
$this->title = Yii::t('usuario', 'Sign in');
$this->params['breadcrumbs'][] = $this->title;
?>
<div class="row">
@ -32,7 +32,7 @@ $this->params['breadcrumbs'][] = $this->title;
<div class="alert alert-info">
<p>
<?= Yii::t(
'user',
'usuario',
'In order to finish your registration, we need you to enter following fields'
) ?>:
</p>
@ -47,7 +47,7 @@ $this->params['breadcrumbs'][] = $this->title;
<?= $form->field($model, 'username') ?>
<?= Html::submitButton(Yii::t('user', 'Continue'), ['class' => 'btn btn-success btn-block']) ?>
<?= Html::submitButton(Yii::t('usuario', 'Continue'), ['class' => 'btn btn-success btn-block']) ?>
<?php ActiveForm::end(); ?>
</div>
@ -55,7 +55,7 @@ $this->params['breadcrumbs'][] = $this->title;
<p class="text-center">
<?= Html::a(
Yii::t(
'user',
'usuario',
'If you already registered, sign in and connect this account on settings page'
),
['/user/settings/networks']

6
lib/User/resources/views/registration/register.php
View File

@ -19,7 +19,7 @@ use yii\widgets\ActiveForm;
* @var \Da\User\Module $module
*/
$this->title = Yii::t('user', 'Sign up');
$this->title = Yii::t('usuario', 'Sign up');
$this->params['breadcrumbs'][] = $this->title;
?>
<div class="row">
@ -45,13 +45,13 @@ $this->params['breadcrumbs'][] = $this->title;
<?= $form->field($model, 'password')->passwordInput() ?>
<?php endif ?>
<?= Html::submitButton(Yii::t('user', 'Sign up'), ['class' => 'btn btn-success btn-block']) ?>
<?= Html::submitButton(Yii::t('usuario', 'Sign up'), ['class' => 'btn btn-success btn-block']) ?>
<?php ActiveForm::end(); ?>
</div>
</div>
<p class="text-center">
<?= Html::a(Yii::t('user', 'Already registered? Sign in!'), ['/user/security/login']) ?>
<?= Html::a(Yii::t('usuario', 'Already registered? Sign in!'), ['/user/security/login']) ?>
</p>
</div>
</div>

4
lib/User/resources/views/registration/resend.php
View File

@ -17,7 +17,7 @@ use yii\widgets\ActiveForm;
* @var \Da\User\Form\ResendForm $model
*/
$this->title = Yii::t('user', 'Request new confirmation message');
$this->title = Yii::t('usuario', 'Request new confirmation message');
$this->params['breadcrumbs'][] = $this->title;
?>
<div class="row">
@ -37,7 +37,7 @@ $this->params['breadcrumbs'][] = $this->title;
<?= $form->field($model, 'email')->textInput(['autofocus' => true]) ?>
<?= Html::submitButton(Yii::t('user', 'Continue'), ['class' => 'btn btn-primary btn-block']) ?><br>
<?= Html::submitButton(Yii::t('usuario', 'Continue'), ['class' => 'btn btn-primary btn-block']) ?><br>
<?php ActiveForm::end(); ?>
</div>

2
lib/User/resources/views/role/_form.php
View File

@ -43,6 +43,6 @@ $unassignedItems = Yii::$container->get(AuthHelper::class)->getUnassignedItems($
],
]) ?>
<?= Html::submitButton(Yii::t('user', 'Save'), ['class' => 'btn btn-success btn-block']) ?>
<?= Html::submitButton(Yii::t('usuario', 'Save'), ['class' => 'btn btn-success btn-block']) ?>
<?php ActiveForm::end() ?>

2
lib/User/resources/views/role/create.php
View File

@ -14,7 +14,7 @@
* @var $this yii\web\View
* @var $unassignedItems string[]
*/
$this->title = Yii::t('user', 'Create new role');
$this->title = Yii::t('usuario', 'Create new role');
$this->params['breadcrumbs'][] = $this->title;
?>

8
lib/User/resources/views/role/index.php
View File

@ -19,7 +19,7 @@ use yii\helpers\Url;
* @var $this yii\web\View
*/
$this->title = Yii::t('user', 'Roles');
$this->title = Yii::t('usuario', 'Roles');
$this->params['breadcrumbs'][] = $this->title;
?>
@ -34,21 +34,21 @@ $this->params['breadcrumbs'][] = $this->title;
'columns' => [
[
'attribute' => 'name',
'header' => Yii::t('user', 'Name'),
'header' => Yii::t('usuario', 'Name'),
'options' => [
'style' => 'width: 20%',
],
],
[
'attribute' => 'description',
'header' => Yii::t('user', 'Description'),
'header' => Yii::t('usuario', 'Description'),
'options' => [
'style' => 'width: 55%',
],
],
[
'attribute' => 'rule_name',
'header' => Yii::t('user', 'Rule name'),
'header' => Yii::t('usuario', 'Rule name'),
'options' => [
'style' => 'width: 20%',
],

2
lib/User/resources/views/role/update.php
View File

@ -14,7 +14,7 @@
* @var $this yii\web\View
* @var $unassignedItems string[]
*/
$this->title = Yii::t('user', 'Update role');
$this->title = Yii::t('usuario', 'Update role');
$this->params['breadcrumbs'][] = $this->title;
?>

12
lib/User/resources/views/security/login.php
View File

@ -19,7 +19,7 @@ use yii\widgets\ActiveForm;
* @var \Da\User\Module $module
*/
$this->title = Yii::t('user', 'Sign in');
$this->title = Yii::t('usuario', 'Sign in');
$this->params['breadcrumbs'][] = $this->title;
?>
@ -57,10 +57,10 @@ $this->params['breadcrumbs'][] = $this->title;
)
->passwordInput()
->label(
Yii::t('user', 'Password')
Yii::t('usuario', 'Password')
.($module->allowPasswordRecovery ?
' ('.Html::a(
Yii::t('user', 'Forgot password?'),
Yii::t('usuario', 'Forgot password?'),
['/user/recovery/request'],
['tabindex' => '5']
)
@ -70,7 +70,7 @@ $this->params['breadcrumbs'][] = $this->title;
<?= $form->field($model, 'rememberMe')->checkbox(['tabindex' => '4']) ?>
<?= Html::submitButton(
Yii::t('user', 'Sign in'),
Yii::t('usuario', 'Sign in'),
['class' => 'btn btn-primary btn-block', 'tabindex' => '3']
) ?>
@ -79,12 +79,12 @@ $this->params['breadcrumbs'][] = $this->title;
</div>
<?php if ($module->enableEmailConfirmation): ?>
<p class="text-center">
<?= Html::a(Yii::t('user', 'Didn\'t receive confirmation message?'), ['/user/registration/resend']) ?>
<?= Html::a(Yii::t('usuario', 'Didn\'t receive confirmation message?'), ['/user/registration/resend']) ?>
</p>
<?php endif ?>
<?php if ($module->enableRegistration): ?>
<p class="text-center">
<?= Html::a(Yii::t('user', 'Don\'t have an account? Sign up!'), ['/user/registration/register']) ?>
<?= Html::a(Yii::t('usuario', 'Don\'t have an account? Sign up!'), ['/user/registration/register']) ?>
</p>
<?php endif ?>
<?= ConnectWidget::widget(

6
lib/User/resources/views/settings/_menu.php
View File

@ -38,10 +38,10 @@ $networksVisible = count(Yii::$app->authClientCollection->clients) > 0;
'class' => 'nav nav-pills nav-stacked',
],
'items' => [
['label' => Yii::t('user', 'Profile'), 'url' => ['/user/settings/profile']],
['label' => Yii::t('user', 'Account'), 'url' => ['/user/settings/account']],
['label' => Yii::t('usuario', 'Profile'), 'url' => ['/user/settings/profile']],
['label' => Yii::t('usuario', 'Account'), 'url' => ['/user/settings/account']],
[
'label' => Yii::t('user', 'Networks'),
'label' => Yii::t('usuario', 'Networks'),
'url' => ['/user/settings/networks'],
'visible' => $networksVisible,
],

16
lib/User/resources/views/settings/account.php
View File

@ -18,7 +18,7 @@ use yii\widgets\ActiveForm;
* @var \Da\User\Form\SettingsForm $model
*/
$this->title = Yii::t('user', 'Account settings');
$this->title = Yii::t('usuario', 'Account settings');
$this->params['breadcrumbs'][] = $this->title;
?>
<div class="clearfix"></div>
@ -58,7 +58,7 @@ $this->params['breadcrumbs'][] = $this->title;
<div class="form-group">
<div class="col-lg-offset-3 col-lg-9">
<?= Html::submitButton(Yii::t('user', 'Save'), ['class' => 'btn btn-block btn-success']) ?><br>
<?= Html::submitButton(Yii::t('usuario', 'Save'), ['class' => 'btn btn-block btn-success']) ?><br>
</div>
</div>
@ -69,18 +69,18 @@ $this->params['breadcrumbs'][] = $this->title;
<?php if ($model->module->allowAccountDelete): ?>
<div class="panel panel-danger">
<div class="panel-heading">
<h3 class="panel-title"><?= Yii::t('user', 'Delete account') ?></h3>
<h3 class="panel-title"><?= Yii::t('usuario', 'Delete account') ?></h3>
</div>
<div class="panel-body">
<p>
<?= Yii::t('user', 'Once you delete your account, there is no going back') ?>.
<?= Yii::t('user', 'It will be deleted forever') ?>.
<?= Yii::t('user', 'Please be certain') ?>.
<?= Yii::t('usuario', 'Once you delete your account, there is no going back') ?>.
<?= Yii::t('usuario', 'It will be deleted forever') ?>.
<?= Yii::t('usuario', 'Please be certain') ?>.
</p>
<?= Html::a(Yii::t('user', 'Delete account'), ['delete'], [
<?= Html::a(Yii::t('usuario', 'Delete account'), ['delete'], [
'class' => 'btn btn-danger',
'data-method' => 'post',
'data-confirm' => Yii::t('user', 'Are you sure? There is no going back'),
'data-confirm' => Yii::t('usuario', 'Are you sure? There is no going back'),
]) ?>
</div>
</div>

8
lib/User/resources/views/settings/networks.php
View File

@ -18,7 +18,7 @@ use yii\helpers\Html;
* @var \Da\User\Model\User $user
*/
$this->title = Yii::t('user', 'Networks');
$this->title = Yii::t('usuario', 'Networks');
$this->params['breadcrumbs'][] = $this->title;
?>
@ -37,7 +37,7 @@ $this->params['breadcrumbs'][] = $this->title;
</div>
<div class="panel-body">
<div class="alert alert-info">
<p><?= Yii::t('user', 'You can connect multiple accounts to be able to log in using them') ?>.</p>
<p><?= Yii::t('usuario', 'You can connect multiple accounts to be able to log in using them') ?>.</p>
</div>
<?php $auth = ConnectWidget::begin(
[
@ -59,7 +59,7 @@ $this->params['breadcrumbs'][] = $this->title;
<td style="width: 120px">
<?= $auth->isConnected($client) ?
Html::a(
Yii::t('user', 'Disconnect'),
Yii::t('usuario', 'Disconnect'),
$auth->createClientUrl($client),
[
'class' => 'btn btn-danger btn-block',
@ -67,7 +67,7 @@ $this->params['breadcrumbs'][] = $this->title;
]
) :
Html::a(
Yii::t('user', 'Connect'),
Yii::t('usuario', 'Connect'),
$auth->createClientUrl($client),
[
'class' => 'btn btn-success btn-block',

6
lib/User/resources/views/settings/profile.php
View File

@ -21,7 +21,7 @@ use Da\User\Helper\TimezoneHelper;
* @var TimezoneHelper $timezoneHelper
*/
$this->title = Yii::t('user', 'Profile settings');
$this->title = Yii::t('usuario', 'Profile settings');
$this->params['breadcrumbs'][] = $this->title;
$timezoneHelper = $model->make(TimezoneHelper::class);
?>
@ -70,7 +70,7 @@ $timezoneHelper = $model->make(TimezoneHelper::class);
->field($model, 'gravatar_email')
->hint(
Html::a(
Yii::t('user', 'Change your avatar at Gravatar.com'),
Yii::t('usuario', 'Change your avatar at Gravatar.com'),
'http://gravatar.com'
)
) ?>
@ -79,7 +79,7 @@ $timezoneHelper = $model->make(TimezoneHelper::class);
<div class="form-group">
<div class="col-lg-offset-3 col-lg-9">
<?= Html::submitButton(Yii::t('user', 'Save'), ['class' => 'btn btn-block btn-success']) ?>
<?= Html::submitButton(Yii::t('usuario', 'Save'), ['class' => 'btn btn-block btn-success']) ?>
<br>
</div>
</div>

14
lib/User/resources/views/shared/_menu.php
View File

@ -21,30 +21,30 @@ use yii\bootstrap\Nav;
],
'items' => [
[
'label' => Yii::t('user', 'Users'),
'label' => Yii::t('usuario', 'Users'),
'url' => ['/user/admin/index'],
],
[
'label' => Yii::t('user', 'Roles'),
'label' => Yii::t('usuario', 'Roles'),
'url' => ['/user/role/index'],
],
[
'label' => Yii::t('user', 'Permissions'),
'label' => Yii::t('usuario', 'Permissions'),
'url' => ['/user/permission/index'],
],
[
'label' => Yii::t('user', 'Create'),
'label' => Yii::t('usuario', 'Create'),
'items' => [
[
'label' => Yii::t('user', 'New user'),
'label' => Yii::t('usuario', 'New user'),
'url' => ['/user/admin/create'],
],
[
'label' => Yii::t('user', 'New role'),
'label' => Yii::t('usuario', 'New role'),
'url' => ['/user/role/create'],
],
[
'label' => Yii::t('user', 'New permission'),
'label' => Yii::t('usuario', 'New permission'),
'url' => ['/user/permission/create'],
],
],

4
lib/User/resources/views/widgets/assignments/form.php
View File

@ -28,7 +28,7 @@ use yii\widgets\ActiveForm;
'options' => [
'class' => 'alert-success',
],
'body' => Yii::t('user', 'Assignments have been updated'),
'body' => Yii::t('usuario', 'Assignments have been updated'),
]) ?>
<?php endif ?>
@ -48,6 +48,6 @@ use yii\widgets\ActiveForm;
],
]) ?>
<?= Html::submitButton(Yii::t('user', 'Update assignments'), ['class' => 'btn btn-success btn-block']) ?>
<?= Html::submitButton(Yii::t('usuario', 'Update assignments'), ['class' => 'btn btn-success btn-block']) ?>
<?php ActiveForm::end() ?>

4
lib/User/resources/views/widgets/login/login.php
View File

@ -39,11 +39,11 @@ use yii\helpers\Html;
<?= $form->field($model, 'rememberMe')->checkbox() ?>
<?= Html::submitButton(Yii::t('user', 'Sign in'), ['class' => 'btn btn-primary btn-block']) ?>
<?= Html::submitButton(Yii::t('usuario', 'Sign in'), ['class' => 'btn btn-primary btn-block']) ?>
<?php ActiveForm::end(); ?>
<?php else: ?>
<?= Html::a(Yii::t('user', 'Logout'), ['/user/security/logout'], [
<?= Html::a(Yii::t('usuario', 'Logout'), ['/user/security/logout'], [
'class' => 'btn btn-danger btn-block',
'data-method' => 'post',
]) ?>