From 1cb60f07409c369379f107620580336bbbd2dafd Mon Sep 17 00:00:00 2001 From: resurtm Date: Wed, 11 Jan 2017 22:42:15 +0600 Subject: [PATCH] wip --- .gitignore | 5 +++ composer.json | 4 +-- composer.lock | 8 +++-- docs/index.md | 1 + docs/other/other-for-developers.md | 32 +++++++++++++++++++ lib/User/AuthClient/VKontakte.php | 2 +- lib/User/AuthClient/Yandex.php | 2 +- lib/User/Bootstrap.php | 12 +++---- lib/User/Command/ConfirmController.php | 6 ++-- lib/User/Command/CreateController.php | 4 +-- lib/User/Command/DeleteController.php | 8 ++--- lib/User/Command/PasswordController.php | 6 ++-- .../Controller/AbstractAuthItemController.php | 12 +++---- lib/User/Controller/AdminController.php | 22 ++++++------- lib/User/Controller/RecoveryController.php | 8 ++--- .../Controller/RegistrationController.php | 18 +++++------ lib/User/Controller/SecurityController.php | 2 +- lib/User/Controller/SettingsController.php | 8 ++--- lib/User/Form/LoginForm.php | 12 +++---- lib/User/Form/RecoveryForm.php | 4 +-- lib/User/Form/RegistrationForm.php | 10 +++--- lib/User/Form/ResendForm.php | 2 +- lib/User/Form/SettingsForm.php | 10 +++--- lib/User/Model/AbstractAuthItem.php | 10 +++--- lib/User/Model/Assignment.php | 2 +- lib/User/Model/Profile.php | 16 +++++----- lib/User/Model/User.php | 18 +++++------ lib/User/Search/UserSearch.php | 8 ++--- lib/User/Service/EmailChangeService.php | 10 +++--- lib/User/Service/PasswordRecoveryService.php | 2 +- .../SocialNetworkAccountConnectService.php | 4 +-- .../SocialNetworkAuthenticateService.php | 6 ++-- .../Strategy/DefaultEmailChangeStrategy.php | 2 +- .../Strategy/SecureEmailChangeStrategy.php | 2 +- lib/User/Validator/RbacItemsValidator.php | 4 +-- lib/User/Validator/RbacRuleValidator.php | 6 ++-- lib/User/resources/i18n/message.php | 4 +-- lib/User/resources/views/admin/_account.php | 2 +- .../resources/views/admin/_assignments.php | 2 +- lib/User/resources/views/admin/_info.php | 18 +++++------ lib/User/resources/views/admin/_profile.php | 2 +- lib/User/resources/views/admin/create.php | 16 +++++----- lib/User/resources/views/admin/index.php | 24 +++++++------- lib/User/resources/views/admin/update.php | 28 ++++++++-------- .../resources/views/mail/confirmation.php | 10 +++--- .../resources/views/mail/reconfirmation.php | 10 +++--- lib/User/resources/views/mail/recovery.php | 10 +++--- .../views/mail/text/confirmation.php | 10 +++--- .../views/mail/text/reconfirmation.php | 10 +++--- .../resources/views/mail/text/recovery.php | 10 +++--- .../resources/views/mail/text/welcome.php | 12 +++---- lib/User/resources/views/mail/welcome.php | 12 +++---- lib/User/resources/views/permission/_form.php | 2 +- .../resources/views/permission/create.php | 2 +- lib/User/resources/views/permission/index.php | 8 ++--- .../resources/views/permission/update.php | 2 +- lib/User/resources/views/profile/show.php | 2 +- lib/User/resources/views/recovery/request.php | 4 +-- lib/User/resources/views/recovery/reset.php | 4 +-- .../resources/views/registration/connect.php | 8 ++--- .../resources/views/registration/register.php | 6 ++-- .../resources/views/registration/resend.php | 4 +-- lib/User/resources/views/role/_form.php | 2 +- lib/User/resources/views/role/create.php | 2 +- lib/User/resources/views/role/index.php | 8 ++--- lib/User/resources/views/role/update.php | 2 +- lib/User/resources/views/security/login.php | 12 +++---- lib/User/resources/views/settings/_menu.php | 6 ++-- lib/User/resources/views/settings/account.php | 16 +++++----- .../resources/views/settings/networks.php | 8 ++--- lib/User/resources/views/settings/profile.php | 6 ++-- lib/User/resources/views/shared/_menu.php | 14 ++++---- .../views/widgets/assignments/form.php | 4 +-- .../resources/views/widgets/login/login.php | 4 +-- tests/_app/config/console.php | 16 ++++++++-- tests/_app/config/test.php | 20 +++++++++--- tests/_app/yii.php | 4 +-- tests/_bootstrap.php | 10 +++--- 78 files changed, 354 insertions(+), 290 deletions(-) create mode 100644 docs/other/other-for-developers.md diff --git a/.gitignore b/.gitignore index 5b9f650..e4c8102 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,8 @@ tests/_output/* # ignore local codeception settings codeception.yml + +# Code Style Checkers and Mess Detectors +/phpcs.xml +/.php_cs.cache +/.php_cs diff --git a/composer.json b/composer.json index a5638d7..75117ca 100644 --- a/composer.json +++ b/composer.json @@ -52,9 +52,9 @@ }, "require-dev": { "cebe/assetfree-yii2": "~2.0.0", - "squizlabs/php_codesniffer": "^2.7", "friendsofphp/php-cs-fixer": "^2.0", - "phpmd/phpmd": "^2.4", + "squizlabs/php_codesniffer": "*", + "phpmd/phpmd": "@stable", "yiisoft/yii2-codeception": "^2.0.0", "codeception/specify": "^0.4.3", "codeception/verify": "^0.3.1", diff --git a/composer.lock b/composer.lock index 89de259..fbe1757 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "c5d975a6e617b48ce160709adc44e2e8", - "content-hash": "7fdd28c9923beb31bca84e428ae41146", + "hash": "a3487c38850210a1f70ecbd47629a680", + "content-hash": "2a2695eba4d025ba76be8783e6f80d6d", "packages": [ { "name": "2amigos/yii2-selectize-widget", @@ -3852,7 +3852,9 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": { + "phpmd/phpmd": 0 + }, "prefer-stable": false, "prefer-lowest": false, "platform": { diff --git a/docs/index.md b/docs/index.md index 7275036..610858f 100644 --- a/docs/index.md +++ b/docs/index.md @@ -36,5 +36,6 @@ Other ----- - [Contriburing to Documentation](other/contriburing-to-documentation.md) +- [Other for Developers](other/other-for-developers.md) © [2amigos](http://www.2amigos.us/) 2016 diff --git a/docs/other/other-for-developers.md b/docs/other/other-for-developers.md new file mode 100644 index 0000000..c69176d --- /dev/null +++ b/docs/other/other-for-developers.md @@ -0,0 +1,32 @@ +Other for Developers +==================== + +Tests +----- + +1. First of all +2. Running tests: `./vendor` + +Code Style Checkers and Mess Detectors +-------------------------------------- + +## [squizlabs/PHP_CodeSniffer](https://github.com/squizlabs/PHP_CodeSniffer) + +Global settings file: `phpcs.xml.dist` (added into Git) +Local settings file (you can add it locally): `phpcs.xml` (ignored by Git) + +Run checking by `PHP_CodeSniffer`: `./vendor/bin/phpcs` +Show check report in patch form: `./vendor/bin/phpcs --report=diff` +Automatically fix all fixable issues: `./vendor/bin/phpcbf` + +## [FriendsOfPHP/PHP-CS-Fixer](https://github.com/FriendsOfPHP/PHP-CS-Fixer) + +Global settings file: `.php_cs.dist` (added into Git) +Local settings file (you can add it locally): `.php_cs` (ignored by Git) + +Run checking by `PHP-CS-Fixer`: `./vendor/bin/php-cs-fixer fix --dry-run` +Automatically fix all fixable issues: `./vendor/bin/php-cs-fixer fix` + +## [phpmd/phpmd](https://github.com/phpmd/phpmd) + +TODO: diff --git a/lib/User/AuthClient/VKontakte.php b/lib/User/AuthClient/VKontakte.php index c53e58c..69faa05 100644 --- a/lib/User/AuthClient/VKontakte.php +++ b/lib/User/AuthClient/VKontakte.php @@ -45,6 +45,6 @@ class VKontakte extends BaseVKontakte implements AuthClientInterface */ protected function defaultTitle() { - return Yii::t('user', 'VKontakte'); + return Yii::t('usuario', 'VKontakte'); } } diff --git a/lib/User/AuthClient/Yandex.php b/lib/User/AuthClient/Yandex.php index 4b1a367..c34549f 100644 --- a/lib/User/AuthClient/Yandex.php +++ b/lib/User/AuthClient/Yandex.php @@ -48,6 +48,6 @@ class Yandex extends BaseYandex implements AuthClientInterface */ protected function defaultTitle() { - return Yii::t('user', 'Yandex'); + return Yii::t('usuario', 'Yandex'); } } diff --git a/lib/User/Bootstrap.php b/lib/User/Bootstrap.php index 1037821..a3ef712 100644 --- a/lib/User/Bootstrap.php +++ b/lib/User/Bootstrap.php @@ -162,8 +162,8 @@ class Bootstrap implements BootstrapInterface */ protected function initTranslations(Application $app) { - if (!isset($app->get('i18n')->translations['user*'])) { - $app->get('i18n')->translations['user*'] = [ + if (!isset($app->get('i18n')->translations['usuario*'])) { + $app->get('i18n')->translations['usuario*'] = [ 'class' => PhpMessageSource::class, 'basePath' => __DIR__.'/resources/i18n', 'sourceLanguage' => 'en-US', @@ -221,10 +221,10 @@ class Bootstrap implements BootstrapInterface { $defaults = [ 'fromEmail' => 'no-reply@example.com', - 'welcomeMailSubject' => Yii::t('user', 'Welcome to {0}', $app->name), - 'confirmationMailSubject' => Yii::t('user', 'Confirm account on {0}', $app->name), - 'reconfirmationMailSubject' => Yii::t('user', 'Confirm email change on {0}', $app->name), - 'recoveryMailSubject' => Yii::t('user', 'Complete password reset on {0}', $app->name), + 'welcomeMailSubject' => Yii::t('usuario', 'Welcome to {0}', $app->name), + '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), ]; $module->mailParams = array_merge($defaults, $module->mailParams); diff --git a/lib/User/Command/ConfirmController.php b/lib/User/Command/ConfirmController.php index fc4bfc9..2dc2a8f 100644 --- a/lib/User/Command/ConfirmController.php +++ b/lib/User/Command/ConfirmController.php @@ -36,12 +36,12 @@ class ConfirmController extends Controller { $user = $this->userQuery->whereUsernameOrEmail($usernameOrEmail)->one(); if ($user === null) { - $this->stdout(Yii::t('user', 'User is not found')."\n", Console::FG_RED); + $this->stdout(Yii::t('usuario', 'User is not found')."\n", Console::FG_RED); } else { if ($this->make(UserConfirmationService::class, [$user])->run()) { - $this->stdout(Yii::t('user', 'User has been confirmed')."\n", Console::FG_GREEN); + $this->stdout(Yii::t('usuario', 'User has been confirmed')."\n", Console::FG_GREEN); } else { - $this->stdout(Yii::t('user', 'Error occurred while confirming user')."\n", Console::FG_RED); + $this->stdout(Yii::t('usuario', 'Error occurred while confirming user')."\n", Console::FG_RED); } } } diff --git a/lib/User/Command/CreateController.php b/lib/User/Command/CreateController.php index c5e5866..d9b7d43 100644 --- a/lib/User/Command/CreateController.php +++ b/lib/User/Command/CreateController.php @@ -32,9 +32,9 @@ class CreateController extends Controller $mailService = MailFactory::makeWelcomeMailerService($user); if ($this->make(UserCreateService::class, [$user, $mailService])->run()) { - $this->stdout(Yii::t('user', 'User has been created')."!\n", Console::FG_GREEN); + $this->stdout(Yii::t('usuario', 'User has been created')."!\n", Console::FG_GREEN); } else { - $this->stdout(Yii::t('user', 'Please fix following errors:')."\n", Console::FG_RED); + $this->stdout(Yii::t('usuario', 'Please fix following errors:')."\n", Console::FG_RED); foreach ($user->errors as $errors) { foreach ($errors as $error) { $this->stdout(' - '.$error."\n", Console::FG_RED); diff --git a/lib/User/Command/DeleteController.php b/lib/User/Command/DeleteController.php index e7cda45..b5dbbf5 100644 --- a/lib/User/Command/DeleteController.php +++ b/lib/User/Command/DeleteController.php @@ -29,15 +29,15 @@ class DeleteController extends Controller public function actionIndex($usernameOrEmail) { - if ($this->confirm(Yii::t('user', 'Are you sure? Deleted user can not be restored'))) { + if ($this->confirm(Yii::t('usuario', 'Are you sure? Deleted user can not be restored'))) { $user = $this->userQuery->whereUsernameOrEmail($usernameOrEmail)->one(); if ($user === null) { - $this->stdout(Yii::t('user', 'User is not found')."\n", Console::FG_RED); + $this->stdout(Yii::t('usuario', 'User is not found')."\n", Console::FG_RED); } else { if ($user->delete()) { - $this->stdout(Yii::t('user', 'User has been deleted')."\n", Console::FG_GREEN); + $this->stdout(Yii::t('usuario', 'User has been deleted')."\n", Console::FG_GREEN); } else { - $this->stdout(Yii::t('user', 'Error occurred while deleting user')."\n", Console::FG_RED); + $this->stdout(Yii::t('usuario', 'Error occurred while deleting user')."\n", Console::FG_RED); } } } diff --git a/lib/User/Command/PasswordController.php b/lib/User/Command/PasswordController.php index 31cb443..6530324 100644 --- a/lib/User/Command/PasswordController.php +++ b/lib/User/Command/PasswordController.php @@ -38,12 +38,12 @@ class PasswordController extends Controller $user = $this->userQuery->whereUsernameOrEmail($usernameOrEmail)->one(); if ($user === null) { - $this->stdout(Yii::t('user', 'User is not found')."\n", Console::FG_RED); + $this->stdout(Yii::t('usuario', 'User is not found')."\n", Console::FG_RED); } else { if ($this->make(ResetPasswordService::class, [$password, $user])->run()) { - $this->stdout(Yii::t('user', 'Password has been changed')."\n", Console::FG_GREEN); + $this->stdout(Yii::t('usuario', 'Password has been changed')."\n", Console::FG_GREEN); } else { - $this->stdout(Yii::t('user', 'Error occurred while changing password')."\n", Console::FG_RED); + $this->stdout(Yii::t('usuario', 'Error occurred while changing password')."\n", Console::FG_RED); } } } diff --git a/lib/User/Controller/AbstractAuthItemController.php b/lib/User/Controller/AbstractAuthItemController.php index 03b07af..c22ffee 100644 --- a/lib/User/Controller/AbstractAuthItemController.php +++ b/lib/User/Controller/AbstractAuthItemController.php @@ -89,11 +89,11 @@ abstract class AbstractAuthItemController extends Controller if ($this->make(AuthItemEditionService::class, [$model])->run()) { Yii::$app ->getSession() - ->setFlash('success', Yii::t('user', 'Authorization item successfully created.')); + ->setFlash('success', Yii::t('usuario', 'Authorization item successfully created.')); return $this->redirect(['index']); } else { - Yii::$app->getSession()->setFlash('danger', Yii::t('user', 'Unable to create authorization item.')); + Yii::$app->getSession()->setFlash('danger', Yii::t('usuario', 'Unable to create authorization item.')); } } @@ -119,11 +119,11 @@ abstract class AbstractAuthItemController extends Controller if ($this->make(AuthItemEditionService::class, [$model])->run()) { Yii::$app ->getSession() - ->setFlash('success', Yii::t('user', 'Authorization item successfully updated.')); + ->setFlash('success', Yii::t('usuario', 'Authorization item successfully updated.')); return $this->redirect(['index']); } else { - Yii::$app->getSession()->setFlash('danger', Yii::t('user', 'Unable to update authorization item.')); + Yii::$app->getSession()->setFlash('danger', Yii::t('usuario', 'Unable to update authorization item.')); } } @@ -141,9 +141,9 @@ abstract class AbstractAuthItemController extends Controller $item = $this->getItem($name); if ($this->authHelper->remove($item)) { - Yii::$app->getSession()->setFlash('success', Yii::t('user', 'Authorization item successfully removed.')); + Yii::$app->getSession()->setFlash('success', Yii::t('usuario', 'Authorization item successfully removed.')); } else { - Yii::$app->getSession()->setFlash('success', Yii::t('user', 'Unable to remove authorization item.')); + Yii::$app->getSession()->setFlash('success', Yii::t('usuario', 'Unable to remove authorization item.')); } return $this->redirect(['index']); diff --git a/lib/User/Controller/AdminController.php b/lib/User/Controller/AdminController.php index d945406..f30621e 100644 --- a/lib/User/Controller/AdminController.php +++ b/lib/User/Controller/AdminController.php @@ -127,7 +127,7 @@ class AdminController extends Controller $mailService = MailFactory::makeWelcomeMailerService($user); if ($this->make(UserCreateService::class, [$user, $mailService])->run()) { - Yii::$app->getSession()->setFlash('success', Yii::t('user', 'User has been created')); + Yii::$app->getSession()->setFlash('success', Yii::t('usuario', 'User has been created')); $this->trigger(UserEvent::EVENT_AFTER_CREATE, $event); return $this->redirect(['update', 'id' => $user->id]); @@ -150,7 +150,7 @@ class AdminController extends Controller $this->trigger(ActiveRecord::EVENT_BEFORE_UPDATE, $event); if ($user->save()) { - Yii::$app->getSession()->setFlash('success', Yii::t('user', 'Account details have been updated')); + Yii::$app->getSession()->setFlash('success', Yii::t('usuario', 'Account details have been updated')); $this->trigger(ActiveRecord::EVENT_AFTER_UPDATE, $event); return $this->refresh(); @@ -177,7 +177,7 @@ class AdminController extends Controller if ($profile->load(Yii::$app->request->post())) { if ($profile->save()) { $this->trigger(UserEvent::EVENT_BEFORE_PROFILE_UPDATE, $event); - Yii::$app->getSession()->setFlash('success', Yii::t('user', 'Profile details have been updated')); + Yii::$app->getSession()->setFlash('success', Yii::t('usuario', 'Profile details have been updated')); $this->trigger(UserEvent::EVENT_AFTER_PROFILE_UPDATE, $event); return $this->refresh(); @@ -230,10 +230,10 @@ class AdminController extends Controller $this->trigger(UserEvent::EVENT_BEFORE_CONFIRMATION, $event); if ($this->make(UserConfirmationService::class, [$user])->run()) { - Yii::$app->getSession()->setFlash('success', Yii::t('user', 'User has been confirmed')); + Yii::$app->getSession()->setFlash('success', Yii::t('usuario', 'User has been confirmed')); $this->trigger(UserEvent::EVENT_AFTER_CONFIRMATION, $event); } else { - Yii::$app->getSession()->setFlash('warning', Yii::t('user', 'Unable to confirm user. Please, try again.')); + Yii::$app->getSession()->setFlash('warning', Yii::t('usuario', 'Unable to confirm user. Please, try again.')); } return $this->redirect(Url::previous('actions-redirect')); @@ -242,7 +242,7 @@ class AdminController extends Controller public function actionDelete($id) { if ($id === Yii::$app->user->getId()) { - Yii::$app->getSession()->setFlash('danger', Yii::t('user', 'You cannot remove your own account')); + Yii::$app->getSession()->setFlash('danger', Yii::t('usuario', 'You cannot remove your own account')); } else { /** @var User $user */ $user = $this->userQuery->where(['id' => $id])->one(); @@ -251,12 +251,12 @@ class AdminController extends Controller $this->trigger(ActiveRecord::EVENT_BEFORE_DELETE, $event); if ($user->delete()) { - Yii::$app->getSession()->setFlash('success', \Yii::t('user', 'User has been deleted')); + Yii::$app->getSession()->setFlash('success', \Yii::t('usuario', 'User has been deleted')); $this->trigger(ActiveRecord::EVENT_AFTER_DELETE, $event); } else { Yii::$app->getSession()->setFlash( 'warning', - Yii::t('user', 'Unable to delete user. Please, try again later.') + Yii::t('usuario', 'Unable to delete user. Please, try again later.') ); } } @@ -267,7 +267,7 @@ class AdminController extends Controller public function actionBlock($id) { if ($id === Yii::$app->user->getId()) { - Yii::$app->getSession()->setFlash('danger', Yii::t('user', 'You cannot remove your own account')); + Yii::$app->getSession()->setFlash('danger', Yii::t('usuario', 'You cannot remove your own account')); } else { /** @var User $user */ $user = $this->userQuery->where(['id' => $id])->one(); @@ -275,9 +275,9 @@ class AdminController extends Controller $event = $this->make(UserEvent::class, [$user]); if ($this->make(UserBlockService::class, [$user, $event, $this])->run()) { - Yii::$app->getSession()->setFlash('success', Yii::t('user', 'User block status has been updated.')); + Yii::$app->getSession()->setFlash('success', Yii::t('usuario', 'User block status has been updated.')); } else { - Yii::$app->getSession()->setFlash('danger', Yii::t('user', 'Unable to update block status.')); + Yii::$app->getSession()->setFlash('danger', Yii::t('usuario', 'Unable to update block status.')); } } diff --git a/lib/User/Controller/RecoveryController.php b/lib/User/Controller/RecoveryController.php index 9af34e3..867dcf6 100644 --- a/lib/User/Controller/RecoveryController.php +++ b/lib/User/Controller/RecoveryController.php @@ -101,7 +101,7 @@ class RecoveryController extends Controller return $this->render( '/shared/message', [ - 'title' => Yii::t('user', 'Recovery message sent'), + 'title' => Yii::t('usuario', 'Recovery message sent'), 'module' => $this->module, ] ); @@ -136,13 +136,13 @@ class RecoveryController extends Controller if ($token === null || $token->getIsExpired() || $token->user === null) { Yii::$app->session->setFlash( 'danger', - Yii::t('user', 'Recovery link is invalid or expired. Please try requesting a new one.') + Yii::t('usuario', 'Recovery link is invalid or expired. Please try requesting a new one.') ); return $this->render( '/shared/message', [ - 'title' => Yii::t('user', 'Invalid or expired link'), + 'title' => Yii::t('usuario', 'Invalid or expired link'), 'module' => $this->module, ] ); @@ -161,7 +161,7 @@ class RecoveryController extends Controller return $this->render( '/shared/message', [ - 'title' => Yii::t('user', 'Password has been changed'), + 'title' => Yii::t('usuario', 'Password has been changed'), 'module' => $this->module, ] ); diff --git a/lib/User/Controller/RegistrationController.php b/lib/User/Controller/RegistrationController.php index 277d4f8..546ae0d 100644 --- a/lib/User/Controller/RegistrationController.php +++ b/lib/User/Controller/RegistrationController.php @@ -109,7 +109,7 @@ class RegistrationController extends Controller Yii::$app->session->setFlash( 'info', Yii::t( - 'user', + 'usuario', 'Your account has been created and a message with further instructions has been sent to your email' ) ); @@ -117,7 +117,7 @@ class RegistrationController extends Controller return $this->render( '/shared/message', [ - 'title' => Yii::t('user', 'Your account has been created'), + 'title' => Yii::t('usuario', 'Your account has been created'), 'module' => $this->module, ] ); @@ -189,20 +189,20 @@ class RegistrationController extends Controller if ($this->make(AccountConfirmationService::class, [$code, $user, $userConfirmationService])->run()) { Yii::$app->user->login($user, $this->module->rememberLoginLifespan); - Yii::$app->session->setFlash('success', Yii::t('user', 'Thank you, registration is now complete.')); + Yii::$app->session->setFlash('success', Yii::t('usuario', 'Thank you, registration is now complete.')); $this->trigger(UserEvent::EVENT_AFTER_CONFIRMATION, $event); } else { Yii::$app->session->setFlash( 'danger', - Yii::t('user', 'The confirmation link is invalid or expired. Please try requesting a new one.') + Yii::t('usuario', 'The confirmation link is invalid or expired. Please try requesting a new one.') ); } return $this->render( '/shared/message', [ - 'title' => Yii::t('user', 'Account confirmation'), + 'title' => Yii::t('usuario', 'Account confirmation'), 'module' => $this->module, ] ); @@ -231,7 +231,7 @@ class RegistrationController extends Controller Yii::$app->session->setFlash( 'info', Yii::t( - 'user', + 'usuario', 'A message has been sent to your email address. '. 'It contains a confirmation link that you must click to complete registration.' ) @@ -242,7 +242,7 @@ class RegistrationController extends Controller Yii::$app->session->setFlash( 'danger', Yii::t( - 'user', + 'usuario', 'We couldn\'t re-send the mail to confirm your address. '. 'Please, verify is the correct email or if it has been confirmed already.' ) @@ -251,8 +251,8 @@ class RegistrationController extends Controller return $this->render('/shared/message', [ 'title' => $success - ? Yii::t('user', 'A new confirmation link has been sent') - : Yii::t('user', 'Unable to send confirmation link'), + ? Yii::t('usuario', 'A new confirmation link has been sent') + : Yii::t('usuario', 'Unable to send confirmation link'), 'module' => $this->module, ]); } diff --git a/lib/User/Controller/SecurityController.php b/lib/User/Controller/SecurityController.php index d9ff254..8695c60 100644 --- a/lib/User/Controller/SecurityController.php +++ b/lib/User/Controller/SecurityController.php @@ -158,7 +158,7 @@ class SecurityController extends Controller public function connect(AuthClientInterface $client) { if (Yii::$app->user->isGuest) { - Yii::$app->session->setFlash('danger', Yii::t('user', 'Something went wrong')); + Yii::$app->session->setFlash('danger', Yii::t('usuario', 'Something went wrong')); return; } diff --git a/lib/User/Controller/SettingsController.php b/lib/User/Controller/SettingsController.php index 0f907e3..832bf37 100644 --- a/lib/User/Controller/SettingsController.php +++ b/lib/User/Controller/SettingsController.php @@ -118,7 +118,7 @@ class SettingsController extends Controller if ($profile->load(Yii::$app->request->post())) { $this->trigger(UserEvent::EVENT_BEFORE_PROFILE_UPDATE, $event); if ($profile->save()) { - Yii::$app->getSession()->setFlash('success', Yii::t('user', 'Your profile has been updated')); + Yii::$app->getSession()->setFlash('success', Yii::t('usuario', 'Your profile has been updated')); $this->trigger(UserEvent::EVENT_AFTER_PROFILE_UPDATE, $event); return $this->refresh(); @@ -145,7 +145,7 @@ class SettingsController extends Controller $this->trigger(UserEvent::EVENT_BEFORE_ACCOUNT_UPDATE, $event); if ($form->save()) { - Yii::$app->getSession()->setFlash('success', Yii::t('user', 'Your account details have been updated')); + Yii::$app->getSession()->setFlash('success', Yii::t('usuario', 'Your account details have been updated')); $this->trigger(UserEvent::EVENT_AFTER_ACCOUNT_UPDATE, $event); return $this->refresh(); @@ -210,7 +210,7 @@ class SettingsController extends Controller public function actionDelete() { if (!$this->module->allowAccountDelete) { - throw new NotFoundHttpException(\Yii::t('user', 'Not found')); + throw new NotFoundHttpException(\Yii::t('usuario', 'Not found')); } /** @var User $user */ @@ -222,7 +222,7 @@ class SettingsController extends Controller $user->delete(); $this->trigger(UserEvent::EVENT_AFTER_DELETE, $event); - Yii::$app->session->setFlash('info', Yii::t('user', 'Your account has been completely deleted')); + Yii::$app->session->setFlash('info', Yii::t('usuario', 'Your account has been completely deleted')); return $this->goHome(); } diff --git a/lib/User/Form/LoginForm.php b/lib/User/Form/LoginForm.php index a10bac9..aa700c2 100644 --- a/lib/User/Form/LoginForm.php +++ b/lib/User/Form/LoginForm.php @@ -65,9 +65,9 @@ class LoginForm extends Model public function attributeLabels() { return [ - 'login' => Yii::t('user', 'Login'), - 'password' => Yii::t('user', 'Password'), - 'rememberMe' => Yii::t('user', 'Remember me next time'), + 'login' => Yii::t('usuario', 'Login'), + 'password' => Yii::t('usuario', 'Password'), + 'rememberMe' => Yii::t('usuario', 'Remember me next time'), ]; } @@ -85,7 +85,7 @@ class LoginForm extends Model if ($this->user === null || !$this->securityHelper->validatePassword($this->password, $this->user->password_hash) ) { - $this->addError($attribute, Yii::t('user', 'Invalid login or password')); + $this->addError($attribute, Yii::t('usuario', 'Invalid login or password')); } }, ], @@ -96,10 +96,10 @@ class LoginForm extends Model $module = $this->getModule(); $confirmationRequired = $module->enableEmailConfirmation && !$module->allowUnconfirmedEmailLogin; if ($confirmationRequired && !$this->user->getIsConfirmed()) { - $this->addError($attribute, Yii::t('user', 'You need to confirm your email address')); + $this->addError($attribute, Yii::t('usuario', 'You need to confirm your email address')); } if ($this->user->getIsBlocked()) { - $this->addError($attribute, Yii::t('user', 'Your account has been blocked')); + $this->addError($attribute, Yii::t('usuario', 'Your account has been blocked')); } } }, diff --git a/lib/User/Form/RecoveryForm.php b/lib/User/Form/RecoveryForm.php index b6626b9..6264d38 100644 --- a/lib/User/Form/RecoveryForm.php +++ b/lib/User/Form/RecoveryForm.php @@ -52,8 +52,8 @@ class RecoveryForm extends Model public function attributeLabels() { return [ - 'email' => Yii::t('user', 'Email'), - 'password' => Yii::t('user', 'Password'), + 'email' => Yii::t('usuario', 'Email'), + 'password' => Yii::t('usuario', 'Password'), ]; } diff --git a/lib/User/Form/RegistrationForm.php b/lib/User/Form/RegistrationForm.php index e67a0e2..e45bbeb 100644 --- a/lib/User/Form/RegistrationForm.php +++ b/lib/User/Form/RegistrationForm.php @@ -53,7 +53,7 @@ class RegistrationForm extends Model 'username', 'unique', 'targetClass' => $user, - 'message' => Yii::t('user', 'This username has already been taken'), + 'message' => Yii::t('usuario', 'This username has already been taken'), ], // email rules 'emailTrim' => ['email', 'filter', 'filter' => 'trim'], @@ -63,7 +63,7 @@ class RegistrationForm extends Model 'email', 'unique', 'targetClass' => $user, - 'message' => Yii::t('user', 'This email address has already been taken'), + 'message' => Yii::t('usuario', 'This email address has already been taken'), ], // password rules 'passwordRequired' => ['password', 'required', 'skipOnEmpty' => $this->module->generatePasswords], @@ -77,9 +77,9 @@ class RegistrationForm extends Model public function attributeLabels() { return [ - 'email' => Yii::t('user', 'Email'), - 'username' => Yii::t('user', 'Username'), - 'password' => Yii::t('user', 'Password'), + 'email' => Yii::t('usuario', 'Email'), + 'username' => Yii::t('usuario', 'Username'), + 'password' => Yii::t('usuario', 'Password'), ]; } } diff --git a/lib/User/Form/ResendForm.php b/lib/User/Form/ResendForm.php index e0a61c4..601b080 100644 --- a/lib/User/Form/ResendForm.php +++ b/lib/User/Form/ResendForm.php @@ -53,7 +53,7 @@ class ResendForm extends Model public function attributeLabels() { return [ - 'email' => Yii::t('user', 'Email'), + 'email' => Yii::t('usuario', 'Email'), ]; } } diff --git a/lib/User/Form/SettingsForm.php b/lib/User/Form/SettingsForm.php index 5f99d50..8877874 100644 --- a/lib/User/Form/SettingsForm.php +++ b/lib/User/Form/SettingsForm.php @@ -81,7 +81,7 @@ class SettingsForm extends Model 'current_password', function ($attribute) { if (!$this->securityHelper->validatePassword($this->$attribute, $this->getUser()->password_hash)) { - $this->addError($attribute, Yii::t('user', 'Current password is not valid')); + $this->addError($attribute, Yii::t('usuario', 'Current password is not valid')); } }, ], @@ -94,10 +94,10 @@ class SettingsForm extends Model public function attributeLabels() { return [ - 'email' => Yii::t('user', 'Email'), - 'username' => Yii::t('user', 'Username'), - 'new_password' => Yii::t('user', 'New password'), - 'current_password' => Yii::t('user', 'Current password'), + 'email' => Yii::t('usuario', 'Email'), + 'username' => Yii::t('usuario', 'Username'), + 'new_password' => Yii::t('usuario', 'New password'), + 'current_password' => Yii::t('usuario', 'Current password'), ]; } diff --git a/lib/User/Model/AbstractAuthItem.php b/lib/User/Model/AbstractAuthItem.php index 1628572..d3c56a6 100644 --- a/lib/User/Model/AbstractAuthItem.php +++ b/lib/User/Model/AbstractAuthItem.php @@ -71,10 +71,10 @@ abstract class AbstractAuthItem extends Model public function attributeLabels() { return [ - 'name' => Yii::t('user', 'Name'), - 'description' => Yii::t('user', 'Description'), - 'children' => Yii::t('user', 'Children'), - 'rule' => Yii::t('user', 'Rule'), + 'name' => Yii::t('usuario', 'Name'), + 'description' => Yii::t('usuario', 'Description'), + 'children' => Yii::t('usuario', 'Children'), + 'rule' => Yii::t('usuario', 'Rule'), ]; } @@ -103,7 +103,7 @@ abstract class AbstractAuthItem extends Model 'name', function () { if ($this->getAuthManager()->getItem($this->name) !== null) { - $this->addError('name', Yii::t('user', 'Auth item with such name already exists')); + $this->addError('name', Yii::t('usuario', 'Auth item with such name already exists')); } }, 'when' => function () { diff --git a/lib/User/Model/Assignment.php b/lib/User/Model/Assignment.php index 3ae9cde..43dd984 100644 --- a/lib/User/Model/Assignment.php +++ b/lib/User/Model/Assignment.php @@ -47,7 +47,7 @@ class Assignment extends Model public function attributeLabels() { return [ - 'items' => Yii::t('user', 'Items'), + 'items' => Yii::t('usuario', 'Items'), ]; } diff --git a/lib/User/Model/Profile.php b/lib/User/Model/Profile.php index bdb5dba..14ea347 100644 --- a/lib/User/Model/Profile.php +++ b/lib/User/Model/Profile.php @@ -73,7 +73,7 @@ class Profile extends ActiveRecord 'timezone', function ($attribute) { if ($this->make(TimeZoneValidator::class, [$attribute])->validate()) { - $this->addError($attribute, Yii::t('user', 'Time zone is not valid')); + $this->addError($attribute, Yii::t('usuario', 'Time zone is not valid')); } }, ], @@ -94,13 +94,13 @@ class Profile extends ActiveRecord public function attributeLabels() { return [ - 'name' => Yii::t('user', 'Name'), - 'public_email' => Yii::t('user', 'Email (public)'), - 'gravatar_email' => Yii::t('user', 'Gravatar email'), - 'location' => Yii::t('user', 'Location'), - 'website' => Yii::t('user', 'Website'), - 'bio' => Yii::t('user', 'Bio'), - 'timezone' => Yii::t('user', 'Time zone'), + 'name' => Yii::t('usuario', 'Name'), + 'public_email' => Yii::t('usuario', 'Email (public)'), + 'gravatar_email' => Yii::t('usuario', 'Gravatar email'), + 'location' => Yii::t('usuario', 'Location'), + 'website' => Yii::t('usuario', 'Website'), + 'bio' => Yii::t('usuario', 'Bio'), + 'timezone' => Yii::t('usuario', 'Time zone'), ]; } diff --git a/lib/User/Model/User.php b/lib/User/Model/User.php index 21bbe5b..f51dc4c 100644 --- a/lib/User/Model/User.php +++ b/lib/User/Model/User.php @@ -114,13 +114,13 @@ class User extends ActiveRecord implements IdentityInterface public function attributeLabels() { return [ - 'username' => Yii::t('user', 'Username'), - 'email' => Yii::t('user', 'Email'), - 'registration_ip' => Yii::t('user', 'Registration ip'), - 'unconfirmed_email' => Yii::t('user', 'New email'), - 'password' => Yii::t('user', 'Password'), - 'created_at' => Yii::t('user', 'Registration time'), - 'confirmed_at' => Yii::t('user', 'Confirmation time'), + 'username' => Yii::t('usuario', 'Username'), + 'email' => Yii::t('usuario', 'Email'), + 'registration_ip' => Yii::t('usuario', 'Registration ip'), + 'unconfirmed_email' => Yii::t('usuario', 'New email'), + 'password' => Yii::t('usuario', 'Password'), + 'created_at' => Yii::t('usuario', 'Registration time'), + 'confirmed_at' => Yii::t('usuario', 'Confirmation time'), ]; } @@ -155,7 +155,7 @@ class User extends ActiveRecord implements IdentityInterface 'usernameUnique' => [ 'username', 'unique', - 'message' => Yii::t('user', 'This username has already been taken'), + 'message' => Yii::t('usuario', 'This username has already been taken'), ], // email rules @@ -165,7 +165,7 @@ class User extends ActiveRecord implements IdentityInterface 'emailUnique' => [ 'email', 'unique', - 'message' => Yii::t('user', 'This email address has already been taken'), + 'message' => Yii::t('usuario', 'This email address has already been taken'), ], 'emailTrim' => ['email', 'trim'], diff --git a/lib/User/Search/UserSearch.php b/lib/User/Search/UserSearch.php index 9d2b779..0754a8a 100644 --- a/lib/User/Search/UserSearch.php +++ b/lib/User/Search/UserSearch.php @@ -68,10 +68,10 @@ class UserSearch extends Model public function attributeLabels() { return [ - 'username' => Yii::t('user', 'Username'), - 'email' => Yii::t('user', 'Email'), - 'created_at' => Yii::t('user', 'Registration time'), - 'registration_ip' => Yii::t('user', 'Registration ip'), + 'username' => Yii::t('usuario', 'Username'), + 'email' => Yii::t('usuario', 'Email'), + 'created_at' => Yii::t('usuario', 'Registration time'), + 'registration_ip' => Yii::t('usuario', 'Registration ip'), ]; } diff --git a/lib/User/Service/EmailChangeService.php b/lib/User/Service/EmailChangeService.php index dde6f55..b5c9c0c 100644 --- a/lib/User/Service/EmailChangeService.php +++ b/lib/User/Service/EmailChangeService.php @@ -38,13 +38,13 @@ class EmailChangeService implements ServiceInterface ->one(); if ($token === null || $token->getIsExpired()) { - Yii::$app->session->setFlash('danger', Yii::t('user', 'Your confirmation token is invalid or expired')); + Yii::$app->session->setFlash('danger', Yii::t('usuario', 'Your confirmation token is invalid or expired')); return false; } else { $token->delete(); if (empty($this->model->unconfirmed_email)) { - Yii::$app->session->setFlash('danger', Yii::t('user', 'An error occurred processing your request')); + Yii::$app->session->setFlash('danger', Yii::t('usuario', 'An error occurred processing your request')); } elseif ($this->userQuery->whereEmail($this->model->unconfirmed_email)->exists() === false) { if ($this->getModule()->emailChangeStrategy === MailChangeStrategyInterface::TYPE_SECURE) { if ($token->type === Token::TYPE_CONFIRM_NEW_EMAIL) { @@ -52,7 +52,7 @@ class EmailChangeService implements ServiceInterface Yii::$app->session->setFlash( 'success', Yii::t( - 'user', + 'usuario', 'Awesome, almost there. '. 'Now you need to click the confirmation link sent to your old email address.' ) @@ -62,7 +62,7 @@ class EmailChangeService implements ServiceInterface Yii::$app->session->setFlash( 'success', Yii::t( - 'user', + 'usuario', 'Awesome, almost there. '. 'Now you need to click the confirmation link sent to your new email address.' ) @@ -74,7 +74,7 @@ class EmailChangeService implements ServiceInterface ) { $this->model->email = $this->model->unconfirmed_email; $this->model->unconfirmed_email = null; - Yii::$app->session->setFlash('success', Yii::t('user', 'Your email address has been changed')); + Yii::$app->session->setFlash('success', Yii::t('usuario', 'Your email address has been changed')); } return $this->model->save(false); diff --git a/lib/User/Service/PasswordRecoveryService.php b/lib/User/Service/PasswordRecoveryService.php index 171e5af..fc74a05 100644 --- a/lib/User/Service/PasswordRecoveryService.php +++ b/lib/User/Service/PasswordRecoveryService.php @@ -48,7 +48,7 @@ class PasswordRecoveryService implements ServiceInterface Yii::$app->session->setFlash( 'info', - Yii::t('user', 'An email has been sent with instructions for resetting your password') + Yii::t('usuario', 'An email has been sent with instructions for resetting your password') ); return true; diff --git a/lib/User/Service/SocialNetworkAccountConnectService.php b/lib/User/Service/SocialNetworkAccountConnectService.php index 20cdfd7..aa4c2fa 100644 --- a/lib/User/Service/SocialNetworkAccountConnectService.php +++ b/lib/User/Service/SocialNetworkAccountConnectService.php @@ -58,14 +58,14 @@ class SocialNetworkAccountConnectService implements ServiceInterface /** @var User $user */ $user = Yii::$app->user->identity; $account->link('user', $user); - Yii::$app->session->setFlash('success', Yii::t('user', 'Your account has been connected')); + Yii::$app->session->setFlash('success', Yii::t('usuario', 'Your account has been connected')); $this->controller->trigger(SocialNetworkAuthEvent::EVENT_AFTER_CONNECT, $event); return true; } else { Yii::$app->session->setFlash( 'danger', - Yii::t('user', 'This account has already been connected to another user') + Yii::t('usuario', 'This account has already been connected to another user') ); } diff --git a/lib/User/Service/SocialNetworkAuthenticateService.php b/lib/User/Service/SocialNetworkAuthenticateService.php index 1597b56..ec0644f 100644 --- a/lib/User/Service/SocialNetworkAuthenticateService.php +++ b/lib/User/Service/SocialNetworkAuthenticateService.php @@ -50,7 +50,7 @@ class SocialNetworkAuthenticateService implements ServiceInterface { $account = $this->socialNetworkAccountQuery->whereClient($this->client)->one(); if (!$this->controller->module->enableRegistration && ($account === null || $account->user === null)) { - Yii::$app->session->setFlash('danger', Yii::t('user', 'Registration on this website is disabled')); + Yii::$app->session->setFlash('danger', Yii::t('usuario', 'Registration on this website is disabled')); $this->authAction->setSuccessUrl(Url::to(['/usr/security/login'])); return false; @@ -58,7 +58,7 @@ class SocialNetworkAuthenticateService implements ServiceInterface if ($account === null) { $account = $this->createAccount(); if (!$account) { - Yii::$app->session->setFlash('danger', Yii::t('user', 'Unable to create an account.')); + Yii::$app->session->setFlash('danger', Yii::t('usuario', 'Unable to create an account.')); $this->authAction->setSuccessUrl(Url::to(['/usr/security/login'])); return false; @@ -69,7 +69,7 @@ class SocialNetworkAuthenticateService implements ServiceInterface $this->controller->trigger(SocialNetworkAuthEvent::EVENT_BEFORE_AUTHENTICATE, $event); if ($account->user instanceof User) { if ($account->user->getIsBlocked()) { - Yii::$app->session->setFlash('danger', Yii::t('user', 'Your account has been blocked.')); + Yii::$app->session->setFlash('danger', Yii::t('usuario', 'Your account has been blocked.')); $this->authAction->setSuccessUrl(Url::to(['/user/security/login'])); } else { Yii::$app->user->login($account->user, $this->controller->module->rememberLoginLifeSpan); diff --git a/lib/User/Strategy/DefaultEmailChangeStrategy.php b/lib/User/Strategy/DefaultEmailChangeStrategy.php index ef1a4d0..721e440 100644 --- a/lib/User/Strategy/DefaultEmailChangeStrategy.php +++ b/lib/User/Strategy/DefaultEmailChangeStrategy.php @@ -40,7 +40,7 @@ class DefaultEmailChangeStrategy implements MailChangeStrategyInterface if ($mailService->run()) { Yii::$app ->session - ->setFlash('info', Yii::t('user', 'A confirmation message has been sent to your new email address')); + ->setFlash('info', Yii::t('usuario', 'A confirmation message has been sent to your new email address')); return $this->form->getUser()->save(); } diff --git a/lib/User/Strategy/SecureEmailChangeStrategy.php b/lib/User/Strategy/SecureEmailChangeStrategy.php index 0c43fa6..b9abf54 100644 --- a/lib/User/Strategy/SecureEmailChangeStrategy.php +++ b/lib/User/Strategy/SecureEmailChangeStrategy.php @@ -46,7 +46,7 @@ class SecureEmailChangeStrategy implements MailChangeStrategyInterface ->setFlash( 'info', Yii::t( - 'user', + 'usuario', 'We have sent confirmation links to both old and new email addresses. '. 'You must click both links to complete your request.' ) diff --git a/lib/User/Validator/RbacItemsValidator.php b/lib/User/Validator/RbacItemsValidator.php index 766dabe..60261ca 100644 --- a/lib/User/Validator/RbacItemsValidator.php +++ b/lib/User/Validator/RbacItemsValidator.php @@ -22,12 +22,12 @@ class RbacItemsValidator extends Validator protected function validateValue($value) { if (!is_array($value)) { - return [Yii::t('item', 'Invalid value'), []]; + return [Yii::t('usuario', 'Invalid value'), []]; } foreach ($value as $item) { if ($this->getAuthManager()->getItem($item) == null) { - return [Yii::t('user', 'There is neither role nor permission with name "{0}"', [$item]), []]; + return [Yii::t('usuario', 'There is neither role nor permission with name "{0}"', [$item]), []]; } } } diff --git a/lib/User/Validator/RbacRuleValidator.php b/lib/User/Validator/RbacRuleValidator.php index dbe1434..e1da452 100644 --- a/lib/User/Validator/RbacRuleValidator.php +++ b/lib/User/Validator/RbacRuleValidator.php @@ -23,14 +23,14 @@ class RbacRuleValidator extends Validator try { $class = new ReflectionClass($value); } catch (Exception $e) { - return [Yii::t('user', 'Class "{0}" does not exist', $value), []]; + return [Yii::t('usuario', 'Class "{0}" does not exist', $value), []]; } if ($class->isInstantiable() == false) { - return [Yii::t('user', 'Rule class can not be instantiated'), []]; + return [Yii::t('usuario', 'Rule class can not be instantiated'), []]; } if ($class->isSubclassOf('\yii\rbac\Rule') == false) { - return [Yii::t('user', 'Rule class must extend "yii\rbac\Rule"'), []]; + return [Yii::t('usuario', 'Rule class must extend "yii\rbac\Rule"'), []]; } } } diff --git a/lib/User/resources/i18n/message.php b/lib/User/resources/i18n/message.php index adecd66..57bd346 100644 --- a/lib/User/resources/i18n/message.php +++ b/lib/User/resources/i18n/message.php @@ -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', diff --git a/lib/User/resources/views/admin/_account.php b/lib/User/resources/views/admin/_account.php index 43aed75..d82c1bc 100644 --- a/lib/User/resources/views/admin/_account.php +++ b/lib/User/resources/views/admin/_account.php @@ -37,7 +37,7 @@ use yii\helpers\Html;
- 'btn btn-block btn-success']) ?> + 'btn btn-block btn-success']) ?>
diff --git a/lib/User/resources/views/admin/_assignments.php b/lib/User/resources/views/admin/_assignments.php index 8a865ab..b1b0231 100644 --- a/lib/User/resources/views/admin/_assignments.php +++ b/lib/User/resources/views/admin/_assignments.php @@ -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'), ] ) ?> diff --git a/lib/User/resources/views/admin/_info.php b/lib/User/resources/views/admin/_info.php index 72e16cc..cf64366 100644 --- a/lib/User/resources/views/admin/_info.php +++ b/lib/User/resources/views/admin/_info.php @@ -19,38 +19,38 @@ - - + + registration_ip !== null): ?> - + - + isConfirmed): ?> - + - + isBlocked): ?> - +
:created_at]) ?>:created_at]) ?>
:: registration_ip ?>
:: confirmed_at] ) ?>
:: blocked_at] ) ?>
diff --git a/lib/User/resources/views/admin/_profile.php b/lib/User/resources/views/admin/_profile.php index 8cf9cd3..be1c5d5 100644 --- a/lib/User/resources/views/admin/_profile.php +++ b/lib/User/resources/views/admin/_profile.php @@ -45,7 +45,7 @@ use yii\helpers\Html;
- 'btn btn-block btn-success']) ?> + 'btn btn-block btn-success']) ?>
diff --git a/lib/User/resources/views/admin/create.php b/lib/User/resources/views/admin/create.php index eb1e46e..60505b0 100644 --- a/lib/User/resources/views/admin/create.php +++ b/lib/User/resources/views/admin/create.php @@ -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;
- . - . + . + .
params['breadcrumbs'][] = $this->title;
'btn btn-block btn-success'] ) ?>
diff --git a/lib/User/resources/views/admin/index.php b/lib/User/resources/views/admin/index.php index b5179d3..b7bbe56 100644 --- a/lib/User/resources/views/admin/index.php +++ b/lib/User/resources/views/admin/index.php @@ -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 - ? ''.Yii::t('user', '(not set)').'' + ? ''.Yii::t('usuario', '(not set)').'' : $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 '
- ' .Yii::t('user', 'Confirmed').' + ' .Yii::t('usuario', 'Confirmed').'
'; } 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?'), ] ); } diff --git a/lib/User/resources/views/admin/update.php b/lib/User/resources/views/admin/update.php index 3e14d55..72cef44 100644 --- a/lib/User/resources/views/admin/update.php +++ b/lib/User/resources/views/admin/update.php @@ -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], ], '
', [ - '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?' ), ], diff --git a/lib/User/resources/views/mail/confirmation.php b/lib/User/resources/views/mail/confirmation.php index 751d583..14425e4 100644 --- a/lib/User/resources/views/mail/confirmation.php +++ b/lib/User/resources/views/mail/confirmation.php @@ -17,18 +17,18 @@ use yii\helpers\Html; */ ?>

