Merge branch 'master' into phpdoc-events

.travis.yml

@@ -30,7 +30,6 @@ install:
         phpenv config-rm xdebug.ini || echo "xdebug is not installed"
     fi
   - travis_retry composer self-update && composer --version
-  - travis_retry composer global require "fxp/composer-asset-plugin:^1.4.0"
   - export PATH="$HOME/.composer/vendor/bin:$PATH"
   - COMPOSER_MEMORY_LIMIT=-1 travis_retry composer install --prefer-dist --no-interaction
 

CHANGELOG.md

@@ -1,6 +1,6 @@
 # CHANGELOG
 
-## 1.5.0 - Work in progress
+## 1.1.5 - Work in progress
  - Fix: Fix condition in EmailChangeService (it was always false) (borisaeric)
  - Fix #198: Updated translations by quique, bizley, TonisOrmisson, guogan, Dezinger, maxxer, wautvda, mrbig00, fabiomlferreira
  - Fix #209: Doc fix. allowAccountDelete default value is false (Dezinger)
@@ -17,9 +17,16 @@
  - Enh: Add controller module class reference (TonisOrmisson)
  - Enh: Replace the deprecated InvalidParamException in ClassMapHelper (TonisOrmisson)
  - Fix #242: Add POST filter for `admin/force-password-change` action (bscheshirwork)
+ - Enh #251: Use `asset-packagist` instead of `fxp-asset` if you run it as a module without having a project around (bscheshirwork)
  - Fix #252: Delete check for unexpected property `allowPasswordRecovery` for resend email by admin (bscheshirwork)
  - Fix #254: Rename `GDPR` properties to `lowerCamelCase` style (bscheshirwork)
  - Enh #253: Add PHPDoc for events class (bscheshirwork)
+ - Fix #258: Rename `GDPR` delete action to `lowerCamelCase`/`dash` style (bscheshirwork)
+ - Fix #271: Add closure support for `from` email address; Change default sender to `supportEmail` (bscheshirwork)
+ - Fix #276: Fix missing translatable strings
+ - Enh #249: Show message `email send if possible` any time on reset password request (bscheshirwork)
+ - Enh #282: Allows customization of controller namespace (maxxer)
+
 
 ## 1.1.4 - February 19, 2018
 - Enh: Check enableEmailConfirmation on registration (faenir)

composer.json

@@ -80,15 +80,7 @@
             "*": "auto"
         },
         "fxp-asset": {
-            "installer-paths": {
+            "enabled": false
-                "npm-asset-library": "vendor/npm",
-                "bower-asset-library": "vendor/bower"
-            },
-            "vcs-driver-options": {
-                "github-no-api": true
-            },
-            "git-skip-update": "2 days",
-            "pattern-skip-version": "(-build|-patch)"
         }
     },
     "conflict": {
@@ -97,5 +89,11 @@
     },
     "extra": {
         "bootstrap": "Da\\User\\Bootstrap"
-    }
+    },
+    "repositories": [
+        {
+            "type": "composer",
+            "url": "https://asset-packagist.org"
+        }
+    ]
 }

docs/enhancing-and-overriding/overriding-controllers.md

@@ -20,6 +20,7 @@ Please, before you override a controller's action, make sure that it won't be en
                     'on ' . \Da\User\Event\ResetPasswordEvent::EVENT_AFTER_RESET => function (\Da\User\Event\ResetPasswordEvent $event) {
                         if ($event->token->user ?? false) {
                             \Yii::$app->user->login($event->token->user);
+                            \Yii::$app->session->setFlash('success', Yii::t('usuario', 'Password has been changed'));
                         }
                         \Yii::$app->controller->redirect(\Yii::$app->getUser()->getReturnUrl());
                         \Yii::$app->end();
@@ -32,6 +33,7 @@ Please, before you override a controller's action, make sure that it won't be en
                         \Yii::$app->end();
                     },
                     'on ' . \Da\User\Event\FormEvent::EVENT_AFTER_RESEND => function (\Da\User\Event\FormEvent $event) {
+                        \Yii::$app->session->setFlash('info', Yii::t('usuario', 'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.'));
                         \Yii::$app->controller->redirect(['/user/security/login']);
                         \Yii::$app->end();
                     },

docs/helpful-guides/how-to-swith-identities.md

@@ -21,6 +21,39 @@ if(Yii::$app->session->has($module->switchIdentitySessionKey)) {
    echo Html::a('Switch to Admin', ['/user/admin/switch-identity'], ['data-method' => 'post']);
 }
 ```
+> Note: If you use RBAC we can add access for all user to to this action for back to original user available.
+```php
+...
+    'modules' => [
+        'user' => [
+            'controllerMap' => [
+                'admin' => [
+                    'class' => Da\User\Controller\AdminController::class,
+                    'as access' => [
+                        'class' => yii\filters\AccessControl::class,
+                        'rules' => [
+                            ['allow' => true, 'actions' => ['switch-identity']],
+                            ['allow' => true, 'permissions' => ['administrateUser']],
+                        ],
+                    ],
+                ],
+            ],
+        ],
+    ],
+...
+``` 
+> Also you can define access role `'administratorPermissionName' => 'admin',` where `admin` is have `administrateUser` permission
+```php
+...
+    'modules' => [
+        'user' => [
+            'class' => Da\User\Module::class,
+            'administratorPermissionName' => 'admin',
+        ],
+    ],
+...
+``` 
+
 
 Check the [switchIdentitySessionKey](../installation/configuration-options.md#switchidentitysessionkey) documentation  
 for further information regarding this configuration option. 

docs/installation/available-actions.md

@@ -20,7 +20,7 @@ The following is the list of action provided by the module:
 | **/user/settings/delete** | Delete self account | | POST only
 | **/user/settings/disconnect** | Disconnect social account | | POST only
 | **/user/settings/export** | Download personal data in a comma separated values format
-| **/user/settings/gdprdelete** | Displays delete personal data page |
+| **/user/settings/gdpr-delete** | Displays delete personal data page |
 | **/user/settings/networks** | Displays social network accounts settings page
 | **/user/settings/privacy** | Displays GDPR data page
 | **/user/settings/profile** | Displays profile settings form

docs/installation/configuration-options.md

@@ -162,6 +162,14 @@ protected against brute-force attacks, set it to the highest value that is toler
 taken to compute the hash doubles for every increment by one of `$blowfishCost`.
 
 
+#### consoleControllerNamespace (type: `string`, default: `Da\User\Command`)
+
+Allows customization of the console application controller namespace for the module.
+
+#### controllerNamespace (type: `string`, default: `Da\User\Controller`)
+
+Allows customization of the web application controller namespace for the module.
+
 #### classMap (type: `array`, default: `[]`)
 
 Configures the definitions of the classes as they have to be override. For more information see 

docs/installation/mailer.md

@@ -4,7 +4,7 @@ Mailer
 The way this module sends its emails is throughout the [`Mailer`](http://www.yiiframework.com/doc-2.0/guide-tutorial-mailing.html) 
 component of Yii 2. Please, follow Yii 2's guidelines to set it up. 
  
-Nevertheless, you have to configure the following attribute of the module: `mailParams`. the following is its default 
+Nevertheless, you wish to configure the following attribute of the module: `mailParams`. the following is its default 
 values:
 
 ```php
@@ -17,7 +17,23 @@ values:
 ]
 ```
 
-Actually, the only thing required is the `fromEmail` value. If you look at the code of `Da\User\Factory\MailFactory.php` 
+Actually, the only thing required is the `fromEmail` value. 
+If you want to set it the same as supportEmail from your config params (like yii2-app-advanced template):
+```php
+    ...
+    'modules' => [
+        'user' => [
+            'class' => Da\User\Module::class,
+            'mailParams' => [
+                'fromEmail' => function() {
+                    return [Yii::$app->params['supportEmail'] => Yii::t('app', '{0} robot', Yii::$app->name)];
+                }
+            ],
+        ],
+    ],
+    ...
+```
+If you look at the code of `Da\User\Factory\MailFactory.php` 
 you will easily find the reason why: 
 
 ```php
@@ -55,4 +71,35 @@ public function run()
 }
 ```
 
+> Tip: You can separate `from` by type of mailer of this module:
+```php
+    ...
+    'modules' => [
+        'user' => [
+            'class' => Da\User\Module::class,
+            'mailParams' => [
+                'fromEmail' =>
+                    /**
+                     * @param $type string The type of mail 
+                     *   Da\User\Event\MailEvent::TYPE_WELCOME|Da\User\Event\MailEvent::TYPE_RECOVERY|
+                     *   Da\User\Event\MailEvent::TYPE_CONFIRM|Da\User\Event\MailEvent::TYPE_RECONFIRM
+                     * @return array
+                     */
+                    function ($type) {
+                        switch ($type) {
+                            case Da\User\Event\MailEvent::TYPE_WELCOME:
+                                return [Yii::$app->params['supportEmail'] => Yii::t('app', '{0} welcome!', Yii::$app->name)];
+                            break;
+                            default:
+                                return [Yii::$app->params['supportEmail'] => Yii::t('app', '{0} robot', Yii::$app->name)];
+                            break;
+                        }
+                    },
+            ],
+        ],
+    ],
+    ...
+```
+
+
 © [2amigos](http://www.2amigos.us/) 2013-2017

docs/installation/migration-guide-from-dektrium-tools.md

@@ -70,6 +70,50 @@ from `\dektrium\user\controllers\RecoveryController::EVENT_AFTER_REQUEST` to `\D
 from `\dektrium\user\controllers\RecoveryController::EVENT_AFTER_RESET` to `\Da\User\Event\ResetPasswordEvent::EVENT_AFTER_RESET`, etc.  
 Map of constants can be find in [events](../events) chapter of this docs. 
 
