diff --git a/.php_cs.dist b/.php_cs.dist new file mode 100644 index 0000000..0a0f02f --- /dev/null +++ b/.php_cs.dist @@ -0,0 +1,21 @@ +exclude([ + '.github', + 'docs', + 'temp', + 'tests', + 'vendor', + ]) + ->in(__DIR__); + +return PhpCsFixer\Config::create() + ->setRules([ + '@PSR1' => true, + '@PSR2' => true, + '@Symfony' => true, + 'concat_space' => ['spacing' => 'one'], + 'phpdoc_no_alias_tag' => [], + ]) + ->setFinder($finder); diff --git a/src/User/resources/i18n/ru/usuario.php b/src/User/resources/i18n/ru/usuario.php index 6385210..ce221eb 100644 --- a/src/User/resources/i18n/ru/usuario.php +++ b/src/User/resources/i18n/ru/usuario.php @@ -17,16 +17,16 @@ * NOTE: this file must be saved in UTF-8 encoding. */ return [ - '(not set)' => '', + '(not set)' => '(неустановлено)', 'A confirmation message has been sent to your new email address' => '', 'A message has been sent to your email address. ' => '', 'A new confirmation link has been sent' => '', 'A password will be generated automatically if not provided' => '', - 'Account' => '', - 'Account confirmation' => '', - 'Account details' => '', + 'Account' => 'Аккаунт', + 'Account confirmation' => 'Подтверждение аккаунта', + 'Account details' => 'Детали аккаунта', 'Account details have been updated' => '', - 'Account settings' => '', + 'Account settings' => 'Настройки аккаунта', 'Already registered? Sign in!' => '', 'An email has been sent with instructions for resetting your password' => '', 'An error occurred processing your request' => '', @@ -133,7 +133,8 @@ return [ 'Roles' => '', 'Rule' => '', 'Rule class can not be instantiated' => '', - 'Rule class must extend "yii\\rbac\\Rule"' => '', + 'Rule class must extend "yii +bacRule"' => '', 'Rule name' => '', 'Save' => '', 'Sign in' => '', @@ -158,19 +159,19 @@ return [ 'Unable to update block status.' => '', 'Unblock' => '', 'Unconfirmed' => '', - 'Update' => '', + 'Update' => 'Обновить', 'Update assignments' => '', 'Update permission' => '', - 'Update role' => '', + 'Update role' => 'Обновить роли', 'Update user account' => '', 'User block status has been updated.' => '', 'User has been confirmed' => '', 'User has been created' => '', 'User has been deleted' => '', - 'User is not found' => '', - 'Username' => '', - 'Users' => '', - 'VKontakte' => '', + 'User is not found' => 'Пользователь не найден', + 'Username' => 'Имя пользователя', + 'Users' => 'Пользователи', + 'VKontakte' => 'ВКонтакте', 'We couldn\'t re-send the mail to confirm your address. ' => '', 'We have generated a password for you' => '', 'We have received a request to change the email address for your account on {0}' => '', @@ -178,7 +179,7 @@ return [ 'We have sent confirmation links to both old and new email addresses. ' => '', 'Website' => '', 'Welcome to {0}' => '', - 'Yandex' => '', + 'Yandex' => 'Яндекс', 'You can assign multiple roles or permissions to user by using the form below' => '', 'You can connect multiple accounts to be able to log in using them' => '', 'You cannot remove your own account' => '', @@ -192,7 +193,7 @@ return [ 'Your account has been created and a message with further instructions has been sent to your email' => '', 'Your account on {0} has been created' => '', 'Your confirmation token is invalid or expired' => '', - 'Your email address has been changed' => '', - 'Your profile has been updated' => '', + 'Your email address has been changed' => 'Ваш почтовый адрес был обновлён', + 'Your profile has been updated' => 'Ваш профиль был обновлён', '{0, date, MMMM dd, YYYY HH:mm}' => '', ]; diff --git a/src/User/resources/views/admin/_account.php b/src/User/resources/views/admin/_account.php index d82c1bc..0d456db 100644 --- a/src/User/resources/views/admin/_account.php +++ b/src/User/resources/views/admin/_account.php @@ -12,10 +12,9 @@ use yii\bootstrap\ActiveForm; use yii\helpers\Html; -/* - * @var yii\web\View $this - * @var \Da\User\Model\User $user - */ +/* @var yii\web\View $this */ +/* @var Da\User\Model\User $user */ + ?> beginContent('@Da/User/resources/views/admin/update.php', ['user' => $user]) ?> diff --git a/src/User/resources/views/admin/_assignments.php b/src/User/resources/views/admin/_assignments.php index b1b0231..4bf779b 100644 --- a/src/User/resources/views/admin/_assignments.php +++ b/src/User/resources/views/admin/_assignments.php @@ -11,11 +11,9 @@ use Da\User\Widget\AssignmentsWidget; -/* - * @var yii\web\View $this - * @var \Da\User\Model\User $user - * @var string[] $params - */ +/* @var yii\web\View $this */ +/* @var Da\User\Model\User $user */ +/* @var string[] $params */ ?>