- , + ,

- name) ?>. - . + name) ?>. + .

url), $token->url) ?>

- . + .

- . + .

diff --git a/lib/User/resources/views/mail/reconfirmation.php b/lib/User/resources/views/mail/reconfirmation.php index ed59c02..465213d 100644 --- a/lib/User/resources/views/mail/reconfirmation.php +++ b/lib/User/resources/views/mail/reconfirmation.php @@ -16,22 +16,22 @@ use yii\helpers\Html; */ ?>

- , + ,

name ) ?>. - . + .

getUrl()), $token->getUrl()); ?>

- . + .

- . + .

diff --git a/lib/User/resources/views/mail/recovery.php b/lib/User/resources/views/mail/recovery.php index 7a91379..1c131c6 100644 --- a/lib/User/resources/views/mail/recovery.php +++ b/lib/User/resources/views/mail/recovery.php @@ -17,18 +17,18 @@ use yii\helpers\Html; */ ?>

- , + ,

- name) ?>. - . + name) ?>. + .

url), $token->url); ?>

- . + .

- . + .

diff --git a/lib/User/resources/views/mail/text/confirmation.php b/lib/User/resources/views/mail/text/confirmation.php index abb9f64..4297ba3 100644 --- a/lib/User/resources/views/mail/text/confirmation.php +++ b/lib/User/resources/views/mail/text/confirmation.php @@ -14,13 +14,13 @@ * @var \Da\User\Model\Token $token */ ?> -, +, -name) ?>. -. +name) ?>. +. url ?> -. +. -. +. diff --git a/lib/User/resources/views/mail/text/reconfirmation.php b/lib/User/resources/views/mail/text/reconfirmation.php index 2eb1ee3..0280140 100644 --- a/lib/User/resources/views/mail/text/reconfirmation.php +++ b/lib/User/resources/views/mail/text/reconfirmation.php @@ -13,17 +13,17 @@ * @var \Da\User\Model\Token */ ?> -, +, name ) ?>. -. +. url ?> -. +. -. +. diff --git a/lib/User/resources/views/mail/text/recovery.php b/lib/User/resources/views/mail/text/recovery.php index c2100be..5f3a3a7 100644 --- a/lib/User/resources/views/mail/text/recovery.php +++ b/lib/User/resources/views/mail/text/recovery.php @@ -14,13 +14,13 @@ * @var \Da\User\Model\Token $token */ ?> -, +, -name) ?>. -. +name) ?>. +. url ?> -. +. -. +. diff --git a/lib/User/resources/views/mail/text/welcome.php b/lib/User/resources/views/mail/text/welcome.php index cef15c0..535562e 100644 --- a/lib/User/resources/views/mail/text/welcome.php +++ b/lib/User/resources/views/mail/text/welcome.php @@ -15,18 +15,18 @@ * @var \Da\User\Module $module */ ?> -, +, -name) ?>. +name) ?>. generatePasswords): ?> - : + : password ?> - . + . url ?> - . + . -. +. diff --git a/lib/User/resources/views/mail/welcome.php b/lib/User/resources/views/mail/welcome.php index 8eec491..e089c67 100644 --- a/lib/User/resources/views/mail/welcome.php +++ b/lib/User/resources/views/mail/welcome.php @@ -20,29 +20,29 @@ use yii\helpers\Html; ?>