+## BackendFilter and FrontendFilter
+BackendFilter disable this controllers: 'profile', 'recovery', 'registration', 'settings';
+FrontendFilter disable this controller: 'admin';
+
+This functionality has been dropped. Use `deny` rule in your configuration directly. For example change `frontend` config like this:
+
+```
+    'modules' => [
+        'user' => [
+            'controllerMap' => [
+                'admin' => [
+                    'class' => Da\User\Controller\AdminController::class,
+                    'as access' => [
+                        'class' => yii\filters\AccessControl::class,
+                        'rules' => [['allow' => false]],
+                    ],
+                ],
+                'role' => [
+                    'class' => Da\User\Controller\RoleController::class,
+                    'as access' => [
+                        'class' => yii\filters\AccessControl::class,
+                        'rules' => [['allow' => false]],
+                    ],
+                ],
+                'permission' => [
+                    'class' => Da\User\Controller\PermissionController::class,
+                    'as access' => [
+                        'class' => yii\filters\AccessControl::class,
+                        'rules' => [['allow' => false]],
+                    ],
+                ],
+                'rule' => [
+                    'class' => Da\User\Controller\RuleController::class,
+                    'as access' => [
+                        'class' => yii\filters\AccessControl::class,
+                        'rules' => [['allow' => false]],
+                    ],
+                ],
+            ],
+        ],
+    ],
+
+``` 
+
 ## Rbac migrations
 
 [yii2-rbac](https://github.com/dektrium/yii2-rbac) have a nice tool which are rbac migrations, which help writing new permissions and roles.

src/User/Bootstrap.php

@@ -281,7 +281,7 @@ class Bootstrap implements BootstrapInterface
      */
     protected function initConsoleCommands(ConsoleApplication $app)
     {
-        $app->getModule('user')->controllerNamespace = 'Da\User\Command';
+        $app->getModule('user')->controllerNamespace = $app->getModule('user')->consoleControllerNamespace;
     }
 
     /**
@@ -291,7 +291,7 @@ class Bootstrap implements BootstrapInterface
      */
     protected function initControllerNamespace(WebApplication $app)
     {
-        $app->getModule('user')->controllerNamespace = 'Da\User\Controller';
+        $app->getModule('user')->controllerNamespace = $app->getModule('user')->controllerNamespace;
         $app->getModule('user')->setViewPath('@Da/User/resources/views');
     }
 

src/User/Controller/RecoveryController.php

@@ -104,15 +104,15 @@ class RecoveryController extends Controller
 
             if ($this->make(PasswordRecoveryService::class, [$form->email, $mailService])->run()) {
                 $this->trigger(FormEvent::EVENT_AFTER_REQUEST, $event);
-
-                return $this->render(
-                    '/shared/message',
-                    [
-                        'title' => Yii::t('usuario', 'Recovery message sent'),
-                        'module' => $this->module,
-                    ]
-                );
             }
+
+            return $this->render(
+                '/shared/message',
+                [
+                    'title' => Yii::t('usuario', 'Recovery message sent'),
+                    'module' => $this->module,
+                ]
+            );
         }
 
         return $this->render('request', ['model' => $form]);

src/User/Controller/SettingsController.php

@@ -107,7 +107,7 @@ class SettingsController extends Controller
                             'export',
                             'networks',
                             'privacy',
-                            'gdprdelete',
+                            'gdpr-delete',
                             'disconnect',
                             'delete',
                             'two-factor',
@@ -167,7 +167,7 @@ class SettingsController extends Controller
         ]);
     }
 
-    public function actionGdprdelete()
+    public function actionGdprDelete()
     {
         if (!$this->module->enableGdprCompliance)
             throw new NotFoundHttpException();
@@ -220,7 +220,7 @@ class SettingsController extends Controller
 
         }
 
-        return $this->render('gdprdelete', [
+        return $this->render('gdpr-delete', [
             'model' => $form,
         ]);
     }

src/User/Factory/MailFactory.php

@@ -118,7 +118,7 @@ class MailFactory
      * Builds a MailerService.
      *
      * @param string $type
-     * @param string $from
+     * @param string|array|\Closure $from
      * @param string $to
      * @param string $subject
      * @param string $view
@@ -130,6 +130,9 @@ class MailFactory
      */
     public static function makeMailerService($type, $from, $to, $subject, $view, $params = [])
     {
+        if ($from instanceof \Closure){
+            $from = $from($type);
+        }
         /** @noinspection PhpIncompatibleReturnTypeInspection */
         return Yii::$container->get(
             MailService::class,

src/User/Form/GdprDeleteForm.php

@@ -82,5 +82,10 @@ class GdprDeleteForm extends Model
         return $this->user;
     }
 
-
+    public function attributeLabels()
+    {
+        return [
+            'password' => Yii::t('usuario', 'Password'),
+        ];
+    }
 }

src/User/Model/Rule.php

@@ -15,6 +15,7 @@ use Da\User\Traits\AuthManagerAwareTrait;
 use Da\User\Validator\RbacRuleNameValidator;
 use Da\User\Validator\RbacRuleValidator;
 use yii\base\Model;
+use Yii;
 
 class Rule extends Model
 {
@@ -57,4 +58,15 @@ class Rule extends Model
             [['className'], RbacRuleValidator::class],
         ];
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function attributeLabels()
+    {
+        return [
+            'name' => Yii::t('usuario', 'Name'),
+            'className' => Yii::t('usuario', 'Rule class name'),
+        ];
+    }
 }

src/User/Module.php

@@ -145,6 +145,14 @@ class Module extends BaseModule
      *          to compute the hash doubles for every increment by one of $cost
      */
     public $blowfishCost = 10;
+    /**
+     * @var string Web controller namespace
+     */
+    public $controllerNamespace = 'Da\User\Controller';
+    /**
+     * @var string Console controller namespace
+     */
+    public $consoleControllerNamespace = 'Da\User\Command';
     /**
      * @var array the class map. How the container should load specific classes
      * @see Bootstrap::buildClassMap() for more details

src/User/Service/PasswordRecoveryService.php

@@ -41,6 +41,13 @@ class PasswordRecoveryService implements ServiceInterface
     public function run()
     {
         try {
+            if ($this->getModule()->enableFlashMessages == true) {
+                Yii::$app->session->setFlash(
+                    'info',
+                    Yii::t('usuario', 'An email with instructions to create a new password has been sent to {email} if it is associated with an {appName} account. Your existing password has not been changed.', ['email' => $this->email, 'appName' => Yii::$app->name])
+                );
+            }
+
             /** @var User $user */
             $user = $this->query->whereEmail($this->email)->one();
 
@@ -60,13 +67,6 @@ class PasswordRecoveryService implements ServiceInterface
                 return false;
             }
 
