update folder location

This commit is contained in:
Antonio Ramirez
2017-01-11 21:31:53 +01:00
4 changed files with 43 additions and 24 deletions

21
.php_cs.dist Normal file
View File

@ -0,0 +1,21 @@
<?php
$finder = PhpCsFixer\Finder::create()
->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);

View File

@ -17,16 +17,16 @@
* NOTE: this file must be saved in UTF-8 encoding. * NOTE: this file must be saved in UTF-8 encoding.
*/ */
return [ return [
'(not set)' => '', '(not set)' => '(неустановлено)',
'A confirmation message has been sent to your new email address' => '', 'A confirmation message has been sent to your new email address' => '',
'A message has been sent to your email address. ' => '', 'A message has been sent to your email address. ' => '',
'A new confirmation link has been sent' => '', 'A new confirmation link has been sent' => '',
'A password will be generated automatically if not provided' => '', 'A password will be generated automatically if not provided' => '',
'Account' => '', 'Account' => 'Аккаунт',
'Account confirmation' => '', 'Account confirmation' => 'Подтверждение аккаунта',
'Account details' => '', 'Account details' => 'Детали аккаунта',
'Account details have been updated' => '', 'Account details have been updated' => '',
'Account settings' => '', 'Account settings' => 'Настройки аккаунта',
'Already registered? Sign in!' => '', 'Already registered? Sign in!' => '',
'An email has been sent with instructions for resetting your password' => '', 'An email has been sent with instructions for resetting your password' => '',
'An error occurred processing your request' => '', 'An error occurred processing your request' => '',
@ -133,7 +133,8 @@ return [
'Roles' => '', 'Roles' => '',
'Rule' => '', 'Rule' => '',
'Rule class can not be instantiated' => '', 'Rule class can not be instantiated' => '',
'Rule class must extend "yii\\rbac\\Rule"' => '', 'Rule class must extend "yii
bacRule"' => '',
'Rule name' => '', 'Rule name' => '',
'Save' => '', 'Save' => '',
'Sign in' => '', 'Sign in' => '',
@ -158,19 +159,19 @@ return [
'Unable to update block status.' => '', 'Unable to update block status.' => '',
'Unblock' => '', 'Unblock' => '',
'Unconfirmed' => '', 'Unconfirmed' => '',
'Update' => '', 'Update' => 'Обновить',
'Update assignments' => '', 'Update assignments' => '',
'Update permission' => '', 'Update permission' => '',
'Update role' => '', 'Update role' => 'Обновить роли',
'Update user account' => '', 'Update user account' => '',
'User block status has been updated.' => '', 'User block status has been updated.' => '',
'User has been confirmed' => '', 'User has been confirmed' => '',
'User has been created' => '', 'User has been created' => '',
'User has been deleted' => '', 'User has been deleted' => '',
'User is not found' => '', 'User is not found' => 'Пользователь не найден',
'Username' => '', 'Username' => 'Имя пользователя',
'Users' => '', 'Users' => 'Пользователи',
'VKontakte' => '', 'VKontakte' => 'ВКонтакте',
'We couldn\'t re-send the mail to confirm your address. ' => '', 'We couldn\'t re-send the mail to confirm your address. ' => '',
'We have generated a password for you' => '', 'We have generated a password for you' => '',
'We have received a request to change the email address for your account on {0}' => '', '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. ' => '', 'We have sent confirmation links to both old and new email addresses. ' => '',
'Website' => '', 'Website' => '',
'Welcome to {0}' => '', 'Welcome to {0}' => '',
'Yandex' => '', 'Yandex' => 'Яндекс',
'You can assign multiple roles or permissions to user by using the form below' => '', '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 can connect multiple accounts to be able to log in using them' => '',
'You cannot remove your own account' => '', '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 has been created and a message with further instructions has been sent to your email' => '',
'Your account on {0} has been created' => '', 'Your account on {0} has been created' => '',
'Your confirmation token is invalid or expired' => '', 'Your confirmation token is invalid or expired' => '',
'Your email address has been changed' => '', 'Your email address has been changed' => 'Ваш почтовый адрес был обновлён',
'Your profile has been updated' => '', 'Your profile has been updated' => 'Ваш профиль был обновлён',
'{0, date, MMMM dd, YYYY HH:mm}' => '', '{0, date, MMMM dd, YYYY HH:mm}' => '',
]; ];

View File

@ -12,10 +12,9 @@
use yii\bootstrap\ActiveForm; use yii\bootstrap\ActiveForm;
use yii\helpers\Html; use yii\helpers\Html;
/* /* @var yii\web\View $this */
* @var yii\web\View $this /* @var Da\User\Model\User $user */
* @var \Da\User\Model\User $user
*/
?> ?>
<?php $this->beginContent('@Da/User/resources/views/admin/update.php', ['user' => $user]) ?> <?php $this->beginContent('@Da/User/resources/views/admin/update.php', ['user' => $user]) ?>

View File

@ -11,11 +11,9 @@
use Da\User\Widget\AssignmentsWidget; use Da\User\Widget\AssignmentsWidget;
/* /* @var yii\web\View $this */
* @var yii\web\View $this /* @var Da\User\Model\User $user */
* @var \Da\User\Model\User $user /* @var string[] $params */
* @var string[] $params
*/
?> ?>