- , + ,

- name) ?>. + name) ?>. generatePasswords): ?> - : password ?> + : password ?>

- . + .

url), $token->url); ?>

- . + .

- . + .

diff --git a/lib/User/resources/views/permission/_form.php b/lib/User/resources/views/permission/_form.php index ee75701..ee9642f 100644 --- a/lib/User/resources/views/permission/_form.php +++ b/lib/User/resources/views/permission/_form.php @@ -40,6 +40,6 @@ use yii\widgets\ActiveForm; ], ]) ?> - 'btn btn-success btn-block']) ?> + 'btn btn-success btn-block']) ?> diff --git a/lib/User/resources/views/permission/create.php b/lib/User/resources/views/permission/create.php index 026614a..1e77b26 100644 --- a/lib/User/resources/views/permission/create.php +++ b/lib/User/resources/views/permission/create.php @@ -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; ?> diff --git a/lib/User/resources/views/permission/index.php b/lib/User/resources/views/permission/index.php index 63734e3..51e903d 100644 --- a/lib/User/resources/views/permission/index.php +++ b/lib/User/resources/views/permission/index.php @@ -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%', ], diff --git a/lib/User/resources/views/permission/update.php b/lib/User/resources/views/permission/update.php index 6ad723d..70097df 100644 --- a/lib/User/resources/views/permission/update.php +++ b/lib/User/resources/views/permission/update.php @@ -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; ?> diff --git a/lib/User/resources/views/profile/show.php b/lib/User/resources/views/profile/show.php index 59df7f9..3a5507d 100644 --- a/lib/User/resources/views/profile/show.php +++ b/lib/User/resources/views/profile/show.php @@ -53,7 +53,7 @@ $this->params['breadcrumbs'][] = $this->title;
  • - user->created_at) ?> + user->created_at) ?>
    • bio)): ?> diff --git a/lib/User/resources/views/recovery/request.php b/lib/User/resources/views/recovery/request.php index 00ad29c..efb8346 100644 --- a/lib/User/resources/views/recovery/request.php +++ b/lib/User/resources/views/recovery/request.php @@ -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; ?>
    @@ -38,7 +38,7 @@ $this->params['breadcrumbs'][] = $this->title; field($model, 'email')->textInput(['autofocus' => true]) ?> - 'btn btn-primary btn-block']) ?>
    + 'btn btn-primary btn-block']) ?>
    diff --git a/lib/User/resources/views/recovery/reset.php b/lib/User/resources/views/recovery/reset.php index 8084b41..8b7f989 100644 --- a/lib/User/resources/views/recovery/reset.php +++ b/lib/User/resources/views/recovery/reset.php @@ -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; ?>
    @@ -38,7 +38,7 @@ $this->params['breadcrumbs'][] = $this->title; field($model, 'password')->passwordInput() ?> - 'btn btn-success btn-block']) ?>
    + 'btn btn-success btn-block']) ?>
    diff --git a/lib/User/resources/views/registration/connect.php b/lib/User/resources/views/registration/connect.php index eadbddb..d4b614a 100644 --- a/lib/User/resources/views/registration/connect.php +++ b/lib/User/resources/views/registration/connect.php @@ -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; ?>
    @@ -32,7 +32,7 @@ $this->params['breadcrumbs'][] = $this->title;

    :

    @@ -47,7 +47,7 @@ $this->params['breadcrumbs'][] = $this->title; field($model, 'username') ?> - 'btn btn-success btn-block']) ?> + 'btn btn-success btn-block']) ?>
    @@ -55,7 +55,7 @@ $this->params['breadcrumbs'][] = $this->title;

    title = Yii::t('user', 'Sign up'); +$this->title = Yii::t('usuario', 'Sign up'); $this->params['breadcrumbs'][] = $this->title; ?>

    @@ -45,13 +45,13 @@ $this->params['breadcrumbs'][] = $this->title; field($model, 'password')->passwordInput() ?> - 'btn btn-success btn-block']) ?> + 'btn btn-success btn-block']) ?>

    - +

    diff --git a/lib/User/resources/views/registration/resend.php b/lib/User/resources/views/registration/resend.php index e72ee66..a8e3cde 100644 --- a/lib/User/resources/views/registration/resend.php +++ b/lib/User/resources/views/registration/resend.php @@ -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; ?>
    @@ -37,7 +37,7 @@ $this->params['breadcrumbs'][] = $this->title; field($model, 'email')->textInput(['autofocus' => true]) ?> - 'btn btn-primary btn-block']) ?>
    + 'btn btn-primary btn-block']) ?>
    diff --git a/lib/User/resources/views/role/_form.php b/lib/User/resources/views/role/_form.php index 4f800ae..37192e1 100644 --- a/lib/User/resources/views/role/_form.php +++ b/lib/User/resources/views/role/_form.php @@ -43,6 +43,6 @@ $unassignedItems = Yii::$container->get(AuthHelper::class)->getUnassignedItems($ ], ]) ?> - 'btn btn-success btn-block']) ?> + 'btn btn-success btn-block']) ?> diff --git a/lib/User/resources/views/role/create.php b/lib/User/resources/views/role/create.php index b037d2d..dea05b8 100644 --- a/lib/User/resources/views/role/create.php +++ b/lib/User/resources/views/role/create.php @@ -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; ?> diff --git a/lib/User/resources/views/role/index.php b/lib/User/resources/views/role/index.php index 8683eb9..5575a72 100644 --- a/lib/User/resources/views/role/index.php +++ b/lib/User/resources/views/role/index.php @@ -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%', ], diff --git a/lib/User/resources/views/role/update.php b/lib/User/resources/views/role/update.php index 0dbe1cf..35504fb 100644 --- a/lib/User/resources/views/role/update.php +++ b/lib/User/resources/views/role/update.php @@ -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; ?> diff --git a/lib/User/resources/views/security/login.php b/lib/User/resources/views/security/login.php index 3ab096c..8f18382 100644 --- a/lib/User/resources/views/security/login.php +++ b/lib/User/resources/views/security/login.php @@ -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; field($model, 'rememberMe')->checkbox(['tabindex' => '4']) ?> 'btn btn-primary btn-block', 'tabindex' => '3'] ) ?> @@ -79,12 +79,12 @@ $this->params['breadcrumbs'][] = $this->title;
    enableEmailConfirmation): ?>

    - +

    enableRegistration): ?>

    - +

    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, ], diff --git a/lib/User/resources/views/settings/account.php b/lib/User/resources/views/settings/account.php index f8ed092..62331d0 100644 --- a/lib/User/resources/views/settings/account.php +++ b/lib/User/resources/views/settings/account.php @@ -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; ?>
    @@ -58,7 +58,7 @@ $this->params['breadcrumbs'][] = $this->title;
    - 'btn btn-block btn-success']) ?>
    + 'btn btn-block btn-success']) ?>
    @@ -69,18 +69,18 @@ $this->params['breadcrumbs'][] = $this->title; module->allowAccountDelete): ?>
    -

    +

    - . - . - . + . + . + .

    - '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'), ]) ?>
    diff --git a/lib/User/resources/views/settings/networks.php b/lib/User/resources/views/settings/networks.php index 747ece6..caf5666 100644 --- a/lib/User/resources/views/settings/networks.php +++ b/lib/User/resources/views/settings/networks.php @@ -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;
    -

    .

    +

    .

    params['breadcrumbs'][] = $this->title; 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', diff --git a/lib/User/resources/views/settings/profile.php b/lib/User/resources/views/settings/profile.php index 4bf4a02..2e036d3 100644 --- a/lib/User/resources/views/settings/profile.php +++ b/lib/User/resources/views/settings/profile.php @@ -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);
    - 'btn btn-block btn-success']) ?> + 'btn btn-block btn-success']) ?>
    diff --git a/lib/User/resources/views/shared/_menu.php b/lib/User/resources/views/shared/_menu.php index 796683f..d9e1eb6 100644 --- a/lib/User/resources/views/shared/_menu.php +++ b/lib/User/resources/views/shared/_menu.php @@ -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'], ], ], diff --git a/lib/User/resources/views/widgets/assignments/form.php b/lib/User/resources/views/widgets/assignments/form.php index 8e74f0c..eb3391b 100644 --- a/lib/User/resources/views/widgets/assignments/form.php +++ b/lib/User/resources/views/widgets/assignments/form.php @@ -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'), ]) ?> @@ -48,6 +48,6 @@ use yii\widgets\ActiveForm; ], ]) ?> - 'btn btn-success btn-block']) ?> + 'btn btn-success btn-block']) ?> diff --git a/lib/User/resources/views/widgets/login/login.php b/lib/User/resources/views/widgets/login/login.php index 3516a50..7677ab1 100644 --- a/lib/User/resources/views/widgets/login/login.php +++ b/lib/User/resources/views/widgets/login/login.php @@ -39,11 +39,11 @@ use yii\helpers\Html; field($model, 'rememberMe')->checkbox() ?> - 'btn btn-primary btn-block']) ?> + 'btn btn-primary btn-block']) ?> - 'btn btn-danger btn-block', 'data-method' => 'post', ]) ?> diff --git a/tests/_app/config/console.php b/tests/_app/config/console.php index b60e290..58d6db5 100644 --- a/tests/_app/config/console.php +++ b/tests/_app/config/console.php @@ -4,16 +4,28 @@ return [ 'id' => 'yii2-test-console', 'basePath' => dirname(__DIR__), 'aliases' => [ - '@Da/User' => dirname(dirname(dirname(__DIR__))).'/lib/User', + '@Da/User' => dirname(dirname(dirname(__DIR__))) . '/lib/User', '@tests' => dirname(dirname(__DIR__)), ], 'components' => [ 'log' => null, 'cache' => null, - 'db' => require __DIR__.'/db.php', + 'db' => require __DIR__ . '/db.php', 'authManager' => [ 'class' => Da\User\Component\AuthDbManagerComponent::class, ], + 'i18n' => [ + 'translations' => [ + 'usuario*' => [ + 'class' => 'yii\i18n\PhpMessageSource', + 'basePath' => __DIR__ . '/../../../lib/User/resources/i18n', + 'sourceLanguage' => 'en-US', + 'fileMap' => [ + 'usuario' => 'usuario.php', + ], + ], + ], + ], ], 'controllerMap' => [ 'migrate' => [ diff --git a/tests/_app/config/test.php b/tests/_app/config/test.php index 611b226..f31b64c 100644 --- a/tests/_app/config/test.php +++ b/tests/_app/config/test.php @@ -5,10 +5,10 @@ return [ 'basePath' => dirname(__DIR__), 'language' => 'en-US', 'aliases' => [ - '@Da/User' => dirname(dirname(dirname(__DIR__))).'/lib/User', + '@Da/User' => dirname(dirname(dirname(__DIR__))) . '/lib/User', '@tests' => dirname(dirname(__DIR__)), '@vendor' => VENDOR_DIR, - '@bower' => VENDOR_DIR.'/bower-asset', + '@bower' => VENDOR_DIR . '/bower-asset', ], 'bootstrap' => ['Da\User\Bootstrap'], 'modules' => [ @@ -19,9 +19,9 @@ return [ ], 'components' => [ 'assetManager' => [ - 'basePath' => __DIR__.'/../assets', + 'basePath' => __DIR__ . '/../assets', ], - 'db' => require __DIR__.'/db.php', + 'db' => require __DIR__ . '/db.php', 'mailer' => [ 'useFileTransport' => true, ], @@ -32,6 +32,18 @@ return [ 'cookieValidationKey' => 'test', 'enableCsrfValidation' => false, ], + 'i18n' => [ + 'translations' => [ + 'usuario*' => [ + 'class' => 'yii\i18n\PhpMessageSource', + 'basePath' => __DIR__ . '/../../../lib/User/resources/i18n', + 'sourceLanguage' => 'en-US', + 'fileMap' => [ + 'usuario' => 'usuario.php', + ], + ], + ], + ], ], 'params' => [], ]; diff --git a/tests/_app/yii.php b/tests/_app/yii.php index 15d387f..e4b9d17 100644 --- a/tests/_app/yii.php +++ b/tests/_app/yii.php @@ -1,12 +1,12 @@ #!/usr/bin/env php run(); exit($exitCode); diff --git a/tests/_bootstrap.php b/tests/_bootstrap.php index 80678cf..033599b 100644 --- a/tests/_bootstrap.php +++ b/tests/_bootstrap.php @@ -4,17 +4,17 @@ define('YII_ENV', 'test'); defined('YII_DEBUG') or define('YII_DEBUG', true); // Search for autoload, since performance is irrelevant and usability isn't! -$dir = __DIR__.'/../'; -while (!file_exists($dir.'/vendor/autoload.php')) { +$dir = __DIR__ . '/../'; +while (!file_exists($dir . '/vendor/autoload.php')) { if ($dir == dirname($dir)) { throw new \Exception('Failed to locate autoload.php'); } $dir = dirname($dir); } -$vendor = $dir.'/vendor'; +$vendor = $dir . '/vendor'; define('VENDOR_DIR', $vendor); -require_once $vendor.'/autoload.php'; -require $vendor.'/yiisoft/yii2/Yii.php'; +require_once $vendor . '/autoload.php'; +require $vendor . '/yiisoft/yii2/Yii.php';