-            if ($this->getModule()->enableFlashMessages == true) {
-                Yii::$app->session->setFlash(
-                    'info',
-                    Yii::t('usuario', 'An email has been sent with instructions for resetting your password')
-                );
-            }
-
             return true;
         } catch (Exception $e) {
             Yii::error($e->getMessage(), 'usuario');

src/User/resources/i18n/ca/usuario.php

@@ -28,7 +28,7 @@ return [
     'Account details have been updated' => '',
     'Account settings' => '',
     'Already registered? Sign in!' => '',
-    'An email has been sent with instructions for resetting your password' => '',
+    'An email with instructions to create a new password has been sent to {email} if it is associated with an {appName} account. Your existing password has not been changed.' => '',
     'An error occurred processing your request' => '',
     'Are you sure you want to block this user?' => '',
     'Are you sure you want to confirm this user?' => '',
@@ -175,6 +175,7 @@ return [
     'Roles' => '',
     'Rule' => '',
     'Rule class must extend "yii\\rbac\\Rule".' => '',
+    'Rule class name' => '',
     'Rule name' => '',
     'Rule name {0} is already in use' => '',
     'Rule {0} does not exists' => '',
@@ -182,6 +183,7 @@ return [
     'Rules' => '',
     'Save' => '',
     'Scan the QrCode with Google Authenticator App, then insert its temporary code on the box and submit.' => '',
+    'Select rule...' => '',
     'Send password recovery email' => '',
     'Sign in' => '',
     'Sign up' => '',
@@ -271,6 +273,7 @@ return [
     '{0, date, MMMM dd, YYYY HH:mm}' => '',
     '{0} cannot be blank.' => '',
     'A message has been sent to your email address. ' => '@@@@',
+    'An email has been sent with instructions for resetting your password' => '@@@@',
     'Awesome, almost there. ' => '@@@@',
     'Class "{0}" does not exist' => '@@@@',
     'Disable Two-Factor Auth' => '@@@@',

src/User/resources/i18n/da/usuario.php

@@ -28,7 +28,7 @@ return [
     'Account details have been updated' => '',
     'Account settings' => '',
     'Already registered? Sign in!' => '',
-    'An email has been sent with instructions for resetting your password' => '',
+    'An email with instructions to create a new password has been sent to {email} if it is associated with an {appName} account. Your existing password has not been changed.' => '',
     'An error occurred processing your request' => '',
     'Are you sure you want to block this user?' => '',
     'Are you sure you want to confirm this user?' => '',
@@ -175,6 +175,7 @@ return [
     'Roles' => '',
     'Rule' => '',
     'Rule class must extend "yii\\rbac\\Rule".' => '',
+    'Rule class name' => '',
     'Rule name' => '',
     'Rule name {0} is already in use' => '',
     'Rule {0} does not exists' => '',
@@ -182,6 +183,7 @@ return [
     'Rules' => '',
     'Save' => '',
     'Scan the QrCode with Google Authenticator App, then insert its temporary code on the box and submit.' => '',
+    'Select rule...' => '',
     'Send password recovery email' => '',
     'Sign in' => '',
     'Sign up' => '',
@@ -271,6 +273,7 @@ return [
     '{0, date, MMMM dd, YYYY HH:mm}' => '',
     '{0} cannot be blank.' => '',
     'A message has been sent to your email address. ' => '@@@@',
+    'An email has been sent with instructions for resetting your password' => '@@@@',
     'Awesome, almost there. ' => '@@@@',
     'Class "{0}" does not exist' => '@@@@',
     'Disable Two-Factor Auth' => '@@@@',

src/User/resources/i18n/de-DU/usuario.php

@@ -28,7 +28,7 @@ return [
     'Account details have been updated' => '',
     'Account settings' => '',
     'Already registered? Sign in!' => '',
-    'An email has been sent with instructions for resetting your password' => '',
+    'An email with instructions to create a new password has been sent to {email} if it is associated with an {appName} account. Your existing password has not been changed.' => '',
     'An error occurred processing your request' => '',
     'Are you sure you want to block this user?' => '',
     'Are you sure you want to confirm this user?' => '',
@@ -175,6 +175,7 @@ return [
     'Roles' => '',
     'Rule' => '',
     'Rule class must extend "yii\\rbac\\Rule".' => '',
+    'Rule class name' => '',
     'Rule name' => '',
     'Rule name {0} is already in use' => '',
     'Rule {0} does not exists' => '',
@@ -182,6 +183,7 @@ return [
     'Rules' => '',
     'Save' => '',
     'Scan the QrCode with Google Authenticator App, then insert its temporary code on the box and submit.' => '',
+    'Select rule...' => '',
     'Send password recovery email' => '',
     'Sign in' => '',
     'Sign up' => '',
@@ -271,6 +273,7 @@ return [
     '{0, date, MMMM dd, YYYY HH:mm}' => '',
     '{0} cannot be blank.' => '',
     'A message has been sent to your email address. ' => '@@@@',
+    'An email has been sent with instructions for resetting your password' => '@@@@',
     'Awesome, almost there. ' => '@@@@',
     'Class "{0}" does not exist' => '@@@@',
     'Disable Two-Factor Auth' => '@@@@',

src/User/resources/i18n/de/usuario.php

@@ -17,6 +17,7 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
+    'An email with instructions to create a new password has been sent to {email} if it is associated with an {appName} account. Your existing password has not been changed.' => '',
     'Are you sure you wish the user to change their password at next login?' => '',
     'Back to privacy settings' => '',
     'Data processing consent' => '',
@@ -39,6 +40,8 @@ return [
     'Password age' => '',
     'Privacy' => '',
     'Privacy settings' => '',
+    'Rule class name' => '',
+    'Select rule...' => '',
     'There was an error in saving user' => '',
     'This will disable two factor authentication. Are you sure?' => '',
     'This will remove your personal data from this site. You will no longer be able to sign in.' => '',
@@ -55,6 +58,7 @@ return [
     'Your personal information has been removed' => '',
     'privacy policy' => '',
     'A message has been sent to your email address. ' => '@@Eine Nachricht wurde an ihre E-Mail Adresse versandt@@',
+    'An email has been sent with instructions for resetting your password' => '@@Eine E-Mail mit den weiteren Schritten zur Passwort-Wiederherstellung wurde versandt@@',
     'Awesome, almost there. ' => '@@Fast geschafft. @@',
     'Class "{0}" does not exist' => '@@Klasse "{0}" existiert nicht@@',
     'Disable Two-Factor Auth' => '@@Zweifaktor-Authentifizierung deaktivieren@@',
@@ -90,7 +94,6 @@ return [
     'Account details have been updated' => 'Kontodetails gespeichert',
     'Account settings' => 'Kontoeinstellungen',
     'Already registered? Sign in!' => 'Bereits registriert? Zur Anmeldung!',
-    'An email has been sent with instructions for resetting your password' => 'Eine E-Mail mit den weiteren Schritten zur Passwort-Wiederherstellung wurde versandt',
     'An error occurred processing your request' => 'Es ist ein Fehler aufgetreten',
     'Are you sure you want to block this user?' => 'Sind Sie sicher, dass Sie diesen Benutzer blockieren wollen?',
     'Are you sure you want to confirm this user?' => 'Sind Sie sicher, dass Sie diesen Benutzer bestätigen wollen?',
@@ -293,7 +296,7 @@ return [
     'Your confirmation token is invalid or expired' => 'Ihr Bestätigungs-Token ist falsch oder abgelaufen',
     'Your email address has been changed' => 'Ihre E-Mail Adresse wurde geändert',
     'Your profile has been updated' => 'Ihr Profil wurde gespeichert',
-    '{0, date, MMM dd, YYYY HH:mm}' => '@@@@',
+    '{0, date, MMM dd, YYYY HH:mm}' => '{0, date, dd. MMM YYYY, HH:mm}',
     '{0, date, MMMM dd, YYYY HH:mm}' => '{0, date, dd. MMMM YYYY, HH:mm}',
     '{0} cannot be blank.' => '{0} darf nicht leer sein.',
 ];

src/User/resources/i18n/es/usuario.php

@@ -17,8 +17,12 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
+    'An email with instructions to create a new password has been sent to {email} if it is associated with an {appName} account. Your existing password has not been changed.' => '',
+    'Rule class name' => '',
+    'Select rule...' => '',
     'Two factor authentication protects you in case of stolen credentials' => '',
     '{0, date, MMM dd, YYYY HH:mm}' => '',
+    'An email has been sent with instructions for resetting your password' => '@@Se ha enviado un correo electrónico con instrucciones para restablecer su contraseña@@',
     'Two factor authentication protects you against stolen credentials' => '@@La autenticación de dos factores le protege del robo de credenciales@@',
     '(not set)' => '(sin establecer)',
     'A confirmation message has been sent to your new email address' => 'Se ha enviado un mensaje de confirmación a su nueva dirección de correo electrónico',
@@ -31,7 +35,6 @@ return [
     'Account details have been updated' => 'Se han actualizado los detalles de la cuenta',
     'Account settings' => 'Configuración de la cuenta',
     'Already registered? Sign in!' => '¿Ya está registrado? ¡Inicie sesión!',
-    'An email has been sent with instructions for resetting your password' => 'Se ha enviado un correo electrónico con instrucciones para restablecer su contraseña',
     'An error occurred processing your request' => 'Se ha producido un error al procesar su solicitud',
     'Are you sure you want to block this user?' => '¿Seguro que desea bloquear a este usuario?',
     'Are you sure you want to confirm this user?' => '¿Seguro que desea confirmar a este usuario?',

src/User/resources/i18n/et/usuario.php

@@ -17,12 +17,16 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
+    'An email with instructions to create a new password has been sent to {email} if it is associated with an {appName} account. Your existing password has not been changed.' => '',
     'Authentication rule class {0} can not be instantiated' => '',
     'Rule class must extend "yii\\rbac\\Rule".' => '',
+    'Rule class name' => '',
+    'Select rule...' => '',
     'VKontakte' => '',
     'Yandex' => '',
     '{0, date, MMM dd, YYYY HH:mm}' => '',
     '{0, date, MMMM dd, YYYY HH:mm}' => '',
+    'An email has been sent with instructions for resetting your password' => '@@Saatsime sulle e-kirja juhendiga, kuidas saad oma parooli uuendada@@',
     '(not set)' => '(määramata)',
     'A confirmation message has been sent to your new email address' => 'Saatsime sinu uuele e-maili aadressile kinnituskirja',
     'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => 'Saatsime sulle kinnituseks e-kirja. Registreerumise kinnitamiseks pead klikkma saadetud kirjas olevale lingile.',
@@ -34,7 +38,6 @@ return [
     'Account details have been updated' => 'Konto andmed on uuendatud',
     'Account settings' => 'Konto seaded',
     'Already registered? Sign in!' => 'Oled registreerunud? Logi sisse!',
-    'An email has been sent with instructions for resetting your password' => 'Saatsime sulle e-kirja juhendiga, kuidas saad oma parooli uuendada',
     'An error occurred processing your request' => 'Päringu protsessimisel tekkis viga',
     'Are you sure you want to block this user?' => 'Oled kindel, et tahad selle kasutaja blokeerid?',
     'Are you sure you want to confirm this user?' => 'Oled kindel, et tahad selle kasutaja kinnitada?',

src/User/resources/i18n/fa-IR/usuario.php

@@ -28,7 +28,7 @@ return [
     'Account details have been updated' => '',
     'Account settings' => '',
     'Already registered? Sign in!' => '',
-    'An email has been sent with instructions for resetting your password' => '',
+    'An email with instructions to create a new password has been sent to {email} if it is associated with an {appName} account. Your existing password has not been changed.' => '',
     'An error occurred processing your request' => '',
     'Are you sure you want to block this user?' => '',
     'Are you sure you want to confirm this user?' => '',
@@ -175,6 +175,7 @@ return [
     'Roles' => '',
     'Rule' => '',
     'Rule class must extend "yii\\rbac\\Rule".' => '',
+    'Rule class name' => '',
     'Rule name' => '',
     'Rule name {0} is already in use' => '',
     'Rule {0} does not exists' => '',
@@ -182,6 +183,7 @@ return [
     'Rules' => '',
     'Save' => '',
     'Scan the QrCode with Google Authenticator App, then insert its temporary code on the box and submit.' => '',
+    'Select rule...' => '',
     'Send password recovery email' => '',
     'Sign in' => '',
     'Sign up' => '',
@@ -271,6 +273,7 @@ return [
     '{0, date, MMMM dd, YYYY HH:mm}' => '',
     '{0} cannot be blank.' => '',
     'A message has been sent to your email address. ' => '@@@@',
+    'An email has been sent with instructions for resetting your password' => '@@@@',
     'Awesome, almost there. ' => '@@@@',
     'Class "{0}" does not exist' => '@@@@',
     'Disable Two-Factor Auth' => '@@@@',

src/User/resources/i18n/fi/usuario.php

@@ -28,7 +28,7 @@ return [
     'Account details have been updated' => '',
     'Account settings' => '',
     'Already registered? Sign in!' => '',
-    'An email has been sent with instructions for resetting your password' => '',
+    'An email with instructions to create a new password has been sent to {email} if it is associated with an {appName} account. Your existing password has not been changed.' => '',
     'An error occurred processing your request' => '',
     'Are you sure you want to block this user?' => '',
     'Are you sure you want to confirm this user?' => '',
@@ -175,6 +175,7 @@ return [
     'Roles' => '',
     'Rule' => '',
     'Rule class must extend "yii\\rbac\\Rule".' => '',
+    'Rule class name' => '',
     'Rule name' => '',
     'Rule name {0} is already in use' => '',
     'Rule {0} does not exists' => '',
@@ -182,6 +183,7 @@ return [
     'Rules' => '',
     'Save' => '',
     'Scan the QrCode with Google Authenticator App, then insert its temporary code on the box and submit.' => '',
+    'Select rule...' => '',
     'Send password recovery email' => '',
     'Sign in' => '',
     'Sign up' => '',
@@ -271,6 +273,7 @@ return [
     '{0, date, MMMM dd, YYYY HH:mm}' => '',
     '{0} cannot be blank.' => '',
     'A message has been sent to your email address. ' => '@@@@',
+    'An email has been sent with instructions for resetting your password' => '@@@@',
     'Awesome, almost there. ' => '@@@@',
     'Class "{0}" does not exist' => '@@@@',
     'Disable Two-Factor Auth' => '@@@@',

src/User/resources/i18n/fr/usuario.php

@@ -28,7 +28,7 @@ return [
     'Account details have been updated' => '',
     'Account settings' => '',
     'Already registered? Sign in!' => '',
-    'An email has been sent with instructions for resetting your password' => '',
+    'An email with instructions to create a new password has been sent to {email} if it is associated with an {appName} account. Your existing password has not been changed.' => '',
     'An error occurred processing your request' => '',
     'Are you sure you want to block this user?' => '',
     'Are you sure you want to confirm this user?' => '',
@@ -175,6 +175,7 @@ return [
     'Roles' => '',
     'Rule' => '',
     'Rule class must extend "yii\\rbac\\Rule".' => '',
+    'Rule class name' => '',
     'Rule name' => '',
     'Rule name {0} is already in use' => '',
     'Rule {0} does not exists' => '',
@@ -182,6 +183,7 @@ return [
     'Rules' => '',
     'Save' => '',
     'Scan the QrCode with Google Authenticator App, then insert its temporary code on the box and submit.' => '',
+    'Select rule...' => '',
     'Send password recovery email' => '',
     'Sign in' => '',
     'Sign up' => '',
@@ -271,6 +273,7 @@ return [
     '{0, date, MMMM dd, YYYY HH:mm}' => '',
     '{0} cannot be blank.' => '',
     'A message has been sent to your email address. ' => '@@@@',
+    'An email has been sent with instructions for resetting your password' => '@@@@',
     'Awesome, almost there. ' => '@@@@',
     'Class "{0}" does not exist' => '@@@@',
     'Disable Two-Factor Auth' => '@@@@',

src/User/resources/i18n/hr/usuario.php

@@ -28,7 +28,7 @@ return [
     'Account details have been updated' => '',
     'Account settings' => '',
     'Already registered? Sign in!' => '',
-    'An email has been sent with instructions for resetting your password' => '',
+    'An email with instructions to create a new password has been sent to {email} if it is associated with an {appName} account. Your existing password has not been changed.' => '',
     'An error occurred processing your request' => '',
     'Are you sure you want to block this user?' => '',
     'Are you sure you want to confirm this user?' => '',
@@ -175,6 +175,7 @@ return [
     'Roles' => '',
     'Rule' => '',
     'Rule class must extend "yii\\rbac\\Rule".' => '',
+    'Rule class name' => '',
     'Rule name' => '',
     'Rule name {0} is already in use' => '',
     'Rule {0} does not exists' => '',
@@ -182,6 +183,7 @@ return [
     'Rules' => '',
     'Save' => '',
     'Scan the QrCode with Google Authenticator App, then insert its temporary code on the box and submit.' => '',
+    'Select rule...' => '',
     'Send password recovery email' => '',
     'Sign in' => '',
     'Sign up' => '',
@@ -271,6 +273,7 @@ return [
     '{0, date, MMMM dd, YYYY HH:mm}' => '',
     '{0} cannot be blank.' => '',
     'A message has been sent to your email address. ' => '@@@@',
+    'An email has been sent with instructions for resetting your password' => '@@@@',
     'Awesome, almost there. ' => '@@@@',
     'Class "{0}" does not exist' => '@@@@',
     'Disable Two-Factor Auth' => '@@@@',

src/User/resources/i18n/hu/usuario.php

@@ -17,8 +17,12 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
+    'An email with instructions to create a new password has been sent to {email} if it is associated with an {appName} account. Your existing password has not been changed.' => '',
+    'Rule class name' => '',
+    'Select rule...' => '',
     'Two factor authentication protects you in case of stolen credentials' => '',
     'A message has been sent to your email address. ' => '@@Üzenet érkezett az e-mail címedre.@@',
+    'An email has been sent with instructions for resetting your password' => '@@E-mailt küldtek a jelszó visszaállításával kapcsolatos utasításokkal@@',
     'Awesome, almost there. ' => '@@Hurrá, majdnem kész.@@',
     'Disable Two-Factor Auth' => '@@Letiltja a kétütemű hitelesítést@@',
     'Enable Two-factor auth' => '@@Engedélyezze a kétütemű hitelesítést@@',
@@ -48,7 +52,6 @@ return [
     'Account details have been updated' => 'A fiókadatok frissítve lettek',
     'Account settings' => 'Fiók beállítások',
     'Already registered? Sign in!' => 'Már regisztrált? Bejelentkezés!',
-    'An email has been sent with instructions for resetting your password' => 'E-mailt küldtek a jelszó visszaállításával kapcsolatos utasításokkal',
     'An error occurred processing your request' => 'Hiba történt a kérelem feldolgozása során',
     'Are you sure you want to block this user?' => 'Biztos benne, hogy letiltja ezt a felhasználót?',
     'Are you sure you want to confirm this user?' => 'Biztosan megerősíted ezt a felhasználót?',

src/User/resources/i18n/it/usuario.php

@@ -17,9 +17,9 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'Two factor authentication protects you in case of stolen credentials' => '',
+    'An email with instructions to create a new password has been sent to {email} if it is associated with an {appName} account. Your existing password has not been changed.' => '',
     '{0, date, MMM dd, YYYY HH:mm}' => '',
-    'Two factor authentication protects you against stolen credentials' => '@@L\'autenticazione a due fattori può proteggerti dal furto di credenziali@@',
+    'An email has been sent with instructions for resetting your password' => '@@È stata inviata un\'email con le istruzioni per azzerare la tua password@@',
     '(not set)' => '(non impostato)',
     'A confirmation message has been sent to your new email address' => 'È stato inviato un messaggio di conferma al tuo nuovo indirizzo email',
     'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => 'È stato inviato un messaggio al tuo indirizzo email. Contiene un collegamento di verifica che devi aprire per completare la registrazione.',
@@ -30,8 +30,7 @@ return [
     'Account details' => 'Dettagli account',
     'Account details have been updated' => 'I dettagli del tuo account sono stati aggiornati',
     'Account settings' => 'Impostazioni account',
-    'Already registered? Sign in!' => 'Già registrato? Acccedi!',
+    'Already registered? Sign in!' => 'Già registrato? Accedi!',
-    'An email has been sent with instructions for resetting your password' => 'È stata inviata un\'email con le istruzioni per azzerare la tua password',
     'An error occurred processing your request' => 'Si è verificato un errore durante l\'elaborazione della richiesta',
     'Are you sure you want to block this user?' => 'Sicuro di voler bloccare questo utente?',
     'Are you sure you want to confirm this user?' => 'Sicuro di voler confermare questo utente?',
@@ -49,7 +48,7 @@ return [
     'Authorization item successfully created.' => 'Elemento di autorizzazione creato con successo.',
     'Authorization item successfully removed.' => 'Elemento di autorizzazione eliminato con successo.',
     'Authorization item successfully updated.' => 'Elemento di autorizzazione aggiornato con successo.',
-    'Authorization rule has been added.' => 'Regola di autoerizzazione aggiunta.',
+    'Authorization rule has been added.' => 'Regola di autorizzazione aggiunta.',
     'Authorization rule has been removed.' => 'Regola di autorizzazione rimossa.',
     'Authorization rule has been updated.' => 'Regola di autorizzazione modificata.',
     'Awesome, almost there. Now you need to click the confirmation link sent to your new email address.' => 'Fantastico, ci siamo quasi. Ora devi solo visitare il collegamento di conferma che è stato inviato al tuo nuovo indirizzo email.',
@@ -178,6 +177,7 @@ return [
     'Roles' => 'Ruoli',
     'Rule' => 'ruolo',
     'Rule class must extend "yii\\rbac\\Rule".' => 'La classe della regola deve estendere "yii\\rbac\\Rule".',
+    'Rule class name' => 'Nome classe regola',
     'Rule name' => 'Nome regola',
     'Rule name {0} is already in use' => 'Regola {0} già in uso',
     'Rule {0} does not exists' => 'La regola {0} non esiste',
@@ -185,6 +185,7 @@ return [
     'Rules' => 'Regole',
     'Save' => 'Salva',
     'Scan the QrCode with Google Authenticator App, then insert its temporary code on the box and submit.' => 'Scansiona il codice QR con l\'applicazione Google Authenticator, poi inserisci il codice temporaneo nel riquadro ed invia.',
+    'Select rule...' => 'Seleziona una regola...',
     'Send password recovery email' => 'Invia email di recupero password',
     'Sign in' => 'Accedi',
     'Sign up' => 'Registrati',
@@ -207,6 +208,7 @@ return [
     'Two Factor Authentication (2FA)' => 'Autenticazione a due fattori (2FA)',
     'Two factor authentication code' => 'Codice di autenticazione a due fattori',
     'Two factor authentication has been disabled.' => 'Autenticazione a due fattori disabilitata.',
+    'Two factor authentication protects you in case of stolen credentials' => 'L\'autenticazione a due fattura ti protegge in caso di furto di credenziali',
     'Two factor authentication successfully enabled.' => 'Autenticazione a due fattori abilitata con successo.',
     'Unable to confirm user. Please, try again.' => 'Impossibile confermare l\'utente, per favore ritenta.',
     'Unable to create an account.' => 'Impossibile creare l\'account.',

src/User/resources/i18n/kk/usuario.php

@@ -28,7 +28,7 @@ return [
     'Account details have been updated' => '',
     'Account settings' => '',
     'Already registered? Sign in!' => '',
-    'An email has been sent with instructions for resetting your password' => '',
+    'An email with instructions to create a new password has been sent to {email} if it is associated with an {appName} account. Your existing password has not been changed.' => '',
     'An error occurred processing your request' => '',
     'Are you sure you want to block this user?' => '',
     'Are you sure you want to confirm this user?' => '',
@@ -175,6 +175,7 @@ return [
     'Roles' => '',
     'Rule' => '',
     'Rule class must extend "yii\\rbac\\Rule".' => '',
+    'Rule class name' => '',
     'Rule name' => '',
     'Rule name {0} is already in use' => '',
     'Rule {0} does not exists' => '',
@@ -182,6 +183,7 @@ return [
     'Rules' => '',
     'Save' => '',
     'Scan the QrCode with Google Authenticator App, then insert its temporary code on the box and submit.' => '',
+    'Select rule...' => '',
     'Send password recovery email' => '',
     'Sign in' => '',
     'Sign up' => '',
@@ -271,6 +273,7 @@ return [
     '{0, date, MMMM dd, YYYY HH:mm}' => '',
     '{0} cannot be blank.' => '',
     'A message has been sent to your email address. ' => '@@@@',
+    'An email has been sent with instructions for resetting your password' => '@@@@',
     'Awesome, almost there. ' => '@@@@',
     'Class "{0}" does not exist' => '@@@@',
     'Disable Two-Factor Auth' => '@@@@',

src/User/resources/i18n/lt/usuario.php

@@ -28,7 +28,7 @@ return [
     'Account details have been updated' => '',
     'Account settings' => '',
     'Already registered? Sign in!' => '',
-    'An email has been sent with instructions for resetting your password' => '',
+    'An email with instructions to create a new password has been sent to {email} if it is associated with an {appName} account. Your existing password has not been changed.' => '',
     'An error occurred processing your request' => '',
     'Are you sure you want to block this user?' => '',
     'Are you sure you want to confirm this user?' => '',
@@ -175,6 +175,7 @@ return [
     'Roles' => '',
     'Rule' => '',
     'Rule class must extend "yii\\rbac\\Rule".' => '',
+    'Rule class name' => '',
     'Rule name' => '',
     'Rule name {0} is already in use' => '',
     'Rule {0} does not exists' => '',
@@ -182,6 +183,7 @@ return [
     'Rules' => '',
     'Save' => '',
     'Scan the QrCode with Google Authenticator App, then insert its temporary code on the box and submit.' => '',
+    'Select rule...' => '',
     'Send password recovery email' => '',
     'Sign in' => '',
     'Sign up' => '',
@@ -271,6 +273,7 @@ return [
     '{0, date, MMMM dd, YYYY HH:mm}' => '',
     '{0} cannot be blank.' => '',
     'A message has been sent to your email address. ' => '@@@@',
+    'An email has been sent with instructions for resetting your password' => '@@@@',
     'Awesome, almost there. ' => '@@@@',
     'Class "{0}" does not exist' => '@@@@',
     'Disable Two-Factor Auth' => '@@@@',

src/User/resources/i18n/nl/usuario.php

@@ -17,8 +17,12 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
+    'An email with instructions to create a new password has been sent to {email} if it is associated with an {appName} account. Your existing password has not been changed.' => '',
+    'Rule class name' => '',
+    'Select rule...' => '',
     'Two factor authentication protects you in case of stolen credentials' => '',
     'A message has been sent to your email address. ' => '@@Een bericht werd naar jouw emailadres verzonden@@',
+    'An email has been sent with instructions for resetting your password' => '@@Er werd een email verstuurd met instructies om jouw wachtwoord te resetten@@',
     'Awesome, almost there. ' => '@@Super, bijna klaar.@@',
     'Class "{0}" does not exist' => '@@Class "{0} bestaat niet@@',
     'Disable Two-Factor Auth' => '@@Tweetraps authenticatie uitschakelen@@',
@@ -54,7 +58,6 @@ return [
     'Account details have been updated' => 'Account details werden geupdate',
     'Account settings' => 'Account instellingen',
     'Already registered? Sign in!' => 'Reeds geregistreerd? Log in!',
-    'An email has been sent with instructions for resetting your password' => 'Er werd een email verstuurd met instructies om jouw wachtwoord te resetten',
     'An error occurred processing your request' => 'Een error trad op terwijl we uw aanvraag verwerkten',
     'Are you sure you want to block this user?' => 'Ben je zeker dat je deze gebruiker wil blokkeren?',
     'Are you sure you want to confirm this user?' => 'Ben je zeker dat je deze gebruiker wil bevestigen?',

src/User/resources/i18n/pl/usuario.php

@@ -17,7 +17,11 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
+    'An email with instructions to create a new password has been sent to {email} if it is associated with an {appName} account. Your existing password has not been changed.' => '',
+    'Rule class name' => '',
+    'Select rule...' => '',
     'Two factor authentication protects you in case of stolen credentials' => '',
+    'An email has been sent with instructions for resetting your password' => '@@Email z instrukcją resetowania hasła został wysłany@@',
     'Disable Two-Factor Auth' => '@@Wyłącz uwierzytelnianie dwuetapowe@@',
     'Enable Two-factor auth' => '@@Włącz uwierzytelnianie dwuetapowe@@',
     'I aggree processing of my personal data and the use of cookies 
@@ -46,7 +50,6 @@ return [
     'Account details have been updated' => 'Szczegóły konta zostały zaktualizowane',
     'Account settings' => 'Ustawienia konta',
     'Already registered? Sign in!' => 'Masz już konto? Zaloguj się!',
-    'An email has been sent with instructions for resetting your password' => 'Email z instrukcją resetowania hasła został wysłany',
     'An error occurred processing your request' => 'Wystąpił błąd podczas przetwarzania Twojego zapytania',
     'Are you sure you want to block this user?' => 'Czy na pewno chcesz zablokować tego użytkownika?',
     'Are you sure you want to confirm this user?' => 'Czy na pewno chcesz aktywować tego użytkownika?',
@@ -285,7 +288,7 @@ return [
     'Your personal information has been removed' => 'Twoje dane osobowe zostały usunięte',
     'Your profile has been updated' => 'Twój profil został zaktualizowany',
     'privacy policy' => 'polityką prywatności',
-    '{0, date, MMM dd, YYYY HH:mm}' => '@@@@',
+    '{0, date, MMM dd, YYYY HH:mm}' => '{0, date, dd MMM YYYY, HH:mm}',
     '{0, date, MMMM dd, YYYY HH:mm}' => '{0, date, dd MMMM YYYY, HH:mm}',
     '{0} cannot be blank.' => '{0} nie może pozostać bez wartości',
 ];

src/User/resources/i18n/pt-BR/usuario.php

@@ -17,8 +17,12 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
+    'An email with instructions to create a new password has been sent to {email} if it is associated with an {appName} account. Your existing password has not been changed.' => '',
+    'Rule class name' => '',
+    'Select rule...' => '',
     'Two factor authentication protects you in case of stolen credentials' => '',
     'A message has been sent to your email address. ' => '@@Uma mensagem foi enviada para o seu endereço de e-mail.@@',
+    'An email has been sent with instructions for resetting your password' => '@@Um e-mail foi enviado com instruções para redefinir sua senha@@',
     'Awesome, almost there. ' => '@@Incrível, quase lá.@@',
     'Class "{0}" does not exist' => '@@A classe "{0}" não existe@@',
     'Disable Two-Factor Auth' => '@@Desabilitar autenticação em dois fatores@@',
@@ -54,7 +58,6 @@ return [
     'Account details have been updated' => 'Os detalhes da conta foram atualizados',
     'Account settings' => 'Configurações da conta',
     'Already registered? Sign in!' => 'Já registrado? Acesse!',
-    'An email has been sent with instructions for resetting your password' => 'Um e-mail foi enviado com instruções para redefinir sua senha',
     'An error occurred processing your request' => 'Ocorreu um erro ao processar seu pedido',
     'Are you sure you want to block this user?' => 'Tem certeza de que deseja bloquear esse usuário?',
     'Are you sure you want to confirm this user?' => 'Tem certeza de que deseja confirmar esse usuário?',
@@ -293,7 +296,7 @@ return [
     'Your personal information has been removed' => 'Suas informações pessoais foram removidas',
     'Your profile has been updated' => 'Seu perfil foi atualizado',
     'privacy policy' => 'política de Privacidade',
-    '{0, date, MMM dd, YYYY HH:mm}' => '@@@@',
+    '{0, date, MMM dd, YYYY HH:mm}' => '{0, date, MMM dd, YYYY HH:mm}',
     '{0, date, MMMM dd, YYYY HH:mm}' => '{0, date, MMMM dd, YYYY HH:mm}',
     '{0} cannot be blank.' => '{0} não pode estar em branco',
 ];

src/User/resources/i18n/pt-PT/usuario.php

@@ -17,7 +17,48 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
+    'An email with instructions to create a new password has been sent to {email} if it is associated with an {appName} account. Your existing password has not been changed.' => '',
+    'Awesome, almost there. Now you need to click the confirmation link sent to your new email address.' => '',
+    'Awesome, almost there. Now you need to click the confirmation link sent to your old email address.' => '',
+    'Children' => '',
+    'Class' => '',
+    'Email' => '',
+    'Gravatar email' => '',
+    'Items' => '',
+    'Password' => '',
+    'Rule class name' => '',
+    'Select rule...' => '',
     'Two factor authentication protects you in case of stolen credentials' => '',
+    'VKontakte' => '',
+    'Website' => '',
+    'Yandex' => '',
+    '{0, date, MMMM dd, YYYY HH:mm}' => '',
+    'A message has been sent to your email address. ' => '@@@@',
+    'An email has been sent with instructions for resetting your password' => '@@Foi enviado um email com as instruções para restaurar a sua password@@',
+    'Awesome, almost there. ' => '@@@@',
+    'Class "{0}" does not exist' => '@@@@',
+    'Disable Two-Factor Auth' => '@@@@',
+    'Enable Two-factor auth' => '@@@@',
+    'I aggree processing of my personal data and the use of cookies 
+            to facilitate the operation of this site. For more information read our {privacyPolicy}' => '@@@@',
+    'I aggree processing of my personal data and the use of cookies to facilitate the operation of this site. For more information read our {privacyPolicy}' => '@@@@',
+    'Invalid two-factor code' => '@@@@',
+    'Last login' => '@@@@',
+    'Registration ip' => '@@@@',
+    'Rule class can not be instantiated' => '@@@@',
+    'Rule class must extend "yii\\rbac\\Rule"' => '@@@@',
+    'This will disable two-factor auth. Are you sure?' => '@@@@',
+    'Two Factor Authentication' => '@@@@',
+    'Two factor authentication protects you against stolen credentials' => '@@Autenticação de dois passos protege-o do roubo de credenciais de acesso@@',
+    'Two factor successfully enabled.' => '@@@@',
+    'Two-Factor Authentication' => '@@@@',
+    'Two-factor auth protects you against stolen credentials' => '@@@@',
+    'Two-factor authentication code' => '@@@@',
+    'Two-factor authorization has been disabled.' => '@@@@',
+    'Two-factor code' => '@@@@',
+    'Unable to disable two-factor authorization.' => '@@@@',
+    'We couldn\'t re-send the mail to confirm your address. ' => '@@@@',
+    'We have sent confirmation links to both old and new email addresses. ' => '@@@@',
     '(not set)' => '(não selecionado)',
     'A confirmation message has been sent to your new email address' => 'Foi enviada uma mensagem de confirmação para o seu endereço de email',
     'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => 'Foi enviada uma mensagem para o seu endereço de email com o link de confirmação para completar o seu registo.',
@@ -29,7 +70,6 @@ return [
     'Account details have been updated' => 'Detalhes da conta foram atualizados',
     'Account settings' => 'Definições da conta',
     'Already registered? Sign in!' => 'Já está registado? Entre na sua conta!',
-    'An email has been sent with instructions for resetting your password' => 'Foi enviado um email com as instruções para restaurar a sua password',
     'An error occurred processing your request' => 'Ocorreu um erro ao processar o seu pedido',
     'Are you sure you want to block this user?' => 'Tem a certeza que pretende bloquear este utilizador?',
     'Are you sure you want to confirm this user?' => 'Tem a certeza que pretende confirmar este utilizador?',
@@ -50,8 +90,6 @@ return [
     'Authorization rule has been added.' => 'Regra de autorização foi adicionada',
     'Authorization rule has been removed.' => 'Regra de autorização foi removida',
     'Authorization rule has been updated.' => 'Regra de autorização foi atualizada',
-    'Awesome, almost there. Now you need to click the confirmation link sent to your new email address.' => '',
-    'Awesome, almost there. Now you need to click the confirmation link sent to your old email address.' => '',
     'Back to privacy settings' => 'Voltar para opções de privacidade',
     'Bio' => 'Biografia',
     'Block' => 'Bloquear',
@@ -60,8 +98,6 @@ return [
     'Cancel' => 'Cancelar',
     'Cannot assign role "{0}" as the AuthManager is not configured on your console application.' => 'Não é possível atribuir o cargo "{0}" uma vez que o AuthManager não está configurado na sua aplicação da consola.',
     'Change your avatar at Gravatar.com' => 'Altere o seu avatar em Gravatar.com',
-    'Children' => '',
-    'Class' => '',
     'Close' => 'Fechar',
     'Complete password reset on {0}' => 'Concluir o restauro de password em {0}',
     'Confirm' => 'Confirmar',
@@ -95,7 +131,6 @@ return [
     'Disconnect' => 'Desligar',
     'Don\'t have an account? Sign up!' => 'Não tem conta? Registe-se!',
     'Download my data' => 'Descarregar os meus dados',
-    'Email' => '',
     'Email (public)' => 'Email (público)',
     'Enable' => 'Ativar',
     'Enable two factor authentication' => 'Ativar autenticação de dois passos',
@@ -108,7 +143,6 @@ return [
     'Finish' => 'Concluir',
     'Force password change at next login' => 'Forçar alteração de password no próximo login',
     'Forgot password?' => 'Esqueceu a sua senha?',
-    'Gravatar email' => '',
     'Hello' => 'Olá',
     'Here you can download your personal data in a comma separated values format.' => 'Aqui pode descarregar os seus dados pessoais num ficheiro separado por virgulas.',
     'I agree processing of my personal data and the use of cookies to facilitate the operation of this site. For more information read our {privacyPolicy}' => 'Eu aceito o processamento dos meus dados pessoais e o uso de cookies para facilitar as operações neste site. Para mais informações leia a nossa {privacyPolicy}',
@@ -126,7 +160,6 @@ return [
     'Invalid two factor authentication code' => 'Autenticação de dois passos inválida',
     'Invalid value' => 'Valor inválido',
     'It will be deleted forever' => 'Será eliminado definitivamente',
-    'Items' => '',
     'Joined on {0, date}' => 'Aderiu em {0, date}',
     'Last login IP' => 'IP do último login',
     'Last login time' => 'Último login',
@@ -148,7 +181,6 @@ return [
     'Not found' => 'Não encontrado',
     'Once you delete your account, there is no going back' => 'Após eliminar a sua conta, não será possível recuperá-la.',
     'Once you have deleted your data, you will not longer be able to sign in with this account.' => 'Após eliminar os seus dados, não poderá mais entrar com esta conta.',
-    'Password' => '',
     'Password age' => 'Idade da password',
     'Password has been changed' => 'A password foi alterada',
     'Permissions' => 'Permissões',
@@ -238,16 +270,13 @@ return [
     'User will be required to change password at next login' => 'O utilizador necessitará de alterar a password no próximo login',
     'Username' => 'Utilizador',
     'Users' => 'Utilizadores',
-    'VKontakte' => '',
     'Verification failed. Please, enter new code.' => 'Verificação falhou. Por favor insira novo código.',
     'We couldn\'t re-send the mail to confirm your address. Please, verify is the correct email or if it has been confirmed already.' => 'Não foi possível reenviar o email de confirmação para o seu endereço. Por favor, verifique se é o email correto ou se já foi confirmado.',
     'We have generated a password for you' => 'Gerámos uma nova password para si',
     'We have received a request to change the email address for your account on {0}' => 'Recebemos um pedido para alterar o endereço de email para a sua conta em {0}',
     'We have received a request to reset the password for your account on {0}' => 'Recebemos um pedido para restaura a password da sua conta em {0}',
     'We have sent confirmation links to both old and new email addresses. You must click both links to complete your request.' => 'Enviámos links de confirmação para ambas as contas de email, antiga e nova. Deve seguir as instruções em ambos os emails para concluir o pedido.',
-    'Website' => '',
     'Welcome to {0}' => 'Bem-vindo a {0}',
-    'Yandex' => '',
     'You are about to delete all your personal data from this site.' => 'Está prestes a apagar todos os seus dados pessoais deste site.',
     'You can assign multiple roles or permissions to user by using the form below' => 'Pode atribuir vários cargos ou permissões ao utilizador através do formulário abaixo',
     'You can connect multiple accounts to be able to log in using them' => 'Pode ligar múltiplas contas de forma a poder entrar através delas',
@@ -268,32 +297,6 @@ return [
     'Your personal information has been removed' => 'Os seus dados pessoais foram removidos',
     'Your profile has been updated' => 'O seu perfil foi atualziado',
     'privacy policy' => 'politica de privacidade',
-    '{0, date, MMMM dd, YYYY HH:mm}' => '',
-    '{0} cannot be blank.' => '{0} não pode ficar vazio.',
-    'A message has been sent to your email address. ' => '@@@@',
-    'Awesome, almost there. ' => '@@@@',
-    'Class "{0}" does not exist' => '@@@@',
-    'Disable Two-Factor Auth' => '@@@@',
-    'Enable Two-factor auth' => '@@@@',
-    'I aggree processing of my personal data and the use of cookies 
-            to facilitate the operation of this site. For more information read our {privacyPolicy}' => '@@@@',
-    'I aggree processing of my personal data and the use of cookies to facilitate the operation of this site. For more information read our {privacyPolicy}' => '@@@@',
-    'Invalid two-factor code' => '@@@@',
-    'Last login' => '@@@@',
-    'Registration ip' => '@@@@',
-    'Rule class can not be instantiated' => '@@@@',
-    'Rule class must extend "yii\\rbac\\Rule"' => '@@@@',
-    'This will disable two-factor auth. Are you sure?' => '@@@@',
-    'Two Factor Authentication' => '@@@@',
-    'Two factor authentication protects you against stolen credentials' => '@@Autenticação de dois passos protege-o do roubo de credenciais de acesso@@',
-    'Two factor successfully enabled.' => '@@@@',
-    'Two-Factor Authentication' => '@@@@',
-    'Two-factor auth protects you against stolen credentials' => '@@@@',
-    'Two-factor authentication code' => '@@@@',
-    'Two-factor authorization has been disabled.' => '@@@@',
-    'Two-factor code' => '@@@@',
-    'Unable to disable two-factor authorization.' => '@@@@',
-    'We couldn\'t re-send the mail to confirm your address. ' => '@@@@',
-    'We have sent confirmation links to both old and new email addresses. ' => '@@@@',
     '{0, date, MMM dd, YYYY HH:mm}' => '@@@@',
+    '{0} cannot be blank.' => '{0} não pode ficar vazio.',
 ];

src/User/resources/i18n/ro/usuario.php

@@ -17,8 +17,12 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
+    'An email with instructions to create a new password has been sent to {email} if it is associated with an {appName} account. Your existing password has not been changed.' => '',
+    'Rule class name' => '',
+    'Select rule...' => '',
     'Two factor authentication protects you in case of stolen credentials' => '',
     'A message has been sent to your email address. ' => '@@A fost trimis un mesaj la adresa dvs. de e-mail.@@',
+    'An email has been sent with instructions for resetting your password' => '@@A fost trimis un e-mail cu instrucțiuni pentru resetarea parolei@@',
     'Awesome, almost there. ' => '@@Minunat, aproape gata.@@',
     'Disable Two-Factor Auth' => '@@Dezactivați autentificarea cu două factori@@',
     'Enable Two-factor auth' => '@@Activați Auth@@',
@@ -50,7 +54,6 @@ return [
     'Account details have been updated' => 'Detaliile contului au fost actualizate',
     'Account settings' => 'Setările contului',
     'Already registered? Sign in!' => 'Deja înregistrat? Conectare!',
-    'An email has been sent with instructions for resetting your password' => 'A fost trimis un e-mail cu instrucțiuni pentru resetarea parolei',
     'An error occurred processing your request' => 'A apărut o eroare la procesarea solicitării dvs.',
     'Are you sure you want to block this user?' => 'Sigur doriți să blocați acest utilizator?',
     'Are you sure you want to confirm this user?' => 'Sigur doriți să confirmați acest utilizator?',
@@ -289,7 +292,7 @@ return [
     'Your personal information has been removed' => 'Informațiile dvs. personale au fost eliminate',
     'Your profile has been updated' => 'Profilul dvs. a fost actualizat',
     'privacy policy' => 'politica de confidentialitate',
-    '{0, date, MMM dd, YYYY HH:mm}' => '@@@@',
+    '{0, date, MMM dd, YYYY HH:mm}' => '{0, data, MMM dd, AAAA HH: mm}',
     '{0, date, MMMM dd, YYYY HH:mm}' => '{0, data, MMMM dd, AAAA HH: mm}',
     '{0} cannot be blank.' => '{0} nu poate fi gol.',
 ];

src/User/resources/i18n/ru/usuario.php

@@ -17,8 +17,12 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'Two factor authentication protects you in case of stolen credentials' => '',
+    'An email with instructions to create a new password has been sent to {email} if it is associated with an {appName} account. Your existing password has not been changed.' => 'Письмо с инструкциями по созданию нового пароля было выслано на {email}, в случае если данный адрес связан с {appName} аккаунтом',
+    'Rule class name' => 'Имя класса правила',
+    'Select rule...' => 'Выберите правило...',
+    'Two factor authentication protects you in case of stolen credentials' => 'Двухфакторная аутентификация защищает вас в случае кражи учетных данных',
     'A message has been sent to your email address. ' => '@@Сообщение было отправлено на вашу электронную почту@@',
+    'An email has been sent with instructions for resetting your password' => '@@Вам отправлено письмо с инструкциями по смене пароля@@',
     'Awesome, almost there. ' => '@@Замечательно, почти готово!@@',
     'Class "{0}" does not exist' => '@@Класс "{0}" не найден@@',
     'Disable Two-Factor Auth' => '@@Отключить двухфакторную авторизацию@@',
@@ -52,7 +56,6 @@ return [
     'Account details have been updated' => 'Аккаунт был обновлен',
     'Account settings' => 'Настройки аккаунта',
     'Already registered? Sign in!' => 'Уже зарегистрированы? Войдите!',
-    'An email has been sent with instructions for resetting your password' => 'Вам отправлено письмо с инструкциями по смене пароля',
     'An error occurred processing your request' => 'Во время выполнения запроса произошла ошибка',
     'Are you sure you want to block this user?' => 'Вы действительно хотите заблокировать этого пользователя?',
     'Are you sure you want to confirm this user?' => 'Вы уверены, что хотите подтвердить аккаунт пользователя?',
@@ -291,7 +294,7 @@ return [
     'Your personal information has been removed' => 'Ваша персональная информация удалена',
     'Your profile has been updated' => 'Настройки профиля были успешно сохранены',
     'privacy policy' => 'политикой конфиденциальности',
-    '{0, date, MMM dd, YYYY HH:mm}' => '@@@@',
+    '{0, date, MMM dd, YYYY HH:mm}' => '{0, date, d MMM YYYY в HH:mm}',
     '{0, date, MMMM dd, YYYY HH:mm}' => '{0, date, d MMMM YYYY в HH:mm}',
     '{0} cannot be blank.' => '{0} не может быть пустым.',
 ];

src/User/resources/i18n/th/usuario.php

@@ -28,7 +28,7 @@ return [
     'Account details have been updated' => '',
     'Account settings' => '',
     'Already registered? Sign in!' => '',
-    'An email has been sent with instructions for resetting your password' => '',
+    'An email with instructions to create a new password has been sent to {email} if it is associated with an {appName} account. Your existing password has not been changed.' => '',
     'An error occurred processing your request' => '',
     'Are you sure you want to block this user?' => '',
     'Are you sure you want to confirm this user?' => '',
@@ -175,6 +175,7 @@ return [
     'Roles' => '',
     'Rule' => '',
     'Rule class must extend "yii\\rbac\\Rule".' => '',
+    'Rule class name' => '',
     'Rule name' => '',
     'Rule name {0} is already in use' => '',
     'Rule {0} does not exists' => '',
@@ -182,6 +183,7 @@ return [
     'Rules' => '',
     'Save' => '',
     'Scan the QrCode with Google Authenticator App, then insert its temporary code on the box and submit.' => '',
+    'Select rule...' => '',
     'Send password recovery email' => '',
     'Sign in' => '',
     'Sign up' => '',
@@ -271,6 +273,7 @@ return [
     '{0, date, MMMM dd, YYYY HH:mm}' => '',
     '{0} cannot be blank.' => '',
     'A message has been sent to your email address. ' => '@@@@',
+    'An email has been sent with instructions for resetting your password' => '@@@@',
     'Awesome, almost there. ' => '@@@@',
     'Class "{0}" does not exist' => '@@@@',
     'Disable Two-Factor Auth' => '@@@@',

src/User/resources/i18n/tr-TR/usuario.php

@@ -28,7 +28,7 @@ return [
     'Account details have been updated' => '',
     'Account settings' => '',
     'Already registered? Sign in!' => '',
-    'An email has been sent with instructions for resetting your password' => '',
+    'An email with instructions to create a new password has been sent to {email} if it is associated with an {appName} account. Your existing password has not been changed.' => '',
     'An error occurred processing your request' => '',
     'Are you sure you want to block this user?' => '',
     'Are you sure you want to confirm this user?' => '',
@@ -175,6 +175,7 @@ return [
     'Roles' => '',
     'Rule' => '',
     'Rule class must extend "yii\\rbac\\Rule".' => '',
+    'Rule class name' => '',
     'Rule name' => '',
     'Rule name {0} is already in use' => '',
     'Rule {0} does not exists' => '',
@@ -182,6 +183,7 @@ return [
     'Rules' => '',
     'Save' => '',
     'Scan the QrCode with Google Authenticator App, then insert its temporary code on the box and submit.' => '',
+    'Select rule...' => '',
     'Send password recovery email' => '',
     'Sign in' => '',
     'Sign up' => '',
@@ -271,6 +273,7 @@ return [
     '{0, date, MMMM dd, YYYY HH:mm}' => '',
     '{0} cannot be blank.' => '',
     'A message has been sent to your email address. ' => '@@@@',
+    'An email has been sent with instructions for resetting your password' => '@@@@',
     'Awesome, almost there. ' => '@@@@',
     'Class "{0}" does not exist' => '@@@@',
     'Disable Two-Factor Auth' => '@@@@',

src/User/resources/i18n/uk/usuario.php

@@ -28,7 +28,7 @@ return [
     'Account details have been updated' => '',
     'Account settings' => '',
     'Already registered? Sign in!' => '',
-    'An email has been sent with instructions for resetting your password' => '',
+    'An email with instructions to create a new password has been sent to {email} if it is associated with an {appName} account. Your existing password has not been changed.' => '',
     'An error occurred processing your request' => '',
     'Are you sure you want to block this user?' => '',
     'Are you sure you want to confirm this user?' => '',
@@ -175,6 +175,7 @@ return [
     'Roles' => '',
     'Rule' => '',
     'Rule class must extend "yii\\rbac\\Rule".' => '',
+    'Rule class name' => '',
     'Rule name' => '',
     'Rule name {0} is already in use' => '',
     'Rule {0} does not exists' => '',
@@ -182,6 +183,7 @@ return [
     'Rules' => '',
     'Save' => '',
     'Scan the QrCode with Google Authenticator App, then insert its temporary code on the box and submit.' => '',
+    'Select rule...' => '',
     'Send password recovery email' => '',
     'Sign in' => '',
     'Sign up' => '',
@@ -271,6 +273,7 @@ return [
     '{0, date, MMMM dd, YYYY HH:mm}' => '',
     '{0} cannot be blank.' => '',
     'A message has been sent to your email address. ' => '@@@@',
+    'An email has been sent with instructions for resetting your password' => '@@@@',
     'Awesome, almost there. ' => '@@@@',
     'Class "{0}" does not exist' => '@@@@',
     'Disable Two-Factor Auth' => '@@@@',

src/User/resources/i18n/vi/usuario.php

@@ -28,7 +28,7 @@ return [
     'Account details have been updated' => '',
     'Account settings' => '',
     'Already registered? Sign in!' => '',
-    'An email has been sent with instructions for resetting your password' => '',
+    'An email with instructions to create a new password has been sent to {email} if it is associated with an {appName} account. Your existing password has not been changed.' => '',
     'An error occurred processing your request' => '',
     'Are you sure you want to block this user?' => '',
     'Are you sure you want to confirm this user?' => '',
@@ -175,6 +175,7 @@ return [
     'Roles' => '',
     'Rule' => '',
     'Rule class must extend "yii\\rbac\\Rule".' => '',
+    'Rule class name' => '',
     'Rule name' => '',
     'Rule name {0} is already in use' => '',
     'Rule {0} does not exists' => '',
@@ -182,6 +183,7 @@ return [
     'Rules' => '',
     'Save' => '',
     'Scan the QrCode with Google Authenticator App, then insert its temporary code on the box and submit.' => '',
+    'Select rule...' => '',
     'Send password recovery email' => '',
     'Sign in' => '',
     'Sign up' => '',
@@ -271,6 +273,7 @@ return [
     '{0, date, MMMM dd, YYYY HH:mm}' => '',
     '{0} cannot be blank.' => '',
     'A message has been sent to your email address. ' => '@@@@',
+    'An email has been sent with instructions for resetting your password' => '@@@@',
     'Awesome, almost there. ' => '@@@@',
     'Class "{0}" does not exist' => '@@@@',
     'Disable Two-Factor Auth' => '@@@@',

src/User/resources/i18n/zh-CN/usuario.php

@@ -28,7 +28,7 @@ return [
     'Account details have been updated' => '',
     'Account settings' => '',
     'Already registered? Sign in!' => '',
-    'An email has been sent with instructions for resetting your password' => '',
+    'An email with instructions to create a new password has been sent to {email} if it is associated with an {appName} account. Your existing password has not been changed.' => '',
     'An error occurred processing your request' => '',
     'Are you sure you want to block this user?' => '',
     'Are you sure you want to confirm this user?' => '',
@@ -175,6 +175,7 @@ return [
     'Roles' => '',
     'Rule' => '',
     'Rule class must extend "yii\\rbac\\Rule".' => '',
+    'Rule class name' => '',
     'Rule name' => '',
     'Rule name {0} is already in use' => '',
     'Rule {0} does not exists' => '',
@@ -182,6 +183,7 @@ return [
     'Rules' => '',
     'Save' => '',
     'Scan the QrCode with Google Authenticator App, then insert its temporary code on the box and submit.' => '',
+    'Select rule...' => '',
     'Send password recovery email' => '',
     'Sign in' => '',
     'Sign up' => '',
@@ -271,6 +273,7 @@ return [
     '{0, date, MMMM dd, YYYY HH:mm}' => '',
     '{0} cannot be blank.' => '',
     'A message has been sent to your email address. ' => '@@@@',
+    'An email has been sent with instructions for resetting your password' => '@@@@',
     'Awesome, almost there. ' => '@@@@',
     'Class "{0}" does not exist' => '@@@@',
     'Disable Two-Factor Auth' => '@@@@',

src/User/resources/views/permission/_form.php

@@ -36,7 +36,7 @@ use yii\widgets\ActiveForm;
 <?= $form->field($model, 'rule')->widget(SelectizeDropDownList::class, [
     'items' => ArrayHelper::map(Yii::$app->getAuthManager()->getRules(), 'name', 'name'),
     'options' => [
-        'prompt' => 'Select rule...'
+        'prompt' => Yii::t('usuario', 'Select rule...'),
     ]
 ]) ?>
 

src/User/resources/views/rule/create.php

@@ -10,7 +10,7 @@
  */
 
 /**
- * @var \Da\User\Model\Role $model
+ * @var \Da\User\Model\Rule $model
  * @var $this               yii\web\View
  * @var $unassignedItems    string[]
  */

src/User/resources/views/rule/update.php

@@ -10,7 +10,7 @@
  */
 
 /**
- * @var \Da\User\Model\Role $model
+ * @var \Da\User\Model\Rule $model
  * @var $this               yii\web\View
  * @var $unassignedItems    string[]
  */

src/User/resources/views/settings/gdpr-delete.php

@@ -10,6 +10,7 @@
 
 use yii\widgets\ActiveForm;
 use yii\helpers\Html;
+
 /* @var $model \Da\User\Form\GdprDeleteForm */
 ?>
 
@@ -46,7 +47,7 @@ use yii\helpers\Html;
                 <hr>
                 <div class="row">
                     <div class="col-md-12 text-center">
-                        <?= Html::a(Yii::t('usuario','Back to privacy settings'),['/user/settings/privacy'],['class'=>'btn btn-info']) ?>
+                        <?= Html::a(Yii::t('usuario', 'Back to privacy settings'), ['/user/settings/privacy'], ['class' => 'btn btn-info']) ?>
                     </div>
                 </div>
                 <?php

src/User/resources/views/settings/privacy.php

@@ -54,7 +54,7 @@ $this->title = Yii::t('usuario', 'Privacy settings');
                             ) ?>
                         <?php else:
                             echo Html::a(Yii::t('usuario', 'Delete'),
-                                ['/user/settings/gdprdelete'],
+                                ['/user/settings/gdpr-delete'],
                                 [
                                     'class' => 'btn btn-danger',
                                     'id' => 'gdpr-del-button',

tests/_app/config/console.php

@@ -6,6 +6,8 @@ return [
     'aliases' => [
         '@Da/User' => dirname(dirname(dirname(__DIR__))) . '/src/User',
         '@tests' => dirname(dirname(__DIR__)),
+        '@bower' => '@vendor/bower-asset',
+        '@npm'   => '@vendor/npm-asset',
     ],
     'components' => [
         'log' => null,

tests/_app/config/test.php

@@ -8,7 +8,8 @@ return [
         '@Da/User' => dirname(dirname(dirname(__DIR__))) . '/src/User',
         '@tests' => dirname(dirname(__DIR__)),
         '@vendor' => VENDOR_DIR,
-        '@bower' => VENDOR_DIR . '/bower',
+        '@bower' => '@vendor/bower-asset',
+        '@npm'   => '@vendor/npm-asset',
     ],
     'bootstrap' => ['Da\User\Bootstrap'],
     'modules' => [

tests/functional/GdprCest.php

@@ -141,7 +141,7 @@ class GdprCest
         $I->amOnRoute('/user/settings/privacy');
         $I->see('Export my data', 'h3');
         $I->see('Delete my account', 'h3');
-        $I->amOnRoute('/user/settings/gdprdelete');
+        $I->amOnRoute('/user/settings/gdpr-delete');
         $I->fillField('#gdprdeleteform-password','wrongpassword');
         $I->click('Delete');
         $I->see('Invalid password');

tests/functional/RecoveryCept.php

@@ -20,7 +20,14 @@ $user = $I->grabFixture('user', 'unconfirmed');
 $I->fillField('#recoveryform-email', $user->email);
 $I->click('Continue');
 
-$I->see('An email has been sent with instructions for resetting your password');
+$I->see('An email with instructions to create a new password has been sent to ' . $user->email); // ... truncate full message text by email
+
+$I->amGoingTo('try to request recovery token for non-existing email');
+$I->amOnRoute('/user/recovery/request');
+$I->fillField('#recoveryform-email', 'any@email.com');
+$I->click('Continue');
+
+$I->see('An email with instructions to create a new password has been sent to ' . 'any@email.com');
 
 $I->amGoingTo('try to request recovery token');
 $I->amOnRoute('/user/recovery/request');
@@ -28,7 +35,7 @@ $user = $I->grabFixture('user', 'user');
 $I->fillField('#recoveryform-email', $user->email);
 $I->click('Continue');
 
-$I->see('An email has been sent with instructions for resetting your password');
+$I->see('An email with instructions to create a new password has been sent to ' . $user->email);
 $user = $I->grabRecord(User::className(), ['email' => $user->email]);
 $token = $I->grabRecord(Token::className(), ['user_id' => $user->id, 'type' => Token::TYPE_RECOVERY]);
 /** @var yii\swiftmailer\Message $message */