Commit 519ce46c54ea69409d896a5a167f856aef8524da
1 parent
e37bf1d4
test new branch
Showing
2 changed files
with
11 additions
and
2 deletions
Show diff stats
common/mail/passwordResetToken-html.php
| @@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
| 2 | use yii\helpers\Html; | 2 | use yii\helpers\Html; |
| 3 | 3 | ||
| 4 | /* @var $this yii\web\View */ | 4 | /* @var $this yii\web\View */ |
| 5 | -/* @var $user common\models\User */ | 5 | +/* @var $user common\models\User */ |
| 6 | 6 | ||
| 7 | $resetLink = Yii::$app->urlManager->createAbsoluteUrl(['site/reset-password', 'token' => $user->password_reset_token]); | 7 | $resetLink = Yii::$app->urlManager->createAbsoluteUrl(['site/reset-password', 'token' => $user->password_reset_token]); |
| 8 | ?> | 8 | ?> |
common/messages/ru/core.php
| 1 | <?php | 1 | <?php |
| 2 | +<<<<<<< Updated upstream | ||
| 2 | return [ | 3 | return [ |
| 3 | 'name'=>'Имя', | 4 | 'name'=>'Имя', |
| 4 | 'email'=>'Email', | 5 | 'email'=>'Email', |
| @@ -6,4 +7,12 @@ return [ | @@ -6,4 +7,12 @@ return [ | ||
| 6 | 'message'=>'Сообщение', | 7 | 'message'=>'Сообщение', |
| 7 | 'Send' => 'Отправить', | 8 | 'Send' => 'Отправить', |
| 8 | 'Send message'=>'Отправить сообщение', | 9 | 'Send message'=>'Отправить сообщение', |
| 9 | -]; | ||
| 10 | \ No newline at end of file | 10 | \ No newline at end of file |
| 11 | +]; | ||
| 12 | +======= | ||
| 13 | + /** | ||
| 14 | + * Created by PhpStorm. | ||
| 15 | + * User: user | ||
| 16 | + * Date: 17.05.18 | ||
| 17 | + * Time: 11:26 | ||
| 18 | + */ | ||
| 19 | +>>>>>>> Stashed changes |