From e370d2e95a5253e14a198cd04db312df8c1ecaef Mon Sep 17 00:00:00 2001 From: Alessandro Briosi Date: Thu, 21 Jun 2018 18:10:36 +0200 Subject: [PATCH 01/51] Add documentation on how to apply/mark migrations to existing projects #172 --- .../migration-guide-from-dektrium-tools.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/docs/installation/migration-guide-from-dektrium-tools.md b/docs/installation/migration-guide-from-dektrium-tools.md index 8689567..efea972 100644 --- a/docs/installation/migration-guide-from-dektrium-tools.md +++ b/docs/installation/migration-guide-from-dektrium-tools.md @@ -11,6 +11,11 @@ composer remove dektrium/yii2-user composer remove dektrium/yii2-rbac ``` +## Install yii2-usuario +``` +composer add 2amigos/yii2-usuario +``` + ## Configuration Configure the `config/console.php` stuff: @@ -54,6 +59,19 @@ In `config/web.php` remove *module > rbac* configuration and change the *modules * In your extended model replace the `BaseUser` inheritance from `dektrium\user\models\User` to `Da\User\Model\User` * If you had controller remapping replace the inheritance from `dektrium\user\controllers\XX` to `Da\User\Controller\XX` +## Mark migrations as applied in an existing project + +If you already have a production project which has all the necessary user tables from dektrium simply run the following commands to +mark some migrations as already applied. + +``` +./yii migrate/mark "Da\User\Migration\m000000_000005_add_last_login_at" +./yii migrate/to "Da\User\Migration\m000000_000007_enable_password_expiration" +``` + +The first command will mark the migration as applied, the second will apply missing migrations. +The second command is optiona as a simple ```./yii migrate/up``` would apply all missing migrations anyway. + ## Rbac migrations [yii2-rbac](https://github.com/dektrium/yii2-rbac) had a nice tool which are rbac migrations, which helped writing new permissions and roles. From 856ea39929f90216bb8b6113b651d6a9a5020d1f Mon Sep 17 00:00:00 2001 From: Alessandro Briosi Date: Fri, 22 Jun 2018 11:07:41 +0200 Subject: [PATCH 02/51] fix typo --- docs/installation/migration-guide-from-dektrium-tools.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/installation/migration-guide-from-dektrium-tools.md b/docs/installation/migration-guide-from-dektrium-tools.md index efea972..5f77fb8 100644 --- a/docs/installation/migration-guide-from-dektrium-tools.md +++ b/docs/installation/migration-guide-from-dektrium-tools.md @@ -70,7 +70,7 @@ mark some migrations as already applied. ``` The first command will mark the migration as applied, the second will apply missing migrations. -The second command is optiona as a simple ```./yii migrate/up``` would apply all missing migrations anyway. +The second command is optional as a simple ```./yii migrate/up``` would apply all missing migrations anyway. ## Rbac migrations From 2e06355e72ffa705a2e5fd784bfdc8eb5291dadc Mon Sep 17 00:00:00 2001 From: WeeSee Date: Mon, 3 Dec 2018 09:30:10 +0100 Subject: [PATCH 03/51] completed german (de) translations (#294) --- src/User/resources/i18n/de/usuario.php | 128 +++++++++++++++---------- 1 file changed, 78 insertions(+), 50 deletions(-) diff --git a/src/User/resources/i18n/de/usuario.php b/src/User/resources/i18n/de/usuario.php index fc2db0f..fac3d32 100644 --- a/src/User/resources/i18n/de/usuario.php +++ b/src/User/resources/i18n/de/usuario.php @@ -17,75 +17,103 @@ * 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' => '', - 'Delete my account' => '', - 'Delete personal data' => '', - 'Deleted by GDPR request' => '', - 'Disable two factor authentication' => '', - 'Download my data' => '', - 'Enable two factor authentication' => '', - 'Export my data' => '', - 'Force password change at next login' => '', - 'Here you can download your personal data in a comma separated values format.' => '', - '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}' => '', - 'Invalid password' => '', - 'Invalid two factor authentication code' => '', - 'Last login IP' => '', - 'Last login time' => '', - 'Last password change' => '', - 'Once you have deleted your data, you will not longer be able to sign in with this account.' => '', - '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.' => '', - 'Two Factor Authentication (2FA)' => '', - 'Two factor authentication code' => '', - 'Two factor authentication has been disabled.' => '', - 'Two factor authentication protects you in case of stolen credentials' => '', - 'Two factor authentication successfully enabled.' => '', - 'Unable to disable Two factor authentication.' => '', - 'User will be required to change password at next login' => '', - 'You are about to delete all your personal data from this site.' => '', - 'Your consent is required to register' => '', - 'Your password has expired, you must change it now' => '', - 'Your personal information has been removed' => '', - 'privacy policy' => '', + '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.' + => 'Eine Email mit Hinweisen, wie ein Kennwort erstellt wirdm wurde an {email} gesendet, '. + 'sofern es mit dem Konto {appName} verbindund ist. Das aktuelle Kennwort wurde nicht geändert.', + 'Are you sure you wish the user to change their password at next login?' + => 'Sind Sie sicher, dass der benutzer sein Kennwort beim nächsten Anmeldenändern soll?', + 'Back to privacy settings' => 'Zurück zu Privatsphäre-Einstellungen', + 'Data processing consent' => 'Zustimmung zur Datenverarbeitung', + 'Delete my account' => 'Mein Benutzerkonto löschen', + 'Delete personal data' => 'Persönliche Daten löschen', + 'Deleted by GDPR request' => 'Geköscht gemäß DSGVO-Anforderung', + 'Disable two factor authentication' => 'Zwei-Faktor-Authentifizierung deaktivieren', + 'Download my data' => 'Eigene Daten herunterladen', + 'Enable two factor authentication' => 'Zwei-Faktor-Authentifizierung aktivieren', + 'Export my data' => 'Eigene Daten exportieren', + 'Force password change at next login' => 'Kennwort-Änderung beim nächsten Anmelden erzwingen', + 'Here you can download your personal data in a comma separated values format.' + => 'Hier können Sie eigene persönliche Daten in komma-separiertem Format herunterladen', + '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}' + => 'Ich stimme der Verarbeitung meiner persönlichen Daten und der Benutzung von Cookies zur '. + 'Vereinfachung der Benutzer dieses Services zu. Weitere Informationen stehen in unserer {privacyPolicy}', + 'Invalid password' => 'Ungültiges Kennwort', + 'Invalid two factor authentication code' => 'Ungültiger Zwei-Faktor-Authentifizierungs-Code', + 'Last login IP' => 'Letzte Anmeldung von IP', + 'Last login time' => 'Letzte Anmeldung', + 'Last password change' => 'Letzte Kennwort-Änderung', + 'Once you have deleted your data, you will not longer be able to sign in with this account.' + => 'Wenn Sie die eigenen Daten gelöscht haben, können Sie sich mit diesem Benutzernamen nicht mehr anmelden.', + 'Password age' => 'Kennwort-Alter', + 'Privacy' => 'Privatsphäre', + 'Privacy settings' => 'Privatsphäre-Einstellungen', + 'Rule class name' => 'Regel-Klassen-Name', + 'Select rule...' => 'Regel auswählen...', + 'There was an error in saving user' => 'Fehler beim Speichern des Benutzers', + 'This will disable two factor authentication. Are you sure?' + => 'Hiermit deaktivieren Sie die Zwei-Faktor-Authentifizierung. Sind Sie sicher?', + 'This will remove your personal data from this site. You will no longer be able to sign in.' + => 'Hiermit löschen Sie Ihre persönlichen Daten von diesem Service. '. + 'Sie werden sich nun nicht mehr anmelden können.', + 'Two Factor Authentication (2FA)' => 'Zwei-Faktor-Authentifizierung (2FA)', + 'Two factor authentication code' => 'Zwei-Faktor-Authentifizierungs-Code', + 'Two factor authentication has been disabled.' => 'Zwei-Faktor-Authentifizierung wurde deaktiviert', + 'Two factor authentication protects you in case of stolen credentials' + => 'Zwei-Faktor-Authentifizierung schützt Sie bei gestohlenen Zugangsdaten', + 'Two factor authentication successfully enabled.' => 'Zwei-Faktor-Authentifizierung wurde erfolgreich aktiviert', + 'Unable to disable Two factor authentication.' + => 'Fehler beim Deaktivieren der Zwei-Faktor-Authentifizierung', + 'User will be required to change password at next login' + => 'Der Benutzer wird bei der nchsten Aneldung zur Kennwort-Änderungen gezwungen', + 'You are about to delete all your personal data from this site.' + => 'Sie löschen damit alle persönlichen Daten von diesem Service', + 'Your consent is required to register' => 'Sie müssen Ihre Zustimmung registrieren', + 'Your password has expired, you must change it now' => 'Ihr Kennwort ist abgelaufen. Sie müssen es nun ändern', + 'Your personal information has been removed' => 'Ihre persönlichen Daten wurden gelöscht', + 'privacy policy' => 'Datenschutzrichtlinie', '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@@', + '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@@', 'Enable Two-factor auth' => '@@Zweifaktor-Authentifizierung aktivieren@@', - '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}' => '@@@@', + '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' => '@@Ungültiger Zweifaktor Schlüssel@@', 'Last login' => '@@Letzter Login@@', 'Registration ip' => '@@Registrierungs-IP@@', 'Rule class can not be instantiated' => '@@@@', 'Rule class must extend "yii\\rbac\\Rule"' => '@@@@', - 'This will disable two-factor auth. Are you sure?' => '@@Dies wird die Zweifaktor-Authentifizierung deaktivieren. Sind Sie sicher?@@', + 'This will disable two-factor auth. Are you sure?' + => '@@Dies wird die Zweifaktor-Authentifizierung deaktivieren. Sind Sie sicher?@@', 'Two Factor Authentication' => '@@Zweifaktor-Authentifizierung@@', 'Two factor authentication protects you against stolen credentials' => '@@@@', 'Two factor successfully enabled.' => '@@Zweifaktor-Authentifizierung erfolgreich aktiviert.@@', 'Two-Factor Authentication' => '@@Zweifaktor-Authentifizierung@@', - 'Two-factor auth protects you against stolen credentials' => '@@Zweifaktor-Authentifizierung schützt Sie vor gestohlenen Zugangsdaten@@', + 'Two-factor auth protects you against stolen credentials' + => '@@Zweifaktor-Authentifizierung schützt Sie vor gestohlenen Zugangsdaten@@', 'Two-factor authentication code' => '@@Zweifaktor-Authentifizierungsschlüssel@@', 'Two-factor authorization has been disabled.' => '@@Zweifaktor-Authentifizierung wurde deaktiviert.@@', 'Two-factor code' => '@@Zweifaktor-Schlüssel@@', 'Unable to disable two-factor authorization.' => '@@Unfähig die Zweifaktor-Authentifizierung zu deaktivieren.@@', - 'We couldn\'t re-send the mail to confirm your address. ' => '@@Wir konnte die Bestätigungs E-Mail nicht erneut versenden@@', - 'We have sent confirmation links to both old and new email addresses. ' => '@@Wir haben Bestätigungs E-Mails an die neue und alte E-Mail Adresse versandt.@@', + 'We couldn\'t re-send the mail to confirm your address. ' + => '@@Wir konnte die Bestätigungs E-Mail nicht erneut versenden@@', + 'We have sent confirmation links to both old and new email addresses. ' + => '@@Wir haben Bestätigungs E-Mails an die neue und alte E-Mail Adresse versandt.@@', '(not set)' => '(nicht gesetzt)', - 'A confirmation message has been sent to your new email address' => 'Eine Bestätigungsnachricht wurde an Ihre neue E-Mail Adresse versandt', - 'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => 'Eine Nachricht wurde an Ihre E-Mail-Adresse gesendet. Sie enthält einen Bestätigungslink den Sie klicken müssen um die Registrierung abzuschließen.', + 'A confirmation message has been sent to your new email address' + => 'Eine Bestätigungsnachricht wurde an Ihre neue E-Mail Adresse versandt', + 'A message has been sent to your email address. It contains a confirmation link that you must '. + 'click to complete registration.' + => 'Eine Nachricht wurde an Ihre E-Mail-Adresse gesendet. '. + 'Sie enthält einen Bestätigungslink den Sie klicken müssen um die Registrierung abzuschließen.', 'A new confirmation link has been sent' => 'Ein neuer Bestätigungs-Link wurde versendet', 'A password will be generated automatically if not provided' => 'Leer lassen, um automatisch ein Passwort zu generieren', 'Account' => 'Konto', From 5de9e6470b41bd50011913ce38bd24f45e13d829 Mon Sep 17 00:00:00 2001 From: Lorenzo Milesi Date: Mon, 3 Dec 2018 09:31:26 +0100 Subject: [PATCH 04/51] Added @WeeSee to translator thanks --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8677b85..e193b84 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## 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 #198: Updated translations by quique, bizley, TonisOrmisson, guogan, Dezinger, maxxer, wautvda, mrbig00, fabiomlferreira, WeeSee - Fix #209: Doc fix. allowAccountDelete default value is false (Dezinger) - Fix #211: Migration boolean default value set to FALSE instead 0 (Dezinger) - Fix #213: Migration sql syntax fix (Dezinger) From cd8999b2d525951c1be7c6c2ac744555d6340226 Mon Sep 17 00:00:00 2001 From: Lorenzo Milesi Date: Thu, 13 Dec 2018 17:07:49 +0100 Subject: [PATCH 05/51] Fix missing parameter in role creation from command line --- src/User/Command/CreateController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/User/Command/CreateController.php b/src/User/Command/CreateController.php index 7749a13..a98e98c 100644 --- a/src/User/Command/CreateController.php +++ b/src/User/Command/CreateController.php @@ -64,7 +64,7 @@ class CreateController extends Controller } else { $userRole = $auth->getRole($role); if (null === $userRole) { - $this->stdout(Yii::t('usuario', 'Role "{0}" not found. Creating it.') . "!\n", Console::FG_GREEN); + $this->stdout(Yii::t('usuario', 'Role "{0}" not found. Creating it.', [$role]) . "!\n", Console::FG_GREEN); $userRole = $auth->createRole($role); $auth->add($userRole); } From 8a708839c03dc0bb6f943b56da3db2575f99debf Mon Sep 17 00:00:00 2001 From: Lorenzo Milesi Date: Mon, 31 Dec 2018 11:30:22 +0100 Subject: [PATCH 06/51] Fix password expire service #293 --- src/User/Service/PasswordExpireService.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/User/Service/PasswordExpireService.php b/src/User/Service/PasswordExpireService.php index d3487fc..4f668fd 100644 --- a/src/User/Service/PasswordExpireService.php +++ b/src/User/Service/PasswordExpireService.php @@ -27,8 +27,7 @@ class PasswordExpireService implements ServiceInterface public function run() { return $this->model->updateAttributes([ - 'last_login_at' => time(), - 'last_login_ip' => Yii::$app->request->getUserIP(), + 'password_changed_at' => null, ]); } } From 9602eafd7a0d1130ef4f67614cff1932a475077d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?T=C3=B5nis=20Ormisson?= Date: Wed, 9 Jan 2019 09:26:26 +0200 Subject: [PATCH 07/51] update Estonian Translation (& run Yii message) --- src/User/resources/i18n/de/usuario.php | 126 ++++++++++--------------- src/User/resources/i18n/et/usuario.php | 7 +- src/User/resources/i18n/ru/usuario.php | 8 +- 3 files changed, 55 insertions(+), 86 deletions(-) diff --git a/src/User/resources/i18n/de/usuario.php b/src/User/resources/i18n/de/usuario.php index fac3d32..2860c15 100644 --- a/src/User/resources/i18n/de/usuario.php +++ b/src/User/resources/i18n/de/usuario.php @@ -17,103 +17,33 @@ * 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.' - => 'Eine Email mit Hinweisen, wie ein Kennwort erstellt wirdm wurde an {email} gesendet, '. - 'sofern es mit dem Konto {appName} verbindund ist. Das aktuelle Kennwort wurde nicht geändert.', - 'Are you sure you wish the user to change their password at next login?' - => 'Sind Sie sicher, dass der benutzer sein Kennwort beim nächsten Anmeldenändern soll?', - 'Back to privacy settings' => 'Zurück zu Privatsphäre-Einstellungen', - 'Data processing consent' => 'Zustimmung zur Datenverarbeitung', - 'Delete my account' => 'Mein Benutzerkonto löschen', - 'Delete personal data' => 'Persönliche Daten löschen', - 'Deleted by GDPR request' => 'Geköscht gemäß DSGVO-Anforderung', - 'Disable two factor authentication' => 'Zwei-Faktor-Authentifizierung deaktivieren', - 'Download my data' => 'Eigene Daten herunterladen', - 'Enable two factor authentication' => 'Zwei-Faktor-Authentifizierung aktivieren', - 'Export my data' => 'Eigene Daten exportieren', - 'Force password change at next login' => 'Kennwort-Änderung beim nächsten Anmelden erzwingen', - 'Here you can download your personal data in a comma separated values format.' - => 'Hier können Sie eigene persönliche Daten in komma-separiertem Format herunterladen', - '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}' - => 'Ich stimme der Verarbeitung meiner persönlichen Daten und der Benutzung von Cookies zur '. - 'Vereinfachung der Benutzer dieses Services zu. Weitere Informationen stehen in unserer {privacyPolicy}', - 'Invalid password' => 'Ungültiges Kennwort', - 'Invalid two factor authentication code' => 'Ungültiger Zwei-Faktor-Authentifizierungs-Code', - 'Last login IP' => 'Letzte Anmeldung von IP', - 'Last login time' => 'Letzte Anmeldung', - 'Last password change' => 'Letzte Kennwort-Änderung', - 'Once you have deleted your data, you will not longer be able to sign in with this account.' - => 'Wenn Sie die eigenen Daten gelöscht haben, können Sie sich mit diesem Benutzernamen nicht mehr anmelden.', - 'Password age' => 'Kennwort-Alter', - 'Privacy' => 'Privatsphäre', - 'Privacy settings' => 'Privatsphäre-Einstellungen', - 'Rule class name' => 'Regel-Klassen-Name', - 'Select rule...' => 'Regel auswählen...', - 'There was an error in saving user' => 'Fehler beim Speichern des Benutzers', - 'This will disable two factor authentication. Are you sure?' - => 'Hiermit deaktivieren Sie die Zwei-Faktor-Authentifizierung. Sind Sie sicher?', - 'This will remove your personal data from this site. You will no longer be able to sign in.' - => 'Hiermit löschen Sie Ihre persönlichen Daten von diesem Service. '. - 'Sie werden sich nun nicht mehr anmelden können.', - 'Two Factor Authentication (2FA)' => 'Zwei-Faktor-Authentifizierung (2FA)', - 'Two factor authentication code' => 'Zwei-Faktor-Authentifizierungs-Code', - 'Two factor authentication has been disabled.' => 'Zwei-Faktor-Authentifizierung wurde deaktiviert', - 'Two factor authentication protects you in case of stolen credentials' - => 'Zwei-Faktor-Authentifizierung schützt Sie bei gestohlenen Zugangsdaten', - 'Two factor authentication successfully enabled.' => 'Zwei-Faktor-Authentifizierung wurde erfolgreich aktiviert', - 'Unable to disable Two factor authentication.' - => 'Fehler beim Deaktivieren der Zwei-Faktor-Authentifizierung', - 'User will be required to change password at next login' - => 'Der Benutzer wird bei der nchsten Aneldung zur Kennwort-Änderungen gezwungen', - 'You are about to delete all your personal data from this site.' - => 'Sie löschen damit alle persönlichen Daten von diesem Service', - 'Your consent is required to register' => 'Sie müssen Ihre Zustimmung registrieren', - 'Your password has expired, you must change it now' => 'Ihr Kennwort ist abgelaufen. Sie müssen es nun ändern', - 'Your personal information has been removed' => 'Ihre persönlichen Daten wurden gelöscht', - 'privacy policy' => 'Datenschutzrichtlinie', '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@@', + '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@@', 'Enable Two-factor auth' => '@@Zweifaktor-Authentifizierung aktivieren@@', - '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}' - => '@@@@', + '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' => '@@Ungültiger Zweifaktor Schlüssel@@', 'Last login' => '@@Letzter Login@@', 'Registration ip' => '@@Registrierungs-IP@@', 'Rule class can not be instantiated' => '@@@@', 'Rule class must extend "yii\\rbac\\Rule"' => '@@@@', - 'This will disable two-factor auth. Are you sure?' - => '@@Dies wird die Zweifaktor-Authentifizierung deaktivieren. Sind Sie sicher?@@', + 'This will disable two-factor auth. Are you sure?' => '@@Dies wird die Zweifaktor-Authentifizierung deaktivieren. Sind Sie sicher?@@', 'Two Factor Authentication' => '@@Zweifaktor-Authentifizierung@@', 'Two factor authentication protects you against stolen credentials' => '@@@@', 'Two factor successfully enabled.' => '@@Zweifaktor-Authentifizierung erfolgreich aktiviert.@@', 'Two-Factor Authentication' => '@@Zweifaktor-Authentifizierung@@', - 'Two-factor auth protects you against stolen credentials' - => '@@Zweifaktor-Authentifizierung schützt Sie vor gestohlenen Zugangsdaten@@', + 'Two-factor auth protects you against stolen credentials' => '@@Zweifaktor-Authentifizierung schützt Sie vor gestohlenen Zugangsdaten@@', 'Two-factor authentication code' => '@@Zweifaktor-Authentifizierungsschlüssel@@', 'Two-factor authorization has been disabled.' => '@@Zweifaktor-Authentifizierung wurde deaktiviert.@@', 'Two-factor code' => '@@Zweifaktor-Schlüssel@@', 'Unable to disable two-factor authorization.' => '@@Unfähig die Zweifaktor-Authentifizierung zu deaktivieren.@@', - 'We couldn\'t re-send the mail to confirm your address. ' - => '@@Wir konnte die Bestätigungs E-Mail nicht erneut versenden@@', - 'We have sent confirmation links to both old and new email addresses. ' - => '@@Wir haben Bestätigungs E-Mails an die neue und alte E-Mail Adresse versandt.@@', + 'We couldn\'t re-send the mail to confirm your address. ' => '@@Wir konnte die Bestätigungs E-Mail nicht erneut versenden@@', + 'We have sent confirmation links to both old and new email addresses. ' => '@@Wir haben Bestätigungs E-Mails an die neue und alte E-Mail Adresse versandt.@@', '(not set)' => '(nicht gesetzt)', - 'A confirmation message has been sent to your new email address' - => 'Eine Bestätigungsnachricht wurde an Ihre neue E-Mail Adresse versandt', - 'A message has been sent to your email address. It contains a confirmation link that you must '. - 'click to complete registration.' - => 'Eine Nachricht wurde an Ihre E-Mail-Adresse gesendet. '. - 'Sie enthält einen Bestätigungslink den Sie klicken müssen um die Registrierung abzuschließen.', + 'A confirmation message has been sent to your new email address' => 'Eine Bestätigungsnachricht wurde an Ihre neue E-Mail Adresse versandt', + 'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => 'Eine Nachricht wurde an Ihre E-Mail-Adresse gesendet. Sie enthält einen Bestätigungslink den Sie klicken müssen um die Registrierung abzuschließen.', 'A new confirmation link has been sent' => 'Ein neuer Bestätigungs-Link wurde versendet', 'A password will be generated automatically if not provided' => 'Leer lassen, um automatisch ein Passwort zu generieren', 'Account' => 'Konto', @@ -122,12 +52,14 @@ return [ 'Account details have been updated' => 'Kontodetails gespeichert', 'Account settings' => 'Kontoeinstellungen', 'Already registered? Sign in!' => 'Bereits registriert? Zur Anmeldung!', + '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.' => 'Eine Email mit Hinweisen, wie ein Kennwort erstellt wirdm wurde an {email} gesendet, sofern es mit dem Konto {appName} verbindund ist. Das aktuelle Kennwort wurde nicht geändert.', '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?', 'Are you sure you want to delete this user?' => 'Sind Sie sicher, dass Sie diesen Benutzer löschen wollen?', 'Are you sure you want to switch to this user for the rest of this Session?' => 'Sind Sie sicher, dass Sie zu diesem Benutzer zu wechseln möchten für den Rest dieser Session?', 'Are you sure you want to unblock this user?' => 'Sind Sie sicher, dass Sie diesen Benutzer wieder freischalten wollen?', + 'Are you sure you wish the user to change their password at next login?' => 'Sind Sie sicher, dass der benutzer sein Kennwort beim nächsten Anmeldenändern soll?', 'Are you sure you wish to send a password recovery email to this user?' => 'Sind Sie sicher, dass Sie eine Passwortwiederherstellungs-Mail an diesen Benutzer senden möchten?', 'Are you sure? Deleted user can not be restored' => 'Sind Sie sicher? Gelöschte Benutzer können nicht wiederhergestellt werden', 'Are you sure? There is no going back' => 'Sind Sie sicher? Es gibt kein Zurück', @@ -143,6 +75,7 @@ return [ 'Authorization rule has been updated.' => 'Berechtigungsregel wurde gespeichert.', 'Awesome, almost there. Now you need to click the confirmation link sent to your new email address.' => 'Fast geschafft. Nun müssen Sie nur noch den Aktivierungslink besuchen, der an ihre neue E-Mail Adresse gesendet wurde.', 'Awesome, almost there. Now you need to click the confirmation link sent to your old email address.' => 'Fast geschafft. Nun müssen Sie nur noch den Aktivierungslink besuchen, der an ihre alte E-Mail Adresse gesendet wurde.', + 'Back to privacy settings' => 'Zurück zu Privatsphäre-Einstellungen', 'Bio' => 'Bio', 'Block' => 'Blockieren', 'Block status' => 'Blockadestatus', @@ -173,24 +106,35 @@ return [ 'Credentials will be sent to the user by email' => 'Die Zugangsdaten werden dem Nutzer per E-Mail versendet', 'Current password' => 'Aktuelles Passwort', 'Current password is not valid' => 'Das aktuelle Passwort ist nicht korrekt', + 'Data processing consent' => 'Zustimmung zur Datenverarbeitung', 'Delete' => 'Löschen', 'Delete account' => 'Konto Löschen', + 'Delete my account' => 'Mein Benutzerkonto löschen', + 'Delete personal data' => 'Persönliche Daten löschen', + 'Deleted by GDPR request' => 'Geköscht gemäß DSGVO-Anforderung', 'Description' => 'Beschreibung', 'Didn\'t receive confirmation message?' => 'Bestätigungs-Mail nicht empfangen?', + 'Disable two factor authentication' => 'Zwei-Faktor-Authentifizierung deaktivieren', 'Disconnect' => 'Trennen', 'Don\'t have an account? Sign up!' => 'Sie haben noch kein Konto? Registrieren!', + 'Download my data' => 'Eigene Daten herunterladen', 'Email' => 'E-Mail', 'Email (public)' => 'E-Mail (öffentlich)', 'Enable' => 'aktivieren', + 'Enable two factor authentication' => 'Zwei-Faktor-Authentifizierung aktivieren', 'Error occurred while changing password' => 'Fehler beim ändern des Passworts', 'Error occurred while confirming user' => 'Fehler beim Bestätigen des Benutzers', 'Error occurred while deleting user' => 'Fehler beim Löschen des Benutzers', 'Error sending registration message to "{email}". Please try again later.' => 'Fehler beim Senden der Registrierungsnachricht an "{email}". Bitte später noch einmal probieren.', 'Error sending welcome message to "{email}". Please try again later.' => 'Fehler beim Senden der Willkommensnachricht an "{email}". Bitte später noch einmal probieren.', + 'Export my data' => 'Eigene Daten exportieren', 'Finish' => 'Fertig', + 'Force password change at next login' => 'Kennwort-Änderung beim nächsten Anmelden erzwingen', 'Forgot password?' => 'Passwort vergessen?', 'Gravatar email' => 'Gravatar E-Mail', 'Hello' => 'Hallo', + 'Here you can download your personal data in a comma separated values format.' => 'Hier können Sie eigene persönliche Daten in komma-separiertem Format herunterladen', + '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}' => 'Ich stimme der Verarbeitung meiner persönlichen Daten und der Benutzung von Cookies zur Vereinfachung der Benutzer dieses Services zu. Weitere Informationen stehen in unserer {privacyPolicy}', 'If you already registered, sign in and connect this account on settings page' => 'Wenn Sie sich bereits registriert haben, melden Sie sich an und verbinden Sie dieses Konto auf der Einstellungs-Seite', 'If you cannot click the link, please try pasting the text into your browser' => 'Wenn Sie den Link nicht anklicken können, versuchen Sie, diesen in ihre Browser-Leiste einzufügen', 'If you did not make this request you can ignore this email' => 'Wenn Sie diese Anfrage nicht gemacht haben, können Sie diese E-Mail ignorieren', @@ -201,10 +145,15 @@ return [ 'Information' => 'Information', 'Invalid login or password' => 'Falscher Login oder falsches Passwort', 'Invalid or expired link' => 'Falscher oder abgelaufener link', + 'Invalid password' => 'Ungültiges Kennwort', + 'Invalid two factor authentication code' => 'Ungültiger Zwei-Faktor-Authentifizierungs-Code', 'Invalid value' => 'Falscher Wert', 'It will be deleted forever' => 'Es wird permanent gelöscht', 'Items' => 'Elemente', 'Joined on {0, date}' => 'Mitglies seit {0, date}', + 'Last login IP' => 'Letzte Anmeldung von IP', + 'Last login time' => 'Letzte Anmeldung', + 'Last password change' => 'Letzte Kennwort-Änderung', 'Location' => 'Ort', 'Login' => 'Anmelden', 'Logout' => 'Abmelden', @@ -221,12 +170,16 @@ return [ 'Not blocked' => 'Nicht geblockt', 'Not found' => 'Nicht gefunden', 'Once you delete your account, there is no going back' => 'Wenn Sie ihr Konto gelöscht haben, gibt es kein zurück mehr', + 'Once you have deleted your data, you will not longer be able to sign in with this account.' => 'Wenn Sie die eigenen Daten gelöscht haben, können Sie sich mit diesem Benutzernamen nicht mehr anmelden.', 'Password' => 'Passwort', + 'Password age' => 'Kennwort-Alter', 'Password has been changed' => 'Passwort wurde geändert', 'Permissions' => 'Berechtigungen', 'Please be certain' => 'Sind Sie sich wirklich sicher?', 'Please click the link below to complete your password reset' => 'Bitte klicken Sie den link unten um ihre Passwort-Wiederherstellung abzuschliessen', 'Please fix following errors:' => 'Bitte beheben Sie die folgenden Fehler', + 'Privacy' => 'Privatsphäre', + 'Privacy settings' => 'Privatsphäre-Einstellungen', 'Profile' => 'Profil', 'Profile details' => 'Profildetails', 'Profile details have been updated' => 'Profildetails wurden gespeichert', @@ -246,6 +199,7 @@ return [ 'Roles' => 'Rollen', 'Rule' => 'Regel', 'Rule class must extend "yii\\rbac\\Rule".' => 'Regelklasse muss "yii\\rbac\\Rule" erweitern.', + 'Rule class name' => 'Regel-Klassen-Name', 'Rule name' => 'Regelname', 'Rule name {0} is already in use' => 'Regelname {0} bereits in Benutzung', 'Rule {0} does not exists' => 'Regel {0} existiert nicht', @@ -253,6 +207,7 @@ return [ 'Rules' => 'Regeln', 'Save' => 'Speichern', 'Scan the QrCode with Google Authenticator App, then insert its temporary code on the box and submit.' => 'Scanne den Qr-Code mit der Google Authenticator App, dann füge den temporären Schlüssel in das Feld und sende es ab.', + 'Select rule...' => 'Regel auswählen...', 'Send password recovery email' => 'Sende Mail zur Passwortwiederherstellung', 'Sign in' => 'Anmelden', 'Sign up' => 'Registrieren', @@ -264,16 +219,25 @@ return [ 'The confirmation link is invalid or expired. Please try requesting a new one.' => 'Ihr Aktivierungslink ist falsch oder abgelaufen. Bitte fordern Sie einen neuen an.', 'The verification code is incorrect.' => 'Der Verifizierungsschlüssel ist ungültig.', 'There is neither role nor permission with name "{0}"' => 'Es gibt weder eine Rolle noch eine Berechtigung mit dem Namen "{0}"', + 'There was an error in saving user' => 'Fehler beim Speichern des Benutzers', 'This account has already been connected to another user' => 'Dieses Konto wurde bereits von einem anderen Benutzer verbunden', 'This email address has already been taken' => 'Die E-Mail Adresse ist bereits vergeben', 'This username has already been taken' => 'Dieser Benutzername ist bereits vergeben', + 'This will disable two factor authentication. Are you sure?' => 'Hiermit deaktivieren Sie die Zwei-Faktor-Authentifizierung. Sind Sie sicher?', + 'This will remove your personal data from this site. You will no longer be able to sign in.' => 'Hiermit löschen Sie Ihre persönlichen Daten von diesem Service. Sie werden sich nun nicht mehr anmelden können.', 'Time zone' => 'Zeitzone', 'Time zone is not valid' => 'Zeitzone ist ungültig', + 'Two Factor Authentication (2FA)' => 'Zwei-Faktor-Authentifizierung (2FA)', + 'Two factor authentication code' => 'Zwei-Faktor-Authentifizierungs-Code', + 'Two factor authentication has been disabled.' => 'Zwei-Faktor-Authentifizierung wurde deaktiviert', + 'Two factor authentication protects you in case of stolen credentials' => 'Zwei-Faktor-Authentifizierung schützt Sie bei gestohlenen Zugangsdaten', + 'Two factor authentication successfully enabled.' => 'Zwei-Faktor-Authentifizierung wurde erfolgreich aktiviert', 'Unable to confirm user. Please, try again.' => 'Der Benutzer konnte nicht bestätigt werden. Bitte versuchen Sie es erneut.', 'Unable to create an account.' => 'Konto konnte nicht erstellt werden', 'Unable to create authorization item.' => 'Authorization Item konnte nicht erstellt werden', 'Unable to create new authorization rule.' => 'Unfähig eine neue Authentifizierungsregel zu erstellen.', 'Unable to delete user. Please, try again later.' => 'Benutzer konnte nicht gelöscht werden.', + 'Unable to disable Two factor authentication.' => 'Fehler beim Deaktivieren der Zwei-Faktor-Authentifizierung', 'Unable to remove authorization item.' => 'Authorization Item konnte nicht gelöscht werden.', 'Unable to send confirmation link' => 'Konnte Bestätigungslink nicht versenden', 'Unable to send recovery message to the user' => 'Unfähig die Wiederherstellungsnachricht an den Benutzer zu senden.', @@ -297,6 +261,7 @@ return [ 'User has been deleted' => 'Benutzer wurde gelöscht', 'User is not found' => 'Benutzer wurde nicht gefunden', 'User not found.' => 'Benutzer nicht gefunden.', + 'User will be required to change password at next login' => 'Der Benutzer wird bei der nchsten Aneldung zur Kennwort-Änderungen gezwungen', 'Username' => 'Benutzername', 'Users' => 'Benutzer', 'VKontakte' => 'VKontakte', @@ -309,6 +274,7 @@ return [ 'Website' => 'Webseite', 'Welcome to {0}' => 'Willkommen auf {0}', 'Yandex' => 'Yandex', + 'You are about to delete all your personal data from this site.' => 'Sie löschen damit alle persönlichen Daten von diesem Service', 'You can assign multiple roles or permissions to user by using the form below' => 'Sie können mehrere Rollen oder Berechtigungen zuweisen', 'You can connect multiple accounts to be able to log in using them' => 'Sie können mehrere Konten verbinden und sich mit diesen anmelden', 'You cannot remove your own account' => 'Sie können ihr eigenes Konto nicht löschen', @@ -322,8 +288,12 @@ return [ 'Your account has been created and a message with further instructions has been sent to your email' => 'Ihr Konto wurde erstellt und eine Nachricht mit weiteren Anweisungen wurde an ihre E-Mail Adresse versandt', 'Your account on {0} has been created' => 'Ihr Konto auf {0} wurde erstellt', 'Your confirmation token is invalid or expired' => 'Ihr Bestätigungs-Token ist falsch oder abgelaufen', + 'Your consent is required to register' => 'Sie müssen Ihre Zustimmung registrieren', 'Your email address has been changed' => 'Ihre E-Mail Adresse wurde geändert', + 'Your password has expired, you must change it now' => 'Ihr Kennwort ist abgelaufen. Sie müssen es nun ändern', + 'Your personal information has been removed' => 'Ihre persönlichen Daten wurden gelöscht', 'Your profile has been updated' => 'Ihr Profil wurde gespeichert', + 'privacy policy' => 'Datenschutzrichtlinie', '{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.', diff --git a/src/User/resources/i18n/et/usuario.php b/src/User/resources/i18n/et/usuario.php index 5e0cf30..64584fc 100644 --- a/src/User/resources/i18n/et/usuario.php +++ b/src/User/resources/i18n/et/usuario.php @@ -17,16 +17,15 @@ * 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.' => '', + '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.' => 'Saatsime aadressile {email} juhendi, kuidas saad oma parooli uuendada, kui see aadress on seotud mõne {appName} kontoga. Me ei muutnud sinu praegust parooli.', 'Authentication rule class {0} can not be instantiated' => '', 'Rule class must extend "yii\\rbac\\Rule".' => '', - 'Rule class name' => '', - 'Select rule...' => '', + 'Rule class name' => 'Reegli klassi nimi', + 'Select rule...' => 'Vali reegel', '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.', diff --git a/src/User/resources/i18n/ru/usuario.php b/src/User/resources/i18n/ru/usuario.php index 2adbef1..edfccac 100644 --- a/src/User/resources/i18n/ru/usuario.php +++ b/src/User/resources/i18n/ru/usuario.php @@ -17,10 +17,6 @@ * 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.' => 'Письмо с инструкциями по созданию нового пароля было выслано на {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. ' => '@@Замечательно, почти готово!@@', @@ -56,6 +52,7 @@ return [ 'Account details have been updated' => 'Аккаунт был обновлен', 'Account settings' => 'Настройки аккаунта', 'Already registered? Sign in!' => 'Уже зарегистрированы? Войдите!', + '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} аккаунтом', 'An error occurred processing your request' => 'Во время выполнения запроса произошла ошибка', 'Are you sure you want to block this user?' => 'Вы действительно хотите заблокировать этого пользователя?', 'Are you sure you want to confirm this user?' => 'Вы уверены, что хотите подтвердить аккаунт пользователя?', @@ -202,6 +199,7 @@ return [ 'Roles' => 'Роли', 'Rule' => 'Правило', 'Rule class must extend "yii\\rbac\\Rule".' => 'Класс с правилами должен наследовать "yii\\rbac\\Rule".', + 'Rule class name' => 'Имя класса правила', 'Rule name' => 'Название правила', 'Rule name {0} is already in use' => 'Название правила {0} уже занято', 'Rule {0} does not exists' => 'Правила {0} не существует', @@ -209,6 +207,7 @@ return [ 'Rules' => 'Правила', 'Save' => 'Сохранить', 'Scan the QrCode with Google Authenticator App, then insert its temporary code on the box and submit.' => 'Просканируйте QR-код приложением Google Authenticator App, затем вставьте временный код в поле и отправьте.', + 'Select rule...' => 'Выберите правило...', 'Send password recovery email' => 'Отправить письмо с восстановлением пароля', 'Sign in' => 'Войти', 'Sign up' => 'Зарегистрироваться', @@ -231,6 +230,7 @@ return [ 'Two Factor Authentication (2FA)' => 'Двухфакторная авторизация (2FA)', 'Two factor authentication code' => 'Код двухфакторной авторизации', 'Two factor authentication has been disabled.' => 'Двухфакторная авторизация отключена.', + 'Two factor authentication protects you in case of stolen credentials' => 'Двухфакторная аутентификация защищает вас в случае кражи учетных данных', 'Two factor authentication successfully enabled.' => 'Двухфакторная авторизация успешно включена.', 'Unable to confirm user. Please, try again.' => 'Не удалось активировать пользователя. Пожалуйста, попробуйте ещё раз.', 'Unable to create an account.' => 'Не удалось создать аккаунт.', From a47728c851917fe65533b39675e3d7200948d131 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20la=20Poutre=CC=81?= Date: Tue, 15 Jan 2019 11:14:32 +0100 Subject: [PATCH 08/51] Add nl_NL Dutch translation. Minor corrections, typo fixes, use active command verbs according to common HCI principles --- src/User/resources/i18n/nl_NL/usuario.php | 297 ++++++++++++++++++++++ 1 file changed, 297 insertions(+) create mode 100644 src/User/resources/i18n/nl_NL/usuario.php diff --git a/src/User/resources/i18n/nl_NL/usuario.php b/src/User/resources/i18n/nl_NL/usuario.php new file mode 100644 index 0000000..bf566b2 --- /dev/null +++ b/src/User/resources/i18n/nl_NL/usuario.php @@ -0,0 +1,297 @@ + '-', + 'A confirmation message has been sent to your new email address' => 'Een bevestigingsbericht is verzonden naar je nieuwe e-mailadres', + 'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => 'Een email met een bevestigingslink werd verzonden naar je emailadres. Klik op de link om de registratie te voltooien.', + 'A new confirmation link has been sent' => 'Een nieuwe bevestigingslink is verzonden', + 'A password will be generated automatically if not provided' => 'Een wachtwoord wordt automatisch gegenereerd als er dit niet wordt opgegeven', + 'Account' => 'Account', + 'Account confirmation' => 'Accountbevestiging', + 'Account details' => 'Accountdetails', + 'Account details have been updated' => 'Accountdetails werden bijgewerkt', + 'Account settings' => 'Account-instellingen', + 'Already registered? Sign in!' => 'AL geregistreerd? Log in!', + 'An email has been sent with instructions for resetting your password' => 'Er is een email verstuurd met instructies om je wachtwoord te herstellen', + 'An error occurred processing your request' => 'Er is een fout opgetreden bij het verwerken van je aanvraag', + 'Are you sure you want to block this user?' => 'Weet je zeker dat je deze gebruiker wil blokkeren?', + 'Are you sure you want to confirm this user?' => 'Weet je zeker dat je deze gebruiker wil bevestigen?', + 'Are you sure you want to delete this user?' => 'Wet je zeker dat je deze gebrukiker wil verwijderen?', + 'Are you sure you want to switch to this user for the rest of this Session?' => 'Weet je zeker dat je als deze gebruiker wil verder gaan voor deze sessie?', + 'Are you sure you want to unblock this user?' => 'Weet je zeker dat je deze gebruiker wil activeren?', + 'Are you sure you wish the user to change their password at next login?' => 'Weet je zeker dat de gebruiker zijn wachtwoord moet wijzigen bij de volgende keer dat deze inlogt?', + 'Are you sure you wish to send a password recovery email to this user?' => 'Weet je zeker dat je een wachtwoord herstel-email naar deze gebruiker wil verzenden?', + 'Are you sure? Deleted user can not be restored' => 'Weet je het zeker? Een verwijderde gebruiker kan niet worden hersteld!', + 'Are you sure? There is no going back' => 'Weet je het zeker? Dit kan niet ongedaan gemaakt worden!', + 'Assignments' => 'Toewijzingen', + 'Assignments have been updated' => 'Toewijzingen zijn bijgewerkt', + 'Auth item with such name already exists' => 'Auth item met deze naam bestaat al', + 'Authentication rule class {0} can not be instantiated' => 'Authenticatie regel klasse {0} kan niet worden geïnstantieerd', + 'Authorization item successfully created.' => 'Authorisatie item met succes aangemaakt', + 'Authorization item successfully removed.' => 'Authorisatie item met succes verwijderd', + 'Authorization item successfully updated.' => 'Authorisatie item met succes geüpdatet', + 'Authorization rule has been added.' => 'Authorisatie regel werd toegevoegd', + 'Authorization rule has been removed.' => 'Authorisatie regel werd verwijderd', + 'Authorization rule has been updated.' => 'Authorisatie regel werd geüpdatet', + 'Awesome, almost there. Now you need to click the confirmation link sent to your new email address.' => 'Super, bijna klaar. Open alleen nog de bevestigingslink in de mail die naar jouw nieuwe emailadres gestuurd is', + 'Awesome, almost there. Now you need to click the confirmation link sent to your old email address.' => 'Super, bijna klaar. Open alleen nog de bevestigingslink in de mail die naar jouw oude emailadres gestuurd is', + 'Back to privacy settings' => 'Terug naar privcay settings', + 'Bio' => 'Biografie', + 'Block' => 'Blokkeer', + 'Block status' => 'Blokkering', + 'Blocked at {0, date, MMMM dd, YYYY HH:mm}' => 'Geblokkeerd om {0, date, MMMM dd, YYYY HH:mm}', + 'Cancel' => 'Annuleren', + 'Cannot assign role \'{0}\' as the AuthManager is not configured on your console application.' => 'Kan rol {0} niet toewijzen doordat de AuthManager niet geconfigureerd is op de console-applicatie', + 'Change your avatar at Gravatar.com' => 'Wijzig je avatar op Gravatar.com', + 'Children' => 'Kinderen', + 'Class' => 'Klasse', + 'Close' => 'Sluiten', + 'Complete password reset on {0}' => 'Voltooi het herstellen van je wachtwoord op {0}', + 'Confirm' => 'Bevestig', + 'Confirm account on {0}' => 'Bevestig account op {0}', + 'Confirm email change on {0}' => 'Bevestig email-wijziging op {0}', + 'Confirmation' => 'Bevestiging', + 'Confirmation status' => 'Bevestigingsstatus', + 'Confirmation time' => 'Tijdstip bevestiging', + 'Confirmed' => 'Bevestigd', + 'Confirmed at {0, date, MMMM dd, YYYY HH:mm}' => 'Bevestigd op {0, date, MMMM dd, YYYY HH:mm}', + 'Connect' => 'Verbinden', + 'Continue' => 'Verder', + 'Create' => 'Maak aan', + 'Create a user account' => 'Maak een gebruikersaccount aan', + 'Create new permission' => 'Maak een nieuwe permissie aan', + 'Create new role' => 'Maak een nieuw rol aan', + 'Create new rule' => 'maak een nieuwe regel aan', + 'Created at' => 'Gemaakt op', + 'Credentials will be sent to the user by email' => 'Inloggevens worden via mail naar de gebruiker verzonden', + 'Current password' => 'Huidig wachtwoord', + 'Current password is not valid' => 'Huidig wachtwoord is niet geldig', + 'Data processing consent' => 'Toestemming gegevensverwerking', + 'Delete' => 'Verwijder', + 'Delete account' => 'Verwijder account', + 'Delete my account' => 'Verwijder mijn account', + 'Delete personal data' => 'Verwijder mijn persoonlijke gegevens', + 'Deleted by GDPR request' => 'Verwijderd vanwege mijn AVG verzoek', + 'Description' => 'Omschrijving', + 'Didn\'t receive confirmation message?' => 'Geen bevestigings-email ontvangen?', + 'Disable two factor authentication' => '2 traps authenticatie uitschakelen', + 'Disconnect' => 'Verbreek verbindig', + 'Don\'t have an account? Sign up!' => 'Geen account? Meld je aan', + 'Download my data' => 'Download mijn gegevens', + 'Email' => 'Email', + 'Email (public)' => 'Email (publiek)', + 'Enable' => 'Schakel in', + 'Enable two factor authentication' => 'Schakel 2 traps authenticatie in', + 'Error occurred while changing password' => 'Fout bij wijzigen van het wachtwoord', + 'Error occurred while confirming user' => 'Fout bij bevestigen van de gebruiker', + 'Error occurred while deleting user' => 'Fout bij verwijderen van de gebruiker', + 'Error sending registration message to \'{email}\'. Please try again later.' => 'Er is een fout opgetreden bij verzenden van de registratie-email naar \'{email}\'. Probeer later nog eens.', + 'Error sending welcome message to \'{email}\'. Please try again later.' => 'Er is een fout opgetreden bij verzenden van de welkomst-email naar \'{email}\'. Probeer later nog eens.', + 'Export my data' => 'Exporteer mijn gegevens', + 'Finish' => 'beëindig', + 'Force password change at next login' => 'Forceer wachtwoord-herstel bij volgende login', + 'Forgot password?' => 'Wachtwoord vergeten?', + 'Gravatar email' => 'Gravatar email', + 'Hello' => 'Hallo', + 'Here you can download your personal data in a comma separated values format.' => 'Hier kan je al jouw persoonlijke data downloaden in een komma-gescheiden formaat.', + '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}' => 'Ik ga akkoord met het verwerken van mijn persoonlijke data en het gebruik van cookies om de werking van deze website te vergemakkelijken. Voor meer, lees onze {privacyPolicy}', + 'If you already registered, sign in and connect this account on settings page' => 'Als je al geregistreerd bent, meldt je aan en verbind deze account via de instellingen pagina', + 'If you cannot click the link, please try pasting the text into your browser' => 'Kopieer en plak deze tekst in jouw browser als je niet op deze link kan klikken', + 'If you did not make this request you can ignore this email' => 'Als je deze aanvraag niet hebt gedaan kan je deze email negeren', + 'Impersonate this user' => 'Ga verder als deze gebruiker', + 'In order to complete your registration, please click the link below' => 'Klik op onderstaande link om je registratie te voltooien', + 'In order to complete your request, please click the link below' => 'Klik op onderstaande link om je registratie te voltooien', + 'In order to finish your registration, we need you to enter following fields' => 'De volgende velden moeten verplicht worden ingevuld voor je registrate', + 'Information' => 'Informatie', + 'Invalid login or password' => 'Ongeldige login of wachtwoord', + 'Invalid or expired link' => 'Ongeldige of vervallen link', + 'Invalid password' => 'Ongeldig wachtwoord', + 'Invalid two factor authentication code' => 'Ongeldige 2 traps authenticatie code', + 'Invalid value' => 'Ongeldige waarde', + 'It will be deleted forever' => 'Het zal voor altijd verwijderd worden', + 'Items' => 'Items', + 'Joined on {0, date}' => 'Aangemeld op {0, date}', + 'Last login IP' => 'Laatste login IP', + 'Last login time' => 'Laatste login', + 'Last password change' => 'Laatste wachtwoordwijziging', + 'Location' => 'Locatie', + 'Login' => 'Log in', + 'Logout' => 'Log uit', + 'Manage users' => 'Beheer gebruikers', + 'Name' => 'Naam', + 'Networks' => 'Netwerken', + 'Never' => 'Nooit', + 'New email' => 'Nieuwe email', + 'New password' => 'Nieuw wachtwoord', + 'New permission' => 'Nieuwe permissies', + 'New role' => 'Nieuwe rol', + 'New rule' => 'Nieuwe regel', + 'New user' => 'Nieuwe gebruiker', + 'Not blocked' => 'Niet geblokkeerd', + 'Not found' => 'Niet gevonden', + 'Once you delete your account, there is no going back' => 'Als je jouw account verwijdert kan dit niet ongedaan gemaakt worden', + 'Once you have deleted your data, you will not longer be able to sign in with this account.' => 'Als je jouw data verwijdert is inloggen met deze account niet meer mogelijk.', + 'Password' => 'Wachtwoord', + 'Password age' => 'Ouderdeom wachtwoord', + 'Password has been changed' => 'Wachtwoord is gewijzigd', + 'Permissions' => 'Machtigingen', + 'Please be certain' => 'Weet je het zeker?', + 'Please click the link below to complete your password reset' => 'Klik op onderstaande link om je wachtwoordherstel te voltooien', + 'Please fix following errors:' => 'Los de volgende fouten op:', + 'Privacy' => 'Privacy', + 'Privacy settings' => 'Privacy-instellingen', + 'Profile' => 'Profiel', + 'Profile details' => 'Profieldetails', + 'Profile details have been updated' => 'Profieldetails werden geüpdatet', + 'Profile settings' => 'Profiel-instellingen', + 'Recover your password' => 'Herstel je wachtwoord', + 'Recovery link is invalid or expired. Please try requesting a new one.' => 'Herstel-link is ongeldig of vervallen. Vraag een nieuwe aan', + 'Recovery message sent' => 'Herstelbericht is verzonden', + 'Registration IP' => 'Registratie IP', + 'Registration on this website is disabled' => 'Registratie is gedeactiveerd op deze website', + 'Registration time' => 'Registratietijdstip', + 'Remember me next time' => 'Onthoud mij', + 'Request new confirmation message' => 'Vraag een nieuw bevestigingsbericht aan', + 'Required \'key\' cannot be empty.' => 'Verplicht veld \'key\' kan niet leeg zijn.', + 'Required \'secret\' cannot be empty.' => 'Verplicht veld \'geheim\' kan niet leeg zijn.', + 'Reset your password' => 'Reset jouw wachtwoord', + 'Role \'{0}\' not found. Creating it.' => 'Rol \'{0}\' kan niet worden gevonden. Het wordt aangemaakt', + 'Roles' => 'Rollen', + 'Rule' => 'Regel', + 'Rule class must extend \'yii\rbac\Rule\'.' => 'Regel class moet \'yii\rbac\Rule\' extenden.', + 'Rule name' => 'Regel naam', + 'Rule name {0} is already in use' => 'Regel met naam \'{0}\' is al in gebruik', + 'Rule {0} does not exists' => 'Regel {0} bestaat niet', + 'Rule {0} not found.' => 'Regel {0} werd niet gevonden', + 'Rules' => 'Regels', + 'Save' => 'Opslaan', + 'Scan the QrCode with Google Authenticator App, then insert its temporary code on the box and submit.' => 'Scan de QR coe met Google Authenticator (of vergelijkbare app), voer de tijdelijke code in en klik op verzenden.', + 'Send password recovery email' => 'Verzend wachtwoord herstel-email', + 'Sign in' => 'Aanmelden', + 'Sign up' => 'Registreren', + 'Something went wrong' => 'Er ging iets mis', + 'Switch identities is disabled.' => 'Identiteit-wisselen is niet ingeschakeld', + 'Thank you for signing up on {0}' => 'Bedankt voor je registratie op {0}', + 'Thank you, registration is now complete.' => 'Bedankt, je registratie is voltooid.', + 'The \'recaptcha\' component must be configured.' => 'De \'recaptcha\' component moet worden geconfigureerd.', + 'The confirmation link is invalid or expired. Please try requesting a new one.' => 'De bevestigingslink is ongeldig of verlopen. Vraag een nieuwe aan.', + 'The verification code is incorrect.' => 'De bevestigingscode is ongeldig', + 'There is neither role nor permission with name \'{0}\'' => 'Er is geen rol of machtiging met de naam \'{0}\'', + 'There was an error in saving user' => 'Er was een fout bij het opslaan van de gebruiker', + 'This account has already been connected to another user' => 'Dit account is al verbonden met een andere gebruiker', + 'This email address has already been taken' => 'Dit emailadres is al in gebruik', + 'This username has already been taken' => 'Deze gebruikersnaam is al in gebruik', + 'This will disable two factor authentication. Are you sure?' => 'Dit zal de 2 traps authenticatie uitschakelen. Ben je zeker?', + 'This will remove your personal data from this site. You will no longer be able to sign in.' => 'Dit zal jouw persoonlijke data van de website wissen. Je zal niet langer kunnen inloggen.', + 'Time zone' => 'Tijdzone', + 'Time zone is not valid' => 'Tijdzone is niet geldig', + 'Two Factor Authentication (2FA)' => '2 traps authenticatie (2FA)', + 'Two factor authentication code' => '2 traps authenticatie code', + 'Two factor authentication has been disabled.' => '2 traps authenticatie is uitgeschakeld', + 'Two factor authentication protects you against stolen credentials' => '2 traps authenticatie beschermt je tegen gestolen inloggegevens', + 'Two factor authentication successfully enabled.' => '2 traps authenticatie met succes ingeschakeld', + 'Unable to confirm user. Please, try again.' => 'Onmogelijk om de gebruiker te bevestigen. Probeer opnieuw.', + 'Unable to create an account.' => 'Onmogelijk om een account aan te maken.', + 'Unable to create authorization item.' => 'Onmogelijk om een authorisatie item aan te maken', + 'Unable to create new authorization rule.' => 'Onmogelijk om een authorisatie regel aan te maken', + 'Unable to delete user. Please, try again later.' => 'Onmogelijk om de gebruiker te wissen. Probeer later opnieuw.', + 'Unable to disable Two factor authentication.' => 'Onmogelijk om de 2 traps authenticatie uit te schakelen.', + 'Unable to remove authorization item.' => 'Onmogelijk om het authorisatie item te wissen.', + 'Unable to send confirmation link' => 'Onmogelijk om de bevestigingsmail te versturen', + 'Unable to send recovery message to the user' => 'Onmogelijk om de herstel email naar de gebruiker te versturen', + 'Unable to update authorization item.' => 'Onmogelijk om het authorisatie item aan te passen.', + 'Unable to update authorization rule.' => 'Onmogelijk om de authorisatie regel aan te passen.', + 'Unable to update block status.' => 'Onmogelijk om het geblokkeerd status aan te passen', + 'Unblock' => 'Maak actief', + 'Unconfirmed' => 'Niet bevestigd', + 'Update' => 'Update', + 'Update assignments' => 'Update toewijzingen', + 'Update permission' => 'Update machtigingen', + 'Update role' => 'Update rol', + 'Update rule' => 'Update regel', + 'Update user account' => 'Update gebruikersaccount', + 'Updated at' => 'geüpdatet op', + 'User account could not be created.' => 'Gebruikers account kan niet worden aangemaakt.', + 'User block status has been updated.' => 'Blokkering gebruiker is aangepast.', + 'User could not be registered.' => 'Gebruiker kan niet worden geregistreerd.', + 'User has been confirmed' => 'Gebruiker is bevestigd', + 'User has been created' => 'Gebruiker is aangemaakt', + 'User has been deleted' => 'Gebruiker is verwijderd', + 'User is not found' => 'Gebruiker niet gevonden', + 'User not found.' => 'Gebruiker niet gevonden', + 'User will be required to change password at next login' => 'Gebruiker zal verplicht worden zijn wachtwoord aan te passen bij volgende login', + 'Username' => 'Gebruikersnaam', + 'Users' => 'Gebruikers', + 'VKontakte' => 'VKontakte', + 'Verification failed. Please, enter new code.' => 'Bevestiging gefaald. Geef een nieuwe code in.', + 'We couldn\'t re-send the mail to confirm your address. Please, verify is the correct email or if it has been confirmed already.' => 'Het was niet mogelijk een email te sturen om je adres te bevestigen. Controleer het email-adres en controleer of het niet al bevestigd is.', + 'We have generated a password for you' => 'Wij genereerden een wachtwoord voor jou', + 'We have received a request to change the email address for your account on {0}' => 'We ontvingen een aanvraag om het email-adres te wijzigen voor je account op {0}', + 'We have received a request to reset the password for your account on {0}' => 'Wij ontvingen een aanvraag om je wachtwoord te herstellen voor je account op {0}', + 'We have sent confirmation links to both old and new email addresses. You must click both links to complete your request.' => 'Er is een bevestigingslink naar zowel je oude als je nieuwe email adres gestuurd. Je moet beiden links openen om de aanvraag te voltooien.', + 'Website' => 'Website', + 'Welcome to {0}' => 'Welkom op {0}', + 'Yandex' => 'Yandex', + 'You are about to delete all your personal data from this site.' => 'Je staat op het punt om al je persoonlijke gegevens te wissen van deze website', + 'You can assign multiple roles or permissions to user by using the form below' => 'Je kan meerdere rollen of machtigingen toewijzen aan de gebruiker doormiddel van onderstaand formulier', + 'You can connect multiple accounts to be able to log in using them' => 'Je kan meerdere accounts verbinden om met deze accounts in te loggen', + 'You cannot remove your own account' => 'Je kan je eigen account niet verwijderen.', + 'You need to confirm your email address' => 'Je moet je email-adres nog bevestigen', + 'Your account details have been updated' => 'Je account-details werden bijgewerkt', + 'Your account has been blocked' => 'Je account is geblokkeerd', + 'Your account has been blocked.' => 'Je account is geblokkeerd.', + 'Your account has been completely deleted' => 'Je account is volledig verwijderd', + 'Your account has been connected' => 'Je account is verbonden', + 'Your account has been created' => 'Je account is aangemaakt', + 'Your account has been created and a message with further instructions has been sent to your email' => 'Je account is aangemaakt en een bericht met verdere instructies is naar je e-mailadres verzonden', + 'Your account on {0} has been created' => 'Je account op {0} is aangemaakt', + 'Your confirmation token is invalid or expired' => 'Je bevestigingscode is ongeldig of verlopen', + 'Your consent is required to register' => 'Je moet akkoord gaan met je toestemming om te registreren', + 'Your email address has been changed' => 'Je email adres werd gewijzigd', + 'Your password has expired, you must change it now' => 'Je wachtwoord is verlopen. Het moet nu gewijzigd worden', + 'Your personal information has been removed' => 'Je persoonlijke gegevens zijn verwijderd', + 'Your profile has been updated' => 'Je profiel is bijgewerkt', + 'privacy policy' => 'privacy policy', + '{0, date, MMMM dd, YYYY HH:mm}' => '{0, date, dd MMMM, YYYY HH:mm}', + '{0} cannot be blank.' => '{0} kan niet leeg zijn.', + '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 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. ' => '@@@@', +]; From e240bad07043a0ba5241f5c4a69909ec1615a601 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20la=20Poutre=CC=81?= Date: Tue, 15 Jan 2019 16:05:45 +0100 Subject: [PATCH 09/51] Improve translations --- src/User/resources/i18n/nl_NL/usuario.php | 34 +++++++++++------------ 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/User/resources/i18n/nl_NL/usuario.php b/src/User/resources/i18n/nl_NL/usuario.php index bf566b2..c50623e 100644 --- a/src/User/resources/i18n/nl_NL/usuario.php +++ b/src/User/resources/i18n/nl_NL/usuario.php @@ -55,7 +55,7 @@ return [ 'Bio' => 'Biografie', 'Block' => 'Blokkeer', 'Block status' => 'Blokkering', - 'Blocked at {0, date, MMMM dd, YYYY HH:mm}' => 'Geblokkeerd om {0, date, MMMM dd, YYYY HH:mm}', + 'Blocked at {0, date, MMMM dd, YYYY HH:mm}' => 'Geblokkeerd op {0, date, MMMM dd, YYYY HH:mm}', 'Cancel' => 'Annuleren', 'Cannot assign role \'{0}\' as the AuthManager is not configured on your console application.' => 'Kan rol {0} niet toewijzen doordat de AuthManager niet geconfigureerd is op de console-applicatie', 'Change your avatar at Gravatar.com' => 'Wijzig je avatar op Gravatar.com', @@ -206,18 +206,18 @@ return [ 'Two factor authentication has been disabled.' => '2 traps authenticatie is uitgeschakeld', 'Two factor authentication protects you against stolen credentials' => '2 traps authenticatie beschermt je tegen gestolen inloggegevens', 'Two factor authentication successfully enabled.' => '2 traps authenticatie met succes ingeschakeld', - 'Unable to confirm user. Please, try again.' => 'Onmogelijk om de gebruiker te bevestigen. Probeer opnieuw.', - 'Unable to create an account.' => 'Onmogelijk om een account aan te maken.', - 'Unable to create authorization item.' => 'Onmogelijk om een authorisatie item aan te maken', - 'Unable to create new authorization rule.' => 'Onmogelijk om een authorisatie regel aan te maken', - 'Unable to delete user. Please, try again later.' => 'Onmogelijk om de gebruiker te wissen. Probeer later opnieuw.', - 'Unable to disable Two factor authentication.' => 'Onmogelijk om de 2 traps authenticatie uit te schakelen.', - 'Unable to remove authorization item.' => 'Onmogelijk om het authorisatie item te wissen.', - 'Unable to send confirmation link' => 'Onmogelijk om de bevestigingsmail te versturen', - 'Unable to send recovery message to the user' => 'Onmogelijk om de herstel email naar de gebruiker te versturen', - 'Unable to update authorization item.' => 'Onmogelijk om het authorisatie item aan te passen.', - 'Unable to update authorization rule.' => 'Onmogelijk om de authorisatie regel aan te passen.', - 'Unable to update block status.' => 'Onmogelijk om het geblokkeerd status aan te passen', + 'Unable to confirm user. Please, try again.' => 'Kan de gebruiker niet bevestigen. Probeer opnieuw.', + 'Unable to create an account.' => 'Kan geen account aanmaken.', + 'Unable to create authorization item.' => 'Kan geen authorisatie-item aanmaken', + 'Unable to create new authorization rule.' => 'Kan geen authorisatieregel aanmaken', + 'Unable to delete user. Please, try again later.' => 'Kan de gebruiker niet wissen. Probeer later opnieuw.', + 'Unable to disable Two factor authentication.' => 'Kan de 2 traps authenticatie niet uitschakelen.', + 'Unable to remove authorization item.' => 'Kan het authorisatie item niet wissen.', + 'Unable to send confirmation link' => 'Kan de bevestigingsmail niet versturen', + 'Unable to send recovery message to the user' => 'Kan de herstel-mail niet naar de gebruiker versturen', + 'Unable to update authorization item.' => 'Kan het authorisatie-item niet aanpassen.', + 'Unable to update authorization rule.' => 'Kan de authorisatieregel niet aanpassen.', + 'Unable to update block status.' => 'Kan de geblokkeerstatus niet aanpassen', 'Unblock' => 'Maak actief', 'Unconfirmed' => 'Niet bevestigd', 'Update' => 'Update', @@ -227,7 +227,7 @@ return [ 'Update rule' => 'Update regel', 'Update user account' => 'Update gebruikersaccount', 'Updated at' => 'geüpdatet op', - 'User account could not be created.' => 'Gebruikers account kan niet worden aangemaakt.', + 'User account could not be created.' => 'Gebruikers-account kan niet worden aangemaakt.', 'User block status has been updated.' => 'Blokkering gebruiker is aangepast.', 'User could not be registered.' => 'Gebruiker kan niet worden geregistreerd.', 'User has been confirmed' => 'Gebruiker is bevestigd', @@ -239,14 +239,14 @@ return [ 'Username' => 'Gebruikersnaam', 'Users' => 'Gebruikers', 'VKontakte' => 'VKontakte', - 'Verification failed. Please, enter new code.' => 'Bevestiging gefaald. Geef een nieuwe code in.', + 'Verification failed. Please, enter new code.' => 'Bevestiging mislukt. Geef een nieuwe code op.', 'We couldn\'t re-send the mail to confirm your address. Please, verify is the correct email or if it has been confirmed already.' => 'Het was niet mogelijk een email te sturen om je adres te bevestigen. Controleer het email-adres en controleer of het niet al bevestigd is.', - 'We have generated a password for you' => 'Wij genereerden een wachtwoord voor jou', + 'We have generated a password for you' => 'Er is een wachtwoord voor je ingesteld', 'We have received a request to change the email address for your account on {0}' => 'We ontvingen een aanvraag om het email-adres te wijzigen voor je account op {0}', 'We have received a request to reset the password for your account on {0}' => 'Wij ontvingen een aanvraag om je wachtwoord te herstellen voor je account op {0}', 'We have sent confirmation links to both old and new email addresses. You must click both links to complete your request.' => 'Er is een bevestigingslink naar zowel je oude als je nieuwe email adres gestuurd. Je moet beiden links openen om de aanvraag te voltooien.', 'Website' => 'Website', - 'Welcome to {0}' => 'Welkom op {0}', + 'Welcome to {0}' => 'Welkom bij {0}', 'Yandex' => 'Yandex', 'You are about to delete all your personal data from this site.' => 'Je staat op het punt om al je persoonlijke gegevens te wissen van deze website', 'You can assign multiple roles or permissions to user by using the form below' => 'Je kan meerdere rollen of machtigingen toewijzen aan de gebruiker doormiddel van onderstaand formulier', From 39e1e5fa6aa78e2fa96a5a2bfc822db2b9c3bb3c Mon Sep 17 00:00:00 2001 From: pierre <27212978+pde159@users.noreply.github.com> Date: Mon, 4 Feb 2019 14:11:13 +0100 Subject: [PATCH 10/51] add french translation (#303) --- CHANGELOG.md | 2 +- src/User/resources/i18n/fr/usuario.php | 537 ++++++++++++------------- 2 files changed, 256 insertions(+), 283 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e193b84..c3ea7b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,7 +26,7 @@ - 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) - + - Enh #303: Added French translation (pde159) ## 1.1.4 - February 19, 2018 - Enh: Check enableEmailConfirmation on registration (faenir) diff --git a/src/User/resources/i18n/fr/usuario.php b/src/User/resources/i18n/fr/usuario.php index 1718269..7cd3caa 100644 --- a/src/User/resources/i18n/fr/usuario.php +++ b/src/User/resources/i18n/fr/usuario.php @@ -17,286 +17,259 @@ * NOTE: this file must be saved in UTF-8 encoding. */ return [ - '(not set)' => '', - 'A confirmation message has been sent to your new email address' => '', - 'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => '', - 'A new confirmation link has been sent' => '', - 'A password will be generated automatically if not provided' => '', - 'Account' => '', - 'Account confirmation' => '', - 'Account details' => '', - 'Account details have been updated' => '', - 'Account settings' => '', - 'Already registered? Sign in!' => '', - '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?' => '', - 'Are you sure you want to delete this user?' => '', - 'Are you sure you want to switch to this user for the rest of this Session?' => '', - 'Are you sure you want to unblock this user?' => '', - 'Are you sure you wish the user to change their password at next login?' => '', - 'Are you sure you wish to send a password recovery email to this user?' => '', - 'Are you sure? Deleted user can not be restored' => '', - 'Are you sure? There is no going back' => '', - 'Assignments' => '', - 'Assignments have been updated' => '', - 'Auth item with such name already exists' => '', - 'Authentication rule class {0} can not be instantiated' => '', - 'Authorization item successfully created.' => '', - 'Authorization item successfully removed.' => '', - 'Authorization item successfully updated.' => '', - 'Authorization rule has been added.' => '', - 'Authorization rule has been removed.' => '', - 'Authorization rule has been updated.' => '', - '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' => '', - 'Bio' => '', - 'Block' => '', - 'Block status' => '', - 'Blocked at {0, date, MMMM dd, YYYY HH:mm}' => '', - 'Cancel' => '', - 'Cannot assign role "{0}" as the AuthManager is not configured on your console application.' => '', - 'Change your avatar at Gravatar.com' => '', - 'Children' => '', - 'Class' => '', - 'Close' => '', - 'Complete password reset on {0}' => '', - 'Confirm' => '', - 'Confirm account on {0}' => '', - 'Confirm email change on {0}' => '', - 'Confirmation' => '', - 'Confirmation status' => '', - 'Confirmation time' => '', - 'Confirmed' => '', - 'Confirmed at {0, date, MMMM dd, YYYY HH:mm}' => '', - 'Connect' => '', - 'Continue' => '', - 'Create' => '', - 'Create a user account' => '', - 'Create new permission' => '', - 'Create new role' => '', - 'Create new rule' => '', - 'Created at' => '', - 'Credentials will be sent to the user by email' => '', - 'Current password' => '', - 'Current password is not valid' => '', - 'Data processing consent' => '', - 'Delete' => '', - 'Delete account' => '', - 'Delete my account' => '', - 'Delete personal data' => '', - 'Deleted by GDPR request' => '', - 'Description' => '', - 'Didn\'t receive confirmation message?' => '', - 'Disable two factor authentication' => '', - 'Disconnect' => '', - 'Don\'t have an account? Sign up!' => '', - 'Download my data' => '', - 'Email' => '', - 'Email (public)' => '', - 'Enable' => '', - 'Enable two factor authentication' => '', - 'Error occurred while changing password' => '', - 'Error occurred while confirming user' => '', - 'Error occurred while deleting user' => '', - 'Error sending registration message to "{email}". Please try again later.' => '', - 'Error sending welcome message to "{email}". Please try again later.' => '', - 'Export my data' => '', - 'Finish' => '', - 'Force password change at next login' => '', - 'Forgot password?' => '', - 'Gravatar email' => '', - 'Hello' => '', - 'Here you can download your personal data in a comma separated values format.' => '', - '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}' => '', - 'If you already registered, sign in and connect this account on settings page' => '', - 'If you cannot click the link, please try pasting the text into your browser' => '', - 'If you did not make this request you can ignore this email' => '', - 'Impersonate this user' => '', - 'In order to complete your registration, please click the link below' => '', - 'In order to complete your request, please click the link below' => '', - 'In order to finish your registration, we need you to enter following fields' => '', - 'Information' => '', - 'Invalid login or password' => '', - 'Invalid or expired link' => '', - 'Invalid password' => '', - 'Invalid two factor authentication code' => '', - 'Invalid value' => '', - 'It will be deleted forever' => '', - 'Items' => '', - 'Joined on {0, date}' => '', - 'Last login IP' => '', - 'Last login time' => '', - 'Last password change' => '', - 'Location' => '', - 'Login' => '', - 'Logout' => '', - 'Manage users' => '', - 'Name' => '', - 'Networks' => '', - 'Never' => '', - 'New email' => '', - 'New password' => '', - 'New permission' => '', - 'New role' => '', - 'New rule' => '', - 'New user' => '', - 'Not blocked' => '', - 'Not found' => '', - 'Once you delete your account, there is no going back' => '', - 'Once you have deleted your data, you will not longer be able to sign in with this account.' => '', - 'Password' => '', - 'Password age' => '', - 'Password has been changed' => '', - 'Permissions' => '', - 'Please be certain' => '', - 'Please click the link below to complete your password reset' => '', - 'Please fix following errors:' => '', - 'Privacy' => '', - 'Privacy settings' => '', - 'Profile' => '', - 'Profile details' => '', - 'Profile details have been updated' => '', - 'Profile settings' => '', - 'Recover your password' => '', - 'Recovery link is invalid or expired. Please try requesting a new one.' => '', - 'Recovery message sent' => '', - 'Registration IP' => '', - 'Registration on this website is disabled' => '', - 'Registration time' => '', - 'Remember me next time' => '', - 'Request new confirmation message' => '', - 'Required "key" cannot be empty.' => '', - 'Required "secret" cannot be empty.' => '', - 'Reset your password' => '', - 'Role "{0}" not found. Creating it.' => '', - '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' => '', - 'Rule {0} not found.' => '', - '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' => '', - 'Something went wrong' => '', - 'Switch identities is disabled.' => '', - 'Thank you for signing up on {0}' => '', - 'Thank you, registration is now complete.' => '', - 'The "recaptcha" component must be configured.' => '', - 'The confirmation link is invalid or expired. Please try requesting a new one.' => '', - 'The verification code is incorrect.' => '', - 'There is neither role nor permission with name "{0}"' => '', - 'There was an error in saving user' => '', - 'This account has already been connected to another user' => '', - 'This email address has already been taken' => '', - 'This username has already been taken' => '', - '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.' => '', - 'Time zone' => '', - 'Time zone is not valid' => '', - 'Two Factor Authentication (2FA)' => '', - 'Two factor authentication code' => '', - 'Two factor authentication has been disabled.' => '', - 'Two factor authentication protects you in case of stolen credentials' => '', - 'Two factor authentication successfully enabled.' => '', - 'Unable to confirm user. Please, try again.' => '', - 'Unable to create an account.' => '', - 'Unable to create authorization item.' => '', - 'Unable to create new authorization rule.' => '', - 'Unable to delete user. Please, try again later.' => '', - 'Unable to disable Two factor authentication.' => '', - 'Unable to remove authorization item.' => '', - 'Unable to send confirmation link' => '', - 'Unable to send recovery message to the user' => '', - 'Unable to update authorization item.' => '', - 'Unable to update authorization rule.' => '', - 'Unable to update block status.' => '', - 'Unblock' => '', - 'Unconfirmed' => '', - 'Update' => '', - 'Update assignments' => '', - 'Update permission' => '', - 'Update role' => '', - 'Update rule' => '', - 'Update user account' => '', - 'Updated at' => '', - 'User account could not be created.' => '', - 'User block status has been updated.' => '', - 'User could not be registered.' => '', - 'User has been confirmed' => '', - 'User has been created' => '', - 'User has been deleted' => '', - 'User is not found' => '', - 'User not found.' => '', - 'User will be required to change password at next login' => '', - 'Username' => '', - 'Users' => '', - 'VKontakte' => '', - 'Verification failed. Please, enter new code.' => '', - 'We couldn\'t re-send the mail to confirm your address. Please, verify is the correct email or if it has been confirmed already.' => '', - '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 reset the password for your account on {0}' => '', - 'We have sent confirmation links to both old and new email addresses. You must click both links to complete your request.' => '', - 'Website' => '', - 'Welcome to {0}' => '', - 'Yandex' => '', - 'You are about to delete all your personal data from this site.' => '', - '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' => '', - 'You need to confirm your email address' => '', - 'Your account details have been updated' => '', - 'Your account has been blocked' => '', - 'Your account has been blocked.' => '', - 'Your account has been completely deleted' => '', - 'Your account has been connected' => '', - 'Your account has been created' => '', - '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 consent is required to register' => '', - 'Your email address has been changed' => '', - 'Your password has expired, you must change it now' => '', - 'Your personal information has been removed' => '', - 'Your profile has been updated' => '', - 'privacy policy' => '', - '{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' => '@@@@', - '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' => '@@@@', - '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}' => '@@@@', + '(not set)' => 'non défini', + 'A confirmation message has been sent to your new email address' => 'Un message de confirmation a été envoyé à votre nouvelle addresse email', + 'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => 'Un message a été envoyé à votre addresse email', + 'A new confirmation link has been sent' => 'Un nouveau lien de confirmation a été envoyé', + 'A password will be generated automatically if not provided' => 'Un mot de passe va être généré automatiquement si non fourni', + 'Account' => 'Compte', + 'Account confirmation' => 'Confirmation du compte', + 'Account details' => 'Détails du compte', + 'Account details have been updated' => 'Les détails du compte ont été mis à jour', + 'Account settings' => 'Réglages du compte', + 'Already registered? Sign in!' => 'Déjà enregistré? Connectez-vous!', + '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.' => 'Un email contenant les instructions pour créer un nouveau mot de passe a été envoyé à {email} s\'il est associé à un compte {appName}. Votre mot de pase existant n\'a pas été changé', + 'An error occurred processing your request' => 'Une erreur s\'est produite lors du traitement de votre demande', + 'Are you sure you want to block this user?' => 'Êtes vous sûr de vouloir bloquer cet utilisateur?', + 'Are you sure you want to confirm this user?' => 'Êtes-vous sûr de vouloir confirmer cet utilisateur?', + 'Are you sure you want to delete this user?' => 'Êtes-vous sûr de vouloir supprimer cet utilisateur?', + 'Are you sure you want to switch to this user for the rest of this Session?' => 'Êtes-vous sûr de vouloir changer vers cet utilisateur pour le reste de cette Session?', + 'Are you sure you want to unblock this user?' => 'Êtes-vous sûr de vouloir déverouiller cet utilisateur?', + 'Are you sure you wish the user to change their password at next login?' => 'Souhaitez-vous vraiment que l\'utilisateur change son mot de passe à la prochaine connexion?', + 'Are you sure you wish to send a password recovery email to this user?' => 'Souhaitez-vous vraiment envoyer un email de récuperation de mot de passe à cet utilisateur?', + 'Are you sure? Deleted user can not be restored' => 'Êtes-vous sûr? Les utilisateurs supprimés ne peuvent pas être restaurés', + 'Are you sure? There is no going back' => 'Êtes-vous sûr? Il n\'y a pas de retour arrière possible', + 'Assignments' => 'Affectations', + 'Assignments have been updated' => 'Les affectations ont été mises à jour', + 'Auth item with such name already exists' => 'Un élément d\'Auth avec le même nom existe déjà', + 'Authentication rule class {0} can not be instantiated' => 'la classe de règles d\'Authentification {0} ne peut être instanciée', + 'Authorization item successfully created.' => 'Élément d\'autorisation créé avec succès', + 'Authorization item successfully removed.' => 'Élément d\'autorisation supprimé avec succès', + 'Authorization item successfully updated.' => 'Élément d\'autorisation mis à jour avec succès', + 'Authorization rule has been added.' => 'La règle d\'autorisation a été ajoutée', + 'Authorization rule has been removed.' => 'La règle d\'autorisation a été supprimée', + 'Authorization rule has been updated.' => 'La règle d\'autorisation a été mise à jour', + 'Awesome, almost there. Now you need to click the confirmation link sent to your new email address.' => 'Génial, vous y êtes presque. Vous devez maintenant cliquer sur le lien de confirmation depuis votre nouvelle addresse email', + 'Awesome, almost there. Now you need to click the confirmation link sent to your old email address.' => 'Génial, vous y êtes presque. Vous devez maintenant cliquer sur le lien de confirmation depuis votre ancienne addresse email', + 'Back to privacy settings' => 'Retour aux réglages de confidentialité', + 'Bio' => 'Biographie', + 'Block' => 'Verouiller', + 'Block status' => 'État du verouillage', + 'Blocked at {0, date, MMMM dd, YYYY HH:mm}' => 'Verouillé depuis le {0, date, dd MMMM YYYY HH:mm}', + 'Cancel' => 'Annuler', + 'Cannot assign role "{0}" as the AuthManager is not configured on your console application.' => 'Impossible d\'assigner le rôle {0} tant que AuthManager n\'est pas configuré depuis la console de l\'application.', + 'Change your avatar at Gravatar.com' => 'Changez votre avatar depuis Gravatar.com', + 'Children' => 'Enfant', + 'Class' => 'Catégorie', + 'Close' => 'Fermer', + 'Complete password reset on {0}' => 'Terminer la réinitialisation du mot de passe sur {0}', + 'Confirm' => 'Confirmer', + 'Confirm account on {0}' => 'Confirmer le compte sur {0}', + 'Confirm email change on {0}' => 'Confirmer le changement d\'email sur {0}', + 'Confirmation' => 'Confirmation', + 'Confirmation status' => 'État de la confirmation', + 'Confirmation time' => 'Heure de confirmation', + 'Confirmed' => 'Confirmé', + 'Confirmed at {0, date, MMMM dd, YYYY HH:mm}' => 'Confirmé le {0, date, dd MMMM YYYY HH:mm}', + 'Connect' => 'Connecter', + 'Continue' => 'Continuer', + 'Create' => 'Créer', + 'Create a user account' => 'Créer un compte utilisateur', + 'Create new permission' => 'Créer une nouvelle permission', + 'Create new role' => 'Créer un nouveau rôle', + 'Create new rule' => 'Créer une nouvelle règle', + 'Created at' => 'Créé(e) le', + 'Credentials will be sent to the user by email' => 'Les identifiants vont être envoyés à l\'utilisateur par email', + 'Current password' => 'Mot de passe actuel', + 'Current password is not valid' => 'Le mot de passe actuel est invalide', + 'Data processing consent' => 'Traitement de vérification', + 'Delete' => 'SUpprimer', + 'Delete account' => 'Supprimer le compte', + 'Delete my account' => 'Supprimer mon compte', + 'Delete personal data' => 'Supprimer les données personnelles', + 'Deleted by GDPR request' => 'Supprimé par une requête RGPD', + 'Description' => 'Description', + 'Didn\'t receive confirmation message?' => 'Vous n\'avez pas reçu le message de confirmation?', + 'Disable two factor authentication' => 'Désactiver l\'authentification à double facteur', + 'Disconnect' => 'Déconnecter', + 'Don\'t have an account? Sign up!' => 'Vous n\'avez pas de compte? Inscrivez-vous!', + 'Download my data' => 'Télécharger mes données', + 'Email' => 'Email', + 'Email (public)' => 'Email (publique)', + 'Enable' => 'Activer', + 'Enable two factor authentication' => 'Activer l\'authentification à double facteur', + 'Error occurred while changing password' => 'Une erreur est survenue lors du changement de mot de passe', + 'Error occurred while confirming user' => 'Une erreur est survenue lors de la confirmation de l\'utilisateur', + 'Error occurred while deleting user' => 'Une erreur est survenue lors de la suppression de l\'utilisateur', + 'Error sending registration message to "{email}". Please try again later.' => 'Erreur lors de l\'envoi du message d\'inscription à "{email}". Veuillez essayer plus tard.', + 'Error sending welcome message to "{email}". Please try again later.' => 'Erreur lors de l\'envoi du message de bienvenue à "{email}". Veuillez essayer plus tard.', + 'Export my data' => 'Exporter mes données', + 'Finish' => 'Terminer', + 'Force password change at next login' => 'Forcer le changement de mot de passe à la prochaine connexion', + 'Forgot password?' => 'Mot de passe oublié?', + 'Gravatar email' => 'Email gravatar', + 'Hello' => 'Bonjour', + 'Here you can download your personal data in a comma separated values format.' => 'Ici vous pouvez télécharger vos données personnelles dans un format avec les données séparées par des virgules', + '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}' => 'J\'accepte le traitement de mes données personelles et l\'utilisation de cookies pour faciliter le fonctionnement de ce site. Pour plus d\'information, lisez notre {privacyPolicy}', + 'If you already registered, sign in and connect this account on settings page' => 'Si vous êtes déjà inscrit, connectez-vous et liez ce compte dans la page des réglages', + 'If you cannot click the link, please try pasting the text into your browser' => 'Si vous ne parvenez pas à cliquer sur le lien, veuillez essayer de coller le texte dans votre navigateur', + 'If you did not make this request you can ignore this email' => 'Si vous n\'avez pas fait cette demande, vous pouvez ignorer cet email', + 'Impersonate this user' => 'Connecter en tant que cet utilisateur', + 'In order to complete your registration, please click the link below' => 'Pour compléter votre inscription, merci de cliquer sur le lien ci-dessous', + 'In order to complete your request, please click the link below' => 'Pour compléter votre demande, merci de cliquer sur le lien ci-dessous', + 'In order to finish your registration, we need you to enter following fields' => 'Pour terminer votre inscription, vous devez remplir les champs suivants', + 'Information' => 'Information', + 'Invalid login or password' => 'Nom d\'utilisateur ou mot de passe invalide', + 'Invalid or expired link' => 'Lien invalide ou expiré', + 'Invalid password' => 'Mot de passe invalide', + 'Invalid two factor authentication code' => 'Code d\'authentification à double facteur invalide', + 'Invalid value' => 'Donnée invalide', + 'It will be deleted forever' => 'Cela va être supprimé définitivement', + 'Items' => 'Éléments', + 'Joined on {0, date}' => 'Rejoint le {0, date}', + 'Last login IP' => 'Dernière IP de connexion', + 'Last login time' => 'Dernière heure de connexion', + 'Last password change' => 'Dernier changement de mot de passe', + 'Location' => 'Emplacement', + 'Login' => 'S\'identifier', + 'Logout' => 'Se déconnecter', + 'Manage users' => 'Gérer les utilisateurs', + 'Name' => 'Nom', + 'Networks' => 'Réseaux', + 'Never' => 'Jamais', + 'New email' => 'Nouvel email', + 'New password' => 'Nouveau mot de passe', + 'New permission' => 'Nouvelle permission', + 'New role' => 'Nouveau rôle', + 'New rule' => 'Nouvelle règle', + 'New user' => 'Nouvel utilisateur', + 'Not blocked' => 'Dévérouillé', + 'Not found' => 'Introuvable', + 'Once you delete your account, there is no going back' => 'Une fois votre compte supprimé, il n\'est pas possible de revenir en arrière', + 'Once you have deleted your data, you will not longer be able to sign in with this account.' => 'Une fois vos données supprimées, vous ne pourrez plus vous identifier avec ce compte', + 'Password' => 'Mot de passe', + 'Password age' => 'Age du mot de passe', + 'Password has been changed' => 'Le mot de passe a été modifié', + 'Permissions' => 'Permissions', + 'Please be certain' => 'Soyez certains', + 'Please click the link below to complete your password reset' => 'Merci de cliquer sur le lien ci-dessous pour compléter la réinitialisation de votre mot de passe', + 'Please fix following errors:' => 'Merci de corriger les erreurs suivantes:', + 'Privacy' => 'Confidentialité', + 'Privacy settings' => 'Paramètres de confidentialité', + 'Profile' => 'Profil', + 'Profile details' => 'Détails du profil', + 'Profile details have been updated' => 'Les détails du profil ont été mis à jour', + 'Profile settings' => 'Paramètres du profil', + 'Recover your password' => 'Récupérer votre mot de passe', + 'Recovery link is invalid or expired. Please try requesting a new one.' => 'Le lien de récuperation a expiré ou est invalide. Veuillez tenter à nouveau de faire une demande', + 'Recovery message sent' => 'Message de récupération envoyé', + 'Registration IP' => 'IP d\'inscription', + 'Registration on this website is disabled' => 'L\'inscription est désactivée sur ce site', + 'Registration time' => 'Heure d\'inscription', + 'Remember me next time' => 'Se souvenir de moi la prochaine fois', + 'Request new confirmation message' => 'Demander un noouveau message de confirmation', + 'Required "key" cannot be empty.' => 'Le champ "key" requis ne peut être vide', + 'Required "secret" cannot be empty.' => 'Le champ "secret" requis ne peut être vide', + 'Reset your password' => 'Réinitialiser votre mot de passe', + 'Role "{0}" not found. Creating it.' => 'Rôle "{0}" introuvable. Creation en cours.', + 'Roles' => 'Rôles', + 'Rule' => 'Règle', + 'Rule class must extend "yii\\rbac\\Rule".' => 'La règle doit étendre "yii\\rbac\\Rule"', + 'Rule class name' => 'Nom de la classe de la règle', + 'Rule name' => 'Nom de la règle', + 'Rule name {0} is already in use' => 'Le nom de la règle {0} existe déjà', + 'Rule {0} does not exists' => 'La règle {0} n\'existe pas', + 'Rule {0} not found.' => 'Règle introuvable', + 'Rules' => 'Règles', + 'Save' => 'Enregistrer', + 'Scan the QrCode with Google Authenticator App, then insert its temporary code on the box and submit.' => 'Scanner le QrCode à l\'aide de l\'application Google Authenticator, ensuite entrez le code temporaire dans l\'emplacement prévu à cet effet puis validez.', + 'Select rule...' => 'Sélectionner une règle...', + 'Send password recovery email' => 'Envoyer un email de récuperation de mot de passe', + 'Sign in' => 'Se connecter', + 'Sign up' => 'S\'inscrire', + 'Something went wrong' => 'Quelque chose s\'est mal déroulé', + 'Switch identities is disabled.' => 'Le changement d\'identité est désactivé', + 'Thank you for signing up on {0}' => 'Merci de vous être inscrit sur {0}', + 'Thank you, registration is now complete.' => 'Merci, l\'inscription est maintenant terminée', + 'The "recaptcha" component must be configured.' => 'Le composant "recaptcha" doit être configuré', + 'The confirmation link is invalid or expired. Please try requesting a new one.' => 'Le lien de confirmation est invalide ou expiré. Veuillez tenter à nouveau de faire une demande', + 'The verification code is incorrect.' => 'Le code de vérification est incorrecte', + 'There is neither role nor permission with name "{0}"' => 'Il n\'y a ni rôle ni permission avec le nom "{0}"', + 'There was an error in saving user' => 'Une erreur s\'est produite lors de l\'enregistrement de l\'utilisateur', + 'This account has already been connected to another user' => 'Ce compte a déjà été lié à un autre utilisateur', + 'This email address has already been taken' => 'Cette adresse email a déjà été utilisée', + 'This username has already been taken' => 'Ce nom d\'utilisateur a déjà été utilisé', + 'This will disable two factor authentication. Are you sure?' => 'Cela va désactiver l\'authentification à double facteur. Êtes-vous sûr?', + 'This will remove your personal data from this site. You will no longer be able to sign in.' => 'Cela va supprimer vos données personnelles de ce site. Vous ne pourrez plus vous connecter.', + 'Time zone' => 'Fuseau horaire', + 'Time zone is not valid' => 'Le fuseau horaire n\'est invalide', + 'Two Factor Authentication (2FA)' => 'Authentification à Double Facteur (2FA)', + 'Two factor authentication code' => 'Code d\'authentification à double facteur', + 'Two factor authentication has been disabled.' => 'L\'authentification à double facteur a été désactivée', + 'Two factor authentication protects you in case of stolen credentials' => 'L\'authentification à double facteur vous protège en cas de vol de vos identifiants', + 'Two factor authentication successfully enabled.' => 'Authentification à double facteur activée avec succès.', + 'Unable to confirm user. Please, try again.' => 'Impossible de confirmer l\'utilisateur. Veuillez réessayer.', + 'Unable to create an account.' => 'Impossible de créer le compte.', + 'Unable to create authorization item.' => 'Impossible de créer l\'élément d\'autorisation.', + 'Unable to create new authorization rule.' => 'Impossible de créer une nouvelle règle d\'autorisation', + 'Unable to delete user. Please, try again later.' => 'Impossible de supprimer l\'utilisateur. Veuillez réessayer plus tard.', + 'Unable to disable Two factor authentication.' => 'Impossible de désactiver l\'authentification à double facteur', + 'Unable to remove authorization item.' => 'Impossible de supprimer l\'élément d\'autorisation.', + 'Unable to send confirmation link' => 'Impossible d\'envoyer un lien de confirmation', + 'Unable to send recovery message to the user' => 'Impossible d\'envoyer un message de récupération à l\'utilisateur', + 'Unable to update authorization item.' => 'Impossible de mettre à jour l\'élément d\'autorisation.', + 'Unable to update authorization rule.' => 'Impossible de mettre à jour la règle d\'autorisation.', + 'Unable to update block status.' => 'Impossible de mettre à jour le status de verouillage', + 'Unblock' => 'Dévérouillé', + 'Unconfirmed' => 'Non confirmé', + 'Update' => 'Mettre à jour', + 'Update assignments' => 'Mettre à jour les affectations', + 'Update permission' => 'Mettre à jour la permission', + 'Update role' => 'Mettre à jour le rôle', + 'Update rule' => 'Mettre à jour la règle', + 'Update user account' => 'Mettre à jour le compte utilisateur', + 'Updated at' => 'Mis à jour le', + 'User account could not be created.' => 'Le compte ne peut être créé.', + 'User block status has been updated.' => 'le status de verrouillage a été mis à jour.', + 'User could not be registered.' => 'L\'utilisateur ne peut pas être inscrit.', + 'User has been confirmed' => 'L\'utilisateur a été confirmé', + 'User has been created' => 'L\'utilisateur a été créé', + 'User has been deleted' => 'L\'utilisateur a été supprimé', + 'User is not found' => 'L\'utilisateur est introuvable', + 'User not found.' => 'Utilisateur introuvable', + 'User will be required to change password at next login' => 'L\'utilisateur devra changer de mot de passe à la prochaine connexion', + 'Username' => 'Utilisteur', + 'Users' => 'Utilisteurs', + 'VKontakte' => 'VKontakte', + 'Verification failed. Please, enter new code.' => 'La vérification a echoué. Veuillez entrer un nouveau code.', + 'We couldn\'t re-send the mail to confirm your address. Please, verify is the correct email or if it has been confirmed already.' => 'Nous ne pouvons pas renvoyer le mail de confirmation pour confirmer votre adresse. Veuillez vérifier si l\'email est correct et qu\'il n\'a pas déjà été confirmé', + 'We have generated a password for you' => 'Nous avons généré un mot de passe pour vous', + 'We have received a request to change the email address for your account on {0}' => 'Nous avons reçu une demande de changement d\'adresse email pour votre compte {0}', + 'We have received a request to reset the password for your account on {0}' => 'Nous avons reçu une demande de réinitialisation de mot de passe pour votre compte {0}', + 'We have sent confirmation links to both old and new email addresses. You must click both links to complete your request.' => 'Nous avons envoyé des liens de confirmation à vos nouvel et ancienne adresses email.', + 'Website' => 'Site web', + 'Welcome to {0}' => 'Bienvenue à {0}', + 'Yandex' => 'Yandex', + 'You are about to delete all your personal data from this site.' => 'Vous allez supprimer toutes vos données personnelles de ce site.', + 'You can assign multiple roles or permissions to user by using the form below' => 'Vous pouvez affecter de multiples rôles ou permissions aux utilisateurs en utilisant le fomulaire ci-dessous', + 'You can connect multiple accounts to be able to log in using them' => 'Vous pouvez lier de multiples comptes pour pouvoir vous connecter en les utilisant', + 'You cannot remove your own account' => 'Vous ne pouvez pas supprimer votre propre compte', + 'You need to confirm your email address' => 'Vous devez confirmer votre adresse email', + 'Your account details have been updated' => 'Les détails de votre compte ont été mis à jour', + 'Your account has been blocked' => 'Votre compte a été vérouillé', + 'Your account has been blocked.' => 'Votre compte a été vérouillé.', + 'Your account has been completely deleted' => 'Votre compte a été supprimé définitivement', + 'Your account has been connected' => 'Votre compte a été lié', + 'Your account has been created' => 'Votre compte a été créé', + 'Your account has been created and a message with further instructions has been sent to your email' => 'Votre compte a été créé et un message avec les instructions complètes a été envoyé à votre adress email', + 'Your account on {0} has been created' => 'Votre compte {0} a été créé', + 'Your confirmation token is invalid or expired' => 'Votre jeton de confirmation est invalide ou expiré', + 'Your consent is required to register' => 'Votre consentement est requis pour l\'inscription', + 'Your email address has been changed' => 'Votre adresse email a été modifiée', + 'Your password has expired, you must change it now' => 'Votre mot de passe a expiré, vous devez le renouveler maintenant', + 'Your personal information has been removed' => 'Vos données personnelles ont été supprimées', + 'Your profile has been updated' => 'Votre profil a été mis à jour', + 'privacy policy' => 'politique de confidentialité', + '{0, date, MMMM dd, YYYY HH:mm}' => '{0, date, dd MMMM YYYY HH:mm}', + '{0} cannot be blank.' => '{0} ne peut être vide.', ]; From f16de775be35d8bbd5adbc6d7822b0299735c6d0 Mon Sep 17 00:00:00 2001 From: Lorenzo Milesi Date: Mon, 4 Feb 2019 14:13:22 +0100 Subject: [PATCH 11/51] fix another example #291 --- docs/events/form-events.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/events/form-events.md b/docs/events/form-events.md index 1df2988..b244381 100644 --- a/docs/events/form-events.md +++ b/docs/events/form-events.md @@ -53,8 +53,7 @@ Event::on(RecoveryController::class, FormEvent::EVENT_BEFORE_REQUEST, function ( $form = $event->getForm(); // ... your logic here -} - +}); ``` Now, include `events.php` file to your entry script (i.e. `index.php`). The following is taken from the Yii 2 Advanced From 4084c555924f94cb1578dfffb59c3fa9f6fd9293 Mon Sep 17 00:00:00 2001 From: Marco Moreno Date: Fri, 15 Mar 2019 16:31:09 -0400 Subject: [PATCH 12/51] Fixed broken regex character class --- src/User/Model/AbstractAuthItem.php | 2 +- src/User/Model/Rule.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/User/Model/AbstractAuthItem.php b/src/User/Model/AbstractAuthItem.php index 9080582..573c3e8 100644 --- a/src/User/Model/AbstractAuthItem.php +++ b/src/User/Model/AbstractAuthItem.php @@ -98,7 +98,7 @@ abstract class AbstractAuthItem extends Model return [ ['itemName', 'safe'], ['name', 'required'], - ['name', 'match', 'pattern' => '/^[\w][\w-.:]+[\w]$/'], + ['name', 'match', 'pattern' => '/^[\w][\w.:-]+[\w]$/'], [['name', 'description', 'rule'], 'trim'], [ 'name', diff --git a/src/User/Model/Rule.php b/src/User/Model/Rule.php index a8d1f55..b0b415d 100644 --- a/src/User/Model/Rule.php +++ b/src/User/Model/Rule.php @@ -53,7 +53,7 @@ class Rule extends Model return [ [['name', 'className'], 'trim'], [['name', 'className'], 'required'], - [['name', 'previousName'], 'match', 'pattern' => '/^[\w][\w-.:]+[\w]$/'], + [['name', 'previousName'], 'match', 'pattern' => '/^[\w][\w.:-]+[\w]$/'], [['name'], RbacRuleNameValidator::class, 'previousName' => $this->previousName], [['className'], RbacRuleValidator::class], ]; From 1d5d2a51e0a07b1f7bc8ed92096d4c78832368fb Mon Sep 17 00:00:00 2001 From: Marco Moreno Date: Fri, 15 Mar 2019 17:15:50 -0400 Subject: [PATCH 13/51] Updated CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c3ea7b7..95cb0b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,7 @@ - Enh #249: Show message `email send if possible` any time on reset password request (bscheshirwork) - Enh #282: Allows customization of controller namespace (maxxer) - Enh #303: Added French translation (pde159) + - Fix: Fixed broken regex character class (CheckeredFlag) ## 1.1.4 - February 19, 2018 - Enh: Check enableEmailConfirmation on registration (faenir) From 0986f4f75646204ad2e99562e68fca25e90933fc Mon Sep 17 00:00:00 2001 From: Antonio Ramirez Date: Fri, 15 Mar 2019 22:46:42 +0100 Subject: [PATCH 14/51] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 95cb0b0..389dc32 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,7 +27,7 @@ - Enh #249: Show message `email send if possible` any time on reset password request (bscheshirwork) - Enh #282: Allows customization of controller namespace (maxxer) - Enh #303: Added French translation (pde159) - - Fix: Fixed broken regex character class (CheckeredFlag) + - Fix #304: Fixed broken regex character class (CheckeredFlag) ## 1.1.4 - February 19, 2018 - Enh: Check enableEmailConfirmation on registration (faenir) From a771f287b2893ccd4677ea4ffd6c904bc3675b0a Mon Sep 17 00:00:00 2001 From: Antonio Ramirez Date: Mon, 15 Apr 2019 21:10:17 +0200 Subject: [PATCH 15/51] Update composer.json --- composer.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/composer.json b/composer.json index 0c99f6e..efca136 100644 --- a/composer.json +++ b/composer.json @@ -35,12 +35,6 @@ "email": "hola@2amigos.us", "homepage": "http://2amigos.us", "role": "Developer" - }, - { - "name": "Timur Ruziev", - "email": "resurtm@2amigos.us", - "homepage": "http://resurtm.com", - "role": "Developer" } ], "minimum-stability": "dev", From 4455075b31aec354f52c582609e11551ec5960dd Mon Sep 17 00:00:00 2001 From: Lorenzo Milesi Date: Thu, 18 Apr 2019 11:15:47 +0200 Subject: [PATCH 16/51] Enabled testing for php7.3, dropped 7.0 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index dbe3f4d..0e7dc4a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,9 +6,9 @@ language: php php: - 5.6 - - 7.0 - 7.1 - 7.2 + - 7.3 - nightly matrix: From ec428ab46dbd7ba23579ae00685ca324880ad83b Mon Sep 17 00:00:00 2001 From: Lorenzo Milesi Date: Fri, 19 Apr 2019 16:48:39 +0200 Subject: [PATCH 17/51] Username regexps PCRE2 compatible https://github.com/2amigos/yii2-usuario/commit/4084c555924f94cb1578dfffb59c3fa9f6fd9293#comments --- src/User/Model/AbstractAuthItem.php | 2 +- src/User/Model/Rule.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/User/Model/AbstractAuthItem.php b/src/User/Model/AbstractAuthItem.php index 573c3e8..ed5061f 100644 --- a/src/User/Model/AbstractAuthItem.php +++ b/src/User/Model/AbstractAuthItem.php @@ -98,7 +98,7 @@ abstract class AbstractAuthItem extends Model return [ ['itemName', 'safe'], ['name', 'required'], - ['name', 'match', 'pattern' => '/^[\w][\w.:-]+[\w]$/'], + ['name', 'match', 'pattern' => '/^\w[\w.:\-]+\w$/'], [['name', 'description', 'rule'], 'trim'], [ 'name', diff --git a/src/User/Model/Rule.php b/src/User/Model/Rule.php index b0b415d..1803947 100644 --- a/src/User/Model/Rule.php +++ b/src/User/Model/Rule.php @@ -53,7 +53,7 @@ class Rule extends Model return [ [['name', 'className'], 'trim'], [['name', 'className'], 'required'], - [['name', 'previousName'], 'match', 'pattern' => '/^[\w][\w.:-]+[\w]$/'], + [['name', 'previousName'], 'match', 'pattern' => '/^\w[\w.:\-]+\w$/'], [['name'], RbacRuleNameValidator::class, 'previousName' => $this->previousName], [['className'], RbacRuleValidator::class], ]; From 985b99fb1e8b3d208a27cb839b2352615aba9e02 Mon Sep 17 00:00:00 2001 From: Lorenzo Milesi Date: Fri, 19 Apr 2019 16:54:25 +0200 Subject: [PATCH 18/51] Forgot changelog for 1.5.0 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 389dc32..883de8e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # CHANGELOG -## 1.1.5 - Work in progress +## 1.5.0 April 19, 2019 - Fix: Fix condition in EmailChangeService (it was always false) (borisaeric) - Fix #198: Updated translations by quique, bizley, TonisOrmisson, guogan, Dezinger, maxxer, wautvda, mrbig00, fabiomlferreira, WeeSee - Fix #209: Doc fix. allowAccountDelete default value is false (Dezinger) From ac1cac4ff7be9f5e59989379e30a6eaf6678a01f Mon Sep 17 00:00:00 2001 From: Alain Rollmann Date: Thu, 16 May 2019 12:07:08 +0200 Subject: [PATCH 19/51] Fix French translation (#307) --- CHANGELOG.md | 1 + src/User/resources/i18n/fr/usuario.php | 118 ++++++++++++------------- 2 files changed, 60 insertions(+), 59 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 883de8e..71786f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ # CHANGELOG + - Fix #307: Fix French translation (arollmann) ## 1.5.0 April 19, 2019 - Fix: Fix condition in EmailChangeService (it was always false) (borisaeric) diff --git a/src/User/resources/i18n/fr/usuario.php b/src/User/resources/i18n/fr/usuario.php index 7cd3caa..4c8b74d 100644 --- a/src/User/resources/i18n/fr/usuario.php +++ b/src/User/resources/i18n/fr/usuario.php @@ -18,8 +18,8 @@ */ return [ '(not set)' => 'non défini', - 'A confirmation message has been sent to your new email address' => 'Un message de confirmation a été envoyé à votre nouvelle addresse email', - 'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => 'Un message a été envoyé à votre addresse email', + 'A confirmation message has been sent to your new email address' => 'Un message de confirmation a été envoyé à votre nouvelle adresse email', + 'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => 'Un message a été envoyé à votre adresse email', 'A new confirmation link has been sent' => 'Un nouveau lien de confirmation a été envoyé', 'A password will be generated automatically if not provided' => 'Un mot de passe va être généré automatiquement si non fourni', 'Account' => 'Compte', @@ -27,37 +27,37 @@ return [ 'Account details' => 'Détails du compte', 'Account details have been updated' => 'Les détails du compte ont été mis à jour', 'Account settings' => 'Réglages du compte', - 'Already registered? Sign in!' => 'Déjà enregistré? Connectez-vous!', - '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.' => 'Un email contenant les instructions pour créer un nouveau mot de passe a été envoyé à {email} s\'il est associé à un compte {appName}. Votre mot de pase existant n\'a pas été changé', + 'Already registered? Sign in!' => 'Déjà enregistré ? Connectez-vous !', + '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.' => 'Un email contenant les instructions pour créer un nouveau mot de passe a été envoyé à {email} s\'il est associé à un compte {appName}. Votre mot de passe existant n\'a pas été changé', 'An error occurred processing your request' => 'Une erreur s\'est produite lors du traitement de votre demande', - 'Are you sure you want to block this user?' => 'Êtes vous sûr de vouloir bloquer cet utilisateur?', - 'Are you sure you want to confirm this user?' => 'Êtes-vous sûr de vouloir confirmer cet utilisateur?', - 'Are you sure you want to delete this user?' => 'Êtes-vous sûr de vouloir supprimer cet utilisateur?', - 'Are you sure you want to switch to this user for the rest of this Session?' => 'Êtes-vous sûr de vouloir changer vers cet utilisateur pour le reste de cette Session?', - 'Are you sure you want to unblock this user?' => 'Êtes-vous sûr de vouloir déverouiller cet utilisateur?', - 'Are you sure you wish the user to change their password at next login?' => 'Souhaitez-vous vraiment que l\'utilisateur change son mot de passe à la prochaine connexion?', - 'Are you sure you wish to send a password recovery email to this user?' => 'Souhaitez-vous vraiment envoyer un email de récuperation de mot de passe à cet utilisateur?', - 'Are you sure? Deleted user can not be restored' => 'Êtes-vous sûr? Les utilisateurs supprimés ne peuvent pas être restaurés', - 'Are you sure? There is no going back' => 'Êtes-vous sûr? Il n\'y a pas de retour arrière possible', + 'Are you sure you want to block this user?' => 'Êtes vous sûr de vouloir bloquer cet utilisateur ?', + 'Are you sure you want to confirm this user?' => 'Êtes-vous sûr de vouloir confirmer cet utilisateur ?', + 'Are you sure you want to delete this user?' => 'Êtes-vous sûr de vouloir supprimer cet utilisateur ?', + 'Are you sure you want to switch to this user for the rest of this Session?' => 'Êtes-vous sûr de vouloir basculer vers cet utilisateur pour le reste de cette session ?', + 'Are you sure you want to unblock this user?' => 'Êtes-vous sûr de vouloir déverrouiller cet utilisateur ?', + 'Are you sure you wish the user to change their password at next login?' => 'Souhaitez-vous vraiment que l\'utilisateur change son mot de passe à la prochaine connexion ?', + 'Are you sure you wish to send a password recovery email to this user?' => 'Souhaitez-vous vraiment envoyer un email de récupération de mot de passe à cet utilisateur ?', + 'Are you sure? Deleted user can not be restored' => 'Êtes-vous sûr ? Les utilisateurs supprimés ne peuvent pas être restaurés', + 'Are you sure? There is no going back' => 'Êtes-vous sûr ? Il n\'y a pas de retour en arrière possible', 'Assignments' => 'Affectations', 'Assignments have been updated' => 'Les affectations ont été mises à jour', - 'Auth item with such name already exists' => 'Un élément d\'Auth avec le même nom existe déjà', - 'Authentication rule class {0} can not be instantiated' => 'la classe de règles d\'Authentification {0} ne peut être instanciée', + 'Auth item with such name already exists' => 'Un élément d\'authentification avec le même nom existe déjà', + 'Authentication rule class {0} can not be instantiated' => 'La classe de règles d\'authentification {0} ne peut être instanciée', 'Authorization item successfully created.' => 'Élément d\'autorisation créé avec succès', 'Authorization item successfully removed.' => 'Élément d\'autorisation supprimé avec succès', 'Authorization item successfully updated.' => 'Élément d\'autorisation mis à jour avec succès', 'Authorization rule has been added.' => 'La règle d\'autorisation a été ajoutée', 'Authorization rule has been removed.' => 'La règle d\'autorisation a été supprimée', 'Authorization rule has been updated.' => 'La règle d\'autorisation a été mise à jour', - 'Awesome, almost there. Now you need to click the confirmation link sent to your new email address.' => 'Génial, vous y êtes presque. Vous devez maintenant cliquer sur le lien de confirmation depuis votre nouvelle addresse email', - 'Awesome, almost there. Now you need to click the confirmation link sent to your old email address.' => 'Génial, vous y êtes presque. Vous devez maintenant cliquer sur le lien de confirmation depuis votre ancienne addresse email', + 'Awesome, almost there. Now you need to click the confirmation link sent to your new email address.' => 'Génial, vous y êtes presque. Vous devez maintenant cliquer sur le lien de confirmation depuis votre nouvelle adresse email', + 'Awesome, almost there. Now you need to click the confirmation link sent to your old email address.' => 'Génial, vous y êtes presque. Vous devez maintenant cliquer sur le lien de confirmation depuis votre ancienne adresse email', 'Back to privacy settings' => 'Retour aux réglages de confidentialité', 'Bio' => 'Biographie', - 'Block' => 'Verouiller', - 'Block status' => 'État du verouillage', - 'Blocked at {0, date, MMMM dd, YYYY HH:mm}' => 'Verouillé depuis le {0, date, dd MMMM YYYY HH:mm}', + 'Block' => 'Verrouiller', + 'Block status' => 'État du verrouillage', + 'Blocked at {0, date, MMMM dd, YYYY HH:mm}' => 'Verrouillé depuis le {0, date, dd MMMM YYYY HH:mm}', 'Cancel' => 'Annuler', - 'Cannot assign role "{0}" as the AuthManager is not configured on your console application.' => 'Impossible d\'assigner le rôle {0} tant que AuthManager n\'est pas configuré depuis la console de l\'application.', + 'Cannot assign role "{0}" as the AuthManager is not configured on your console application.' => 'Impossible d\'assigner le rôle {0} tant que l\'AuthManager n\'est pas configuré depuis la console de l\'application.', 'Change your avatar at Gravatar.com' => 'Changez votre avatar depuis Gravatar.com', 'Children' => 'Enfant', 'Class' => 'Catégorie', @@ -83,38 +83,38 @@ return [ 'Current password' => 'Mot de passe actuel', 'Current password is not valid' => 'Le mot de passe actuel est invalide', 'Data processing consent' => 'Traitement de vérification', - 'Delete' => 'SUpprimer', + 'Delete' => 'Supprimer', 'Delete account' => 'Supprimer le compte', 'Delete my account' => 'Supprimer mon compte', 'Delete personal data' => 'Supprimer les données personnelles', 'Deleted by GDPR request' => 'Supprimé par une requête RGPD', 'Description' => 'Description', - 'Didn\'t receive confirmation message?' => 'Vous n\'avez pas reçu le message de confirmation?', + 'Didn\'t receive confirmation message?' => 'Vous n\'avez pas reçu le message de confirmation ?', 'Disable two factor authentication' => 'Désactiver l\'authentification à double facteur', 'Disconnect' => 'Déconnecter', - 'Don\'t have an account? Sign up!' => 'Vous n\'avez pas de compte? Inscrivez-vous!', + 'Don\'t have an account? Sign up!' => 'Vous n\'avez pas de compte ? Inscrivez-vous !', 'Download my data' => 'Télécharger mes données', 'Email' => 'Email', - 'Email (public)' => 'Email (publique)', + 'Email (public)' => 'Email (public)', 'Enable' => 'Activer', 'Enable two factor authentication' => 'Activer l\'authentification à double facteur', 'Error occurred while changing password' => 'Une erreur est survenue lors du changement de mot de passe', 'Error occurred while confirming user' => 'Une erreur est survenue lors de la confirmation de l\'utilisateur', 'Error occurred while deleting user' => 'Une erreur est survenue lors de la suppression de l\'utilisateur', - 'Error sending registration message to "{email}". Please try again later.' => 'Erreur lors de l\'envoi du message d\'inscription à "{email}". Veuillez essayer plus tard.', - 'Error sending welcome message to "{email}". Please try again later.' => 'Erreur lors de l\'envoi du message de bienvenue à "{email}". Veuillez essayer plus tard.', + 'Error sending registration message to "{email}". Please try again later.' => 'Erreur lors de l\'envoi du message d\'inscription à "{email}". Veuillez réessayer plus tard.', + 'Error sending welcome message to "{email}". Please try again later.' => 'Erreur lors de l\'envoi du message de bienvenue à "{email}". Veuillez réessayer plus tard.', 'Export my data' => 'Exporter mes données', 'Finish' => 'Terminer', 'Force password change at next login' => 'Forcer le changement de mot de passe à la prochaine connexion', - 'Forgot password?' => 'Mot de passe oublié?', + 'Forgot password?' => 'Mot de passe oublié ?', 'Gravatar email' => 'Email gravatar', 'Hello' => 'Bonjour', 'Here you can download your personal data in a comma separated values format.' => 'Ici vous pouvez télécharger vos données personnelles dans un format avec les données séparées par des virgules', - '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}' => 'J\'accepte le traitement de mes données personelles et l\'utilisation de cookies pour faciliter le fonctionnement de ce site. Pour plus d\'information, lisez notre {privacyPolicy}', + '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}' => 'J\'accepte le traitement de mes données personnelles et l\'utilisation de cookies pour faciliter le fonctionnement de ce site. Pour plus d\'information, lisez notre {privacyPolicy}', 'If you already registered, sign in and connect this account on settings page' => 'Si vous êtes déjà inscrit, connectez-vous et liez ce compte dans la page des réglages', 'If you cannot click the link, please try pasting the text into your browser' => 'Si vous ne parvenez pas à cliquer sur le lien, veuillez essayer de coller le texte dans votre navigateur', 'If you did not make this request you can ignore this email' => 'Si vous n\'avez pas fait cette demande, vous pouvez ignorer cet email', - 'Impersonate this user' => 'Connecter en tant que cet utilisateur', + 'Impersonate this user' => 'Se connecter en tant que cet utilisateur', 'In order to complete your registration, please click the link below' => 'Pour compléter votre inscription, merci de cliquer sur le lien ci-dessous', 'In order to complete your request, please click the link below' => 'Pour compléter votre demande, merci de cliquer sur le lien ci-dessous', 'In order to finish your registration, we need you to enter following fields' => 'Pour terminer votre inscription, vous devez remplir les champs suivants', @@ -143,7 +143,7 @@ return [ 'New role' => 'Nouveau rôle', 'New rule' => 'Nouvelle règle', 'New user' => 'Nouvel utilisateur', - 'Not blocked' => 'Dévérouillé', + 'Not blocked' => 'Déverrouillé', 'Not found' => 'Introuvable', 'Once you delete your account, there is no going back' => 'Une fois votre compte supprimé, il n\'est pas possible de revenir en arrière', 'Once you have deleted your data, you will not longer be able to sign in with this account.' => 'Une fois vos données supprimées, vous ne pourrez plus vous identifier avec ce compte', @@ -151,9 +151,9 @@ return [ 'Password age' => 'Age du mot de passe', 'Password has been changed' => 'Le mot de passe a été modifié', 'Permissions' => 'Permissions', - 'Please be certain' => 'Soyez certains', + 'Please be certain' => 'Soyez certain', 'Please click the link below to complete your password reset' => 'Merci de cliquer sur le lien ci-dessous pour compléter la réinitialisation de votre mot de passe', - 'Please fix following errors:' => 'Merci de corriger les erreurs suivantes:', + 'Please fix following errors:' => 'Merci de corriger les erreurs suivantes :', 'Privacy' => 'Confidentialité', 'Privacy settings' => 'Paramètres de confidentialité', 'Profile' => 'Profil', @@ -161,17 +161,17 @@ return [ 'Profile details have been updated' => 'Les détails du profil ont été mis à jour', 'Profile settings' => 'Paramètres du profil', 'Recover your password' => 'Récupérer votre mot de passe', - 'Recovery link is invalid or expired. Please try requesting a new one.' => 'Le lien de récuperation a expiré ou est invalide. Veuillez tenter à nouveau de faire une demande', + 'Recovery link is invalid or expired. Please try requesting a new one.' => 'Le lien de récupération a expiré ou est invalide. Veuillez tenter à nouveau de faire une demande', 'Recovery message sent' => 'Message de récupération envoyé', 'Registration IP' => 'IP d\'inscription', 'Registration on this website is disabled' => 'L\'inscription est désactivée sur ce site', 'Registration time' => 'Heure d\'inscription', 'Remember me next time' => 'Se souvenir de moi la prochaine fois', - 'Request new confirmation message' => 'Demander un noouveau message de confirmation', + 'Request new confirmation message' => 'Demander un nouveau message de confirmation', 'Required "key" cannot be empty.' => 'Le champ "key" requis ne peut être vide', 'Required "secret" cannot be empty.' => 'Le champ "secret" requis ne peut être vide', 'Reset your password' => 'Réinitialiser votre mot de passe', - 'Role "{0}" not found. Creating it.' => 'Rôle "{0}" introuvable. Creation en cours.', + 'Role "{0}" not found. Creating it.' => 'Rôle "{0}" introuvable. Création en cours.', 'Roles' => 'Rôles', 'Rule' => 'Règle', 'Rule class must extend "yii\\rbac\\Rule".' => 'La règle doit étendre "yii\\rbac\\Rule"', @@ -182,9 +182,9 @@ return [ 'Rule {0} not found.' => 'Règle introuvable', 'Rules' => 'Règles', 'Save' => 'Enregistrer', - 'Scan the QrCode with Google Authenticator App, then insert its temporary code on the box and submit.' => 'Scanner le QrCode à l\'aide de l\'application Google Authenticator, ensuite entrez le code temporaire dans l\'emplacement prévu à cet effet puis validez.', + 'Scan the QrCode with Google Authenticator App, then insert its temporary code on the box and submit.' => 'Scanner le Qr Code à l\'aide de l\'application Google Authenticator, ensuite entrez le code temporaire dans l\'emplacement prévu à cet effet puis validez.', 'Select rule...' => 'Sélectionner une règle...', - 'Send password recovery email' => 'Envoyer un email de récuperation de mot de passe', + 'Send password recovery email' => 'Envoyer un email de récupération de mot de passe', 'Sign in' => 'Se connecter', 'Sign up' => 'S\'inscrire', 'Something went wrong' => 'Quelque chose s\'est mal déroulé', @@ -193,16 +193,16 @@ return [ 'Thank you, registration is now complete.' => 'Merci, l\'inscription est maintenant terminée', 'The "recaptcha" component must be configured.' => 'Le composant "recaptcha" doit être configuré', 'The confirmation link is invalid or expired. Please try requesting a new one.' => 'Le lien de confirmation est invalide ou expiré. Veuillez tenter à nouveau de faire une demande', - 'The verification code is incorrect.' => 'Le code de vérification est incorrecte', + 'The verification code is incorrect.' => 'Le code de vérification est incorrect', 'There is neither role nor permission with name "{0}"' => 'Il n\'y a ni rôle ni permission avec le nom "{0}"', 'There was an error in saving user' => 'Une erreur s\'est produite lors de l\'enregistrement de l\'utilisateur', 'This account has already been connected to another user' => 'Ce compte a déjà été lié à un autre utilisateur', 'This email address has already been taken' => 'Cette adresse email a déjà été utilisée', 'This username has already been taken' => 'Ce nom d\'utilisateur a déjà été utilisé', - 'This will disable two factor authentication. Are you sure?' => 'Cela va désactiver l\'authentification à double facteur. Êtes-vous sûr?', - 'This will remove your personal data from this site. You will no longer be able to sign in.' => 'Cela va supprimer vos données personnelles de ce site. Vous ne pourrez plus vous connecter.', + 'This will disable two factor authentication. Are you sure?' => 'Cela va désactiver l\'authentification à double facteur. Êtes-vous sûr ?', + 'This will remove your personal data from this site. You will no longer be able to sign in.' => 'Ceci va supprimer vos données personnelles de ce site. Vous ne pourrez plus vous connecter.', 'Time zone' => 'Fuseau horaire', - 'Time zone is not valid' => 'Le fuseau horaire n\'est invalide', + 'Time zone is not valid' => 'Le fuseau horaire est invalide', 'Two Factor Authentication (2FA)' => 'Authentification à Double Facteur (2FA)', 'Two factor authentication code' => 'Code d\'authentification à double facteur', 'Two factor authentication has been disabled.' => 'L\'authentification à double facteur a été désactivée', @@ -219,8 +219,8 @@ return [ 'Unable to send recovery message to the user' => 'Impossible d\'envoyer un message de récupération à l\'utilisateur', 'Unable to update authorization item.' => 'Impossible de mettre à jour l\'élément d\'autorisation.', 'Unable to update authorization rule.' => 'Impossible de mettre à jour la règle d\'autorisation.', - 'Unable to update block status.' => 'Impossible de mettre à jour le status de verouillage', - 'Unblock' => 'Dévérouillé', + 'Unable to update block status.' => 'Impossible de mettre à jour le statut de verrouillage', + 'Unblock' => 'Déverrouillé', 'Unconfirmed' => 'Non confirmé', 'Update' => 'Mettre à jour', 'Update assignments' => 'Mettre à jour les affectations', @@ -230,23 +230,23 @@ return [ 'Update user account' => 'Mettre à jour le compte utilisateur', 'Updated at' => 'Mis à jour le', 'User account could not be created.' => 'Le compte ne peut être créé.', - 'User block status has been updated.' => 'le status de verrouillage a été mis à jour.', + 'User block status has been updated.' => 'le statut de verrouillage a été mis à jour.', 'User could not be registered.' => 'L\'utilisateur ne peut pas être inscrit.', - 'User has been confirmed' => 'L\'utilisateur a été confirmé', - 'User has been created' => 'L\'utilisateur a été créé', - 'User has been deleted' => 'L\'utilisateur a été supprimé', - 'User is not found' => 'L\'utilisateur est introuvable', - 'User not found.' => 'Utilisateur introuvable', - 'User will be required to change password at next login' => 'L\'utilisateur devra changer de mot de passe à la prochaine connexion', - 'Username' => 'Utilisteur', - 'Users' => 'Utilisteurs', + 'User has been confirmed' => 'L\'utilisateur a été confirmé.', + 'User has been created' => 'L\'utilisateur a été créé.', + 'User has been deleted' => 'L\'utilisateur a été supprimé.', + 'User is not found' => 'L\'utilisateur est introuvable.', + 'User not found.' => 'Utilisateur introuvable.', + 'User will be required to change password at next login' => 'L\'utilisateur devra changer de mot de passe à la prochaine connexion.', + 'Username' => 'Utilisateur', + 'Users' => 'Utilisateurs', 'VKontakte' => 'VKontakte', - 'Verification failed. Please, enter new code.' => 'La vérification a echoué. Veuillez entrer un nouveau code.', + 'Verification failed. Please, enter new code.' => 'La vérification a échoué. Veuillez entrer un nouveau code.', 'We couldn\'t re-send the mail to confirm your address. Please, verify is the correct email or if it has been confirmed already.' => 'Nous ne pouvons pas renvoyer le mail de confirmation pour confirmer votre adresse. Veuillez vérifier si l\'email est correct et qu\'il n\'a pas déjà été confirmé', 'We have generated a password for you' => 'Nous avons généré un mot de passe pour vous', 'We have received a request to change the email address for your account on {0}' => 'Nous avons reçu une demande de changement d\'adresse email pour votre compte {0}', 'We have received a request to reset the password for your account on {0}' => 'Nous avons reçu une demande de réinitialisation de mot de passe pour votre compte {0}', - 'We have sent confirmation links to both old and new email addresses. You must click both links to complete your request.' => 'Nous avons envoyé des liens de confirmation à vos nouvel et ancienne adresses email.', + 'We have sent confirmation links to both old and new email addresses. You must click both links to complete your request.' => 'Nous avons envoyé des liens de confirmation à vos nouvelle et ancienne adresses email.', 'Website' => 'Site web', 'Welcome to {0}' => 'Bienvenue à {0}', 'Yandex' => 'Yandex', @@ -256,14 +256,14 @@ return [ 'You cannot remove your own account' => 'Vous ne pouvez pas supprimer votre propre compte', 'You need to confirm your email address' => 'Vous devez confirmer votre adresse email', 'Your account details have been updated' => 'Les détails de votre compte ont été mis à jour', - 'Your account has been blocked' => 'Votre compte a été vérouillé', - 'Your account has been blocked.' => 'Votre compte a été vérouillé.', + 'Your account has been blocked' => 'Votre compte a été verrouillé', + 'Your account has been blocked.' => 'Votre compte a été verrouillé.', 'Your account has been completely deleted' => 'Votre compte a été supprimé définitivement', 'Your account has been connected' => 'Votre compte a été lié', 'Your account has been created' => 'Votre compte a été créé', - 'Your account has been created and a message with further instructions has been sent to your email' => 'Votre compte a été créé et un message avec les instructions complètes a été envoyé à votre adress email', + 'Your account has been created and a message with further instructions has been sent to your email' => 'Votre compte a été créé et un message avec les instructions complètes a été envoyé à votre adresse email', 'Your account on {0} has been created' => 'Votre compte {0} a été créé', - 'Your confirmation token is invalid or expired' => 'Votre jeton de confirmation est invalide ou expiré', + 'Your confirmation token is invalid or expired' => 'Votre jeton de confirmation est invalide ou a expiré', 'Your consent is required to register' => 'Votre consentement est requis pour l\'inscription', 'Your email address has been changed' => 'Votre adresse email a été modifiée', 'Your password has expired, you must change it now' => 'Votre mot de passe a expiré, vous devez le renouveler maintenant', From 773f66c5aca8cddae6b9461d148daa26c0d694c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Bo=CC=88hnke?= Date: Thu, 30 May 2019 11:07:31 +0200 Subject: [PATCH 20/51] fix typo --- src/User/resources/i18n/de/usuario.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/User/resources/i18n/de/usuario.php b/src/User/resources/i18n/de/usuario.php index 2860c15..17e5931 100644 --- a/src/User/resources/i18n/de/usuario.php +++ b/src/User/resources/i18n/de/usuario.php @@ -52,7 +52,7 @@ return [ 'Account details have been updated' => 'Kontodetails gespeichert', 'Account settings' => 'Kontoeinstellungen', 'Already registered? Sign in!' => 'Bereits registriert? Zur Anmeldung!', - '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.' => 'Eine Email mit Hinweisen, wie ein Kennwort erstellt wirdm wurde an {email} gesendet, sofern es mit dem Konto {appName} verbindund ist. Das aktuelle Kennwort wurde nicht geändert.', + '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.' => 'Eine E-Mail mit Hinweisen, wie ein Kennwort erstellt wird wurde an {email} gesendet, sofern es mit dem Konto {appName} verbunden ist. Das aktuelle Kennwort wurde nicht geändert.', '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?', From 810aeb7135f41dda275db5552f5924b1ca29dd43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Bo=CC=88hnke?= Date: Thu, 30 May 2019 11:16:26 +0200 Subject: [PATCH 21/51] run message/extract command --- src/User/resources/i18n/ca/usuario.php | 2 +- src/User/resources/i18n/da/usuario.php | 2 +- src/User/resources/i18n/de-DU/usuario.php | 2 +- src/User/resources/i18n/de/usuario.php | 48 ++++++------- src/User/resources/i18n/es/usuario.php | 14 ++-- src/User/resources/i18n/fa-IR/usuario.php | 2 +- src/User/resources/i18n/fi/usuario.php | 2 +- src/User/resources/i18n/fr/usuario.php | 1 + src/User/resources/i18n/hr/usuario.php | 2 +- src/User/resources/i18n/hu/usuario.php | 48 ++++++------- src/User/resources/i18n/it/usuario.php | 6 +- src/User/resources/i18n/kk/usuario.php | 2 +- src/User/resources/i18n/lt/usuario.php | 2 +- src/User/resources/i18n/nl/usuario.php | 60 ++++++++-------- src/User/resources/i18n/pl/usuario.php | 44 ++++++------ src/User/resources/i18n/pt-BR/usuario.php | 60 ++++++++-------- src/User/resources/i18n/pt-PT/usuario.php | 84 +++++++++++------------ src/User/resources/i18n/ro/usuario.php | 52 +++++++------- src/User/resources/i18n/ru/usuario.php | 48 ++++++------- src/User/resources/i18n/th/usuario.php | 2 +- src/User/resources/i18n/tr-TR/usuario.php | 2 +- src/User/resources/i18n/uk/usuario.php | 2 +- src/User/resources/i18n/vi/usuario.php | 2 +- src/User/resources/i18n/zh-CN/usuario.php | 2 +- 24 files changed, 246 insertions(+), 245 deletions(-) diff --git a/src/User/resources/i18n/ca/usuario.php b/src/User/resources/i18n/ca/usuario.php index 1718269..62ade06 100644 --- a/src/User/resources/i18n/ca/usuario.php +++ b/src/User/resources/i18n/ca/usuario.php @@ -17,6 +17,7 @@ * NOTE: this file must be saved in UTF-8 encoding. */ return [ + '{0, date, MMM dd, YYYY HH:mm}' => '@@@@', '(not set)' => '', 'A confirmation message has been sent to your new email address' => '', 'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => '', @@ -298,5 +299,4 @@ return [ '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}' => '@@@@', ]; diff --git a/src/User/resources/i18n/da/usuario.php b/src/User/resources/i18n/da/usuario.php index 1718269..62ade06 100644 --- a/src/User/resources/i18n/da/usuario.php +++ b/src/User/resources/i18n/da/usuario.php @@ -17,6 +17,7 @@ * NOTE: this file must be saved in UTF-8 encoding. */ return [ + '{0, date, MMM dd, YYYY HH:mm}' => '@@@@', '(not set)' => '', 'A confirmation message has been sent to your new email address' => '', 'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => '', @@ -298,5 +299,4 @@ return [ '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}' => '@@@@', ]; diff --git a/src/User/resources/i18n/de-DU/usuario.php b/src/User/resources/i18n/de-DU/usuario.php index 1718269..62ade06 100644 --- a/src/User/resources/i18n/de-DU/usuario.php +++ b/src/User/resources/i18n/de-DU/usuario.php @@ -17,6 +17,7 @@ * NOTE: this file must be saved in UTF-8 encoding. */ return [ + '{0, date, MMM dd, YYYY HH:mm}' => '@@@@', '(not set)' => '', 'A confirmation message has been sent to your new email address' => '', 'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => '', @@ -298,5 +299,4 @@ return [ '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}' => '@@@@', ]; diff --git a/src/User/resources/i18n/de/usuario.php b/src/User/resources/i18n/de/usuario.php index 17e5931..44bf1d9 100644 --- a/src/User/resources/i18n/de/usuario.php +++ b/src/User/resources/i18n/de/usuario.php @@ -17,30 +17,6 @@ * NOTE: this file must be saved in UTF-8 encoding. */ return [ - '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@@', - 'Enable Two-factor auth' => '@@Zweifaktor-Authentifizierung aktivieren@@', - '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' => '@@Ungültiger Zweifaktor Schlüssel@@', - 'Last login' => '@@Letzter Login@@', - 'Registration ip' => '@@Registrierungs-IP@@', - 'Rule class can not be instantiated' => '@@@@', - 'Rule class must extend "yii\\rbac\\Rule"' => '@@@@', - 'This will disable two-factor auth. Are you sure?' => '@@Dies wird die Zweifaktor-Authentifizierung deaktivieren. Sind Sie sicher?@@', - 'Two Factor Authentication' => '@@Zweifaktor-Authentifizierung@@', - 'Two factor authentication protects you against stolen credentials' => '@@@@', - 'Two factor successfully enabled.' => '@@Zweifaktor-Authentifizierung erfolgreich aktiviert.@@', - 'Two-Factor Authentication' => '@@Zweifaktor-Authentifizierung@@', - 'Two-factor auth protects you against stolen credentials' => '@@Zweifaktor-Authentifizierung schützt Sie vor gestohlenen Zugangsdaten@@', - 'Two-factor authentication code' => '@@Zweifaktor-Authentifizierungsschlüssel@@', - 'Two-factor authorization has been disabled.' => '@@Zweifaktor-Authentifizierung wurde deaktiviert.@@', - 'Two-factor code' => '@@Zweifaktor-Schlüssel@@', - 'Unable to disable two-factor authorization.' => '@@Unfähig die Zweifaktor-Authentifizierung zu deaktivieren.@@', - 'We couldn\'t re-send the mail to confirm your address. ' => '@@Wir konnte die Bestätigungs E-Mail nicht erneut versenden@@', - 'We have sent confirmation links to both old and new email addresses. ' => '@@Wir haben Bestätigungs E-Mails an die neue und alte E-Mail Adresse versandt.@@', '(not set)' => '(nicht gesetzt)', 'A confirmation message has been sent to your new email address' => 'Eine Bestätigungsnachricht wurde an Ihre neue E-Mail Adresse versandt', 'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => 'Eine Nachricht wurde an Ihre E-Mail-Adresse gesendet. Sie enthält einen Bestätigungslink den Sie klicken müssen um die Registrierung abzuschließen.', @@ -297,4 +273,28 @@ return [ '{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.', + '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@@', + 'Enable Two-factor auth' => '@@Zweifaktor-Authentifizierung aktivieren@@', + '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' => '@@Ungültiger Zweifaktor Schlüssel@@', + 'Last login' => '@@Letzter Login@@', + 'Registration ip' => '@@Registrierungs-IP@@', + 'Rule class can not be instantiated' => '@@@@', + 'Rule class must extend "yii\\rbac\\Rule"' => '@@@@', + 'This will disable two-factor auth. Are you sure?' => '@@Dies wird die Zweifaktor-Authentifizierung deaktivieren. Sind Sie sicher?@@', + 'Two Factor Authentication' => '@@Zweifaktor-Authentifizierung@@', + 'Two factor authentication protects you against stolen credentials' => '@@@@', + 'Two factor successfully enabled.' => '@@Zweifaktor-Authentifizierung erfolgreich aktiviert.@@', + 'Two-Factor Authentication' => '@@Zweifaktor-Authentifizierung@@', + 'Two-factor auth protects you against stolen credentials' => '@@Zweifaktor-Authentifizierung schützt Sie vor gestohlenen Zugangsdaten@@', + 'Two-factor authentication code' => '@@Zweifaktor-Authentifizierungsschlüssel@@', + 'Two-factor authorization has been disabled.' => '@@Zweifaktor-Authentifizierung wurde deaktiviert.@@', + 'Two-factor code' => '@@Zweifaktor-Schlüssel@@', + 'Unable to disable two-factor authorization.' => '@@Unfähig die Zweifaktor-Authentifizierung zu deaktivieren.@@', + 'We couldn\'t re-send the mail to confirm your address. ' => '@@Wir konnte die Bestätigungs E-Mail nicht erneut versenden@@', + 'We have sent confirmation links to both old and new email addresses. ' => '@@Wir haben Bestätigungs E-Mails an die neue und alte E-Mail Adresse versandt.@@', ]; diff --git a/src/User/resources/i18n/es/usuario.php b/src/User/resources/i18n/es/usuario.php index 34b2f4a..b21c17e 100644 --- a/src/User/resources/i18n/es/usuario.php +++ b/src/User/resources/i18n/es/usuario.php @@ -17,13 +17,6 @@ * 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', 'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => 'Se ha enviado un mensaje a su dirección de correo electrónico. Contiene un enlace de confirmación que tiene que seguir para completar el registro.', @@ -275,4 +268,11 @@ return [ 'privacy policy' => 'política de privacidad', '{0, date, MMMM dd, YYYY HH:mm}' => '{0, date, dd MMMM, YYYY HH:mm}', '{0} cannot be blank.' => '{0} no puede estar vacío.', + '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@@', ]; diff --git a/src/User/resources/i18n/fa-IR/usuario.php b/src/User/resources/i18n/fa-IR/usuario.php index 1718269..62ade06 100644 --- a/src/User/resources/i18n/fa-IR/usuario.php +++ b/src/User/resources/i18n/fa-IR/usuario.php @@ -17,6 +17,7 @@ * NOTE: this file must be saved in UTF-8 encoding. */ return [ + '{0, date, MMM dd, YYYY HH:mm}' => '@@@@', '(not set)' => '', 'A confirmation message has been sent to your new email address' => '', 'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => '', @@ -298,5 +299,4 @@ return [ '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}' => '@@@@', ]; diff --git a/src/User/resources/i18n/fi/usuario.php b/src/User/resources/i18n/fi/usuario.php index 1718269..62ade06 100644 --- a/src/User/resources/i18n/fi/usuario.php +++ b/src/User/resources/i18n/fi/usuario.php @@ -17,6 +17,7 @@ * NOTE: this file must be saved in UTF-8 encoding. */ return [ + '{0, date, MMM dd, YYYY HH:mm}' => '@@@@', '(not set)' => '', 'A confirmation message has been sent to your new email address' => '', 'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => '', @@ -298,5 +299,4 @@ return [ '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}' => '@@@@', ]; diff --git a/src/User/resources/i18n/fr/usuario.php b/src/User/resources/i18n/fr/usuario.php index 4c8b74d..586496e 100644 --- a/src/User/resources/i18n/fr/usuario.php +++ b/src/User/resources/i18n/fr/usuario.php @@ -272,4 +272,5 @@ return [ 'privacy policy' => 'politique de confidentialité', '{0, date, MMMM dd, YYYY HH:mm}' => '{0, date, dd MMMM YYYY HH:mm}', '{0} cannot be blank.' => '{0} ne peut être vide.', + '{0, date, MMM dd, YYYY HH:mm}' => '', ]; diff --git a/src/User/resources/i18n/hr/usuario.php b/src/User/resources/i18n/hr/usuario.php index 1718269..62ade06 100644 --- a/src/User/resources/i18n/hr/usuario.php +++ b/src/User/resources/i18n/hr/usuario.php @@ -17,6 +17,7 @@ * NOTE: this file must be saved in UTF-8 encoding. */ return [ + '{0, date, MMM dd, YYYY HH:mm}' => '@@@@', '(not set)' => '', 'A confirmation message has been sent to your new email address' => '', 'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => '', @@ -298,5 +299,4 @@ return [ '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}' => '@@@@', ]; diff --git a/src/User/resources/i18n/hu/usuario.php b/src/User/resources/i18n/hu/usuario.php index 5ba1f36..57e9ca3 100644 --- a/src/User/resources/i18n/hu/usuario.php +++ b/src/User/resources/i18n/hu/usuario.php @@ -17,30 +17,6 @@ * 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@@', - '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}' => '@@Aggregálom a személyes adataim feldolgozását és a cookie-k használatát a webhely működésének megkönnyítése érdekében. További információért olvassa el a {privacyPolicy}@@', - 'Invalid two-factor code' => '@@Érvénytelen kétütemű kód@@', - 'Last login' => '@@Utolsó bejelentkezés@@', - 'This will disable two-factor auth. Are you sure?' => '@@Ez letiltja a kétütemű hitelesítést. biztos vagy ebben?@@', - 'Two Factor Authentication' => '@@Két tényező hitelesítés@@', - 'Two factor authentication protects you against stolen credentials' => '@@Két tényező-hitelesítés megvédi az ellopott hitelesítő adatokat@@', - 'Two factor successfully enabled.' => '@@Két tényező sikeresen bekapcsolt.@@', - 'Two-Factor Authentication' => '@@Két faktoros hitelesítés@@', - 'Two-factor auth protects you against stolen credentials' => '@@A kétütemű auth védelmet nyújt az ellopott hitelesítő adatok ellen@@', - 'Two-factor authentication code' => '@@Kétszeres hitelesítési kód@@', - 'Two-factor authorization has been disabled.' => '@@A kétütemű engedélyezés le van tiltva.@@', - 'Two-factor code' => '@@Kétszámjegyű kód@@', - 'Unable to disable two-factor authorization.' => '@@Nem sikerült letiltani a kétütemű engedélyezést.@@', - 'We couldn\'t re-send the mail to confirm your address. ' => '@@A cím megerősítéséhez nem tudtuk újra elküldeni az e-mailt.@@', - 'We have sent confirmation links to both old and new email addresses. ' => '@@Megerősítő linkeket küldtünk régi és új e-mail címekre.@@', '(not set)' => '(nincs beállítva)', 'A confirmation message has been sent to your new email address' => 'Az új e-mail címére megerősítő üzenetet küldtek', 'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => 'Üzenet érkezett az e-mail címedre. Tartalmaz egy megerősítő linket, amelyet a regisztráció befejezéséhez ki kell kattintania.', @@ -293,4 +269,28 @@ return [ '{0, date, MMM dd, YYYY HH:mm}' => '{0, dátum, MMM dd, ÉÉÉÉ HH: mm}', '{0, date, MMMM dd, YYYY HH:mm}' => '{0, dátum, MMMM dd, ÉÉÉÉ HH: mm}', '{0} cannot be blank.' => '{0} nem lehet üres.', + '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@@', + '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}' => '@@Aggregálom a személyes adataim feldolgozását és a cookie-k használatát a webhely működésének megkönnyítése érdekében. További információért olvassa el a {privacyPolicy}@@', + 'Invalid two-factor code' => '@@Érvénytelen kétütemű kód@@', + 'Last login' => '@@Utolsó bejelentkezés@@', + 'This will disable two-factor auth. Are you sure?' => '@@Ez letiltja a kétütemű hitelesítést. biztos vagy ebben?@@', + 'Two Factor Authentication' => '@@Két tényező hitelesítés@@', + 'Two factor authentication protects you against stolen credentials' => '@@Két tényező-hitelesítés megvédi az ellopott hitelesítő adatokat@@', + 'Two factor successfully enabled.' => '@@Két tényező sikeresen bekapcsolt.@@', + 'Two-Factor Authentication' => '@@Két faktoros hitelesítés@@', + 'Two-factor auth protects you against stolen credentials' => '@@A kétütemű auth védelmet nyújt az ellopott hitelesítő adatok ellen@@', + 'Two-factor authentication code' => '@@Kétszeres hitelesítési kód@@', + 'Two-factor authorization has been disabled.' => '@@A kétütemű engedélyezés le van tiltva.@@', + 'Two-factor code' => '@@Kétszámjegyű kód@@', + 'Unable to disable two-factor authorization.' => '@@Nem sikerült letiltani a kétütemű engedélyezést.@@', + 'We couldn\'t re-send the mail to confirm your address. ' => '@@A cím megerősítéséhez nem tudtuk újra elküldeni az e-mailt.@@', + 'We have sent confirmation links to both old and new email addresses. ' => '@@Megerősítő linkeket küldtünk régi és új e-mail címekre.@@', ]; diff --git a/src/User/resources/i18n/it/usuario.php b/src/User/resources/i18n/it/usuario.php index 37ed5f5..1e18790 100644 --- a/src/User/resources/i18n/it/usuario.php +++ b/src/User/resources/i18n/it/usuario.php @@ -17,9 +17,6 @@ * 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.' => '', - '{0, date, MMM dd, YYYY HH:mm}' => '', - '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.', @@ -274,4 +271,7 @@ return [ 'privacy policy' => 'politica della privacy', '{0, date, MMMM dd, YYYY HH:mm}' => '{0, date, dd MMMM YYYY HH:mm}', '{0} cannot be blank.' => '{0} non può essere vuoto.', + '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}' => '', + 'An email has been sent with instructions for resetting your password' => '@@È stata inviata un\'email con le istruzioni per azzerare la tua password@@', ]; diff --git a/src/User/resources/i18n/kk/usuario.php b/src/User/resources/i18n/kk/usuario.php index 1718269..62ade06 100644 --- a/src/User/resources/i18n/kk/usuario.php +++ b/src/User/resources/i18n/kk/usuario.php @@ -17,6 +17,7 @@ * NOTE: this file must be saved in UTF-8 encoding. */ return [ + '{0, date, MMM dd, YYYY HH:mm}' => '@@@@', '(not set)' => '', 'A confirmation message has been sent to your new email address' => '', 'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => '', @@ -298,5 +299,4 @@ return [ '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}' => '@@@@', ]; diff --git a/src/User/resources/i18n/lt/usuario.php b/src/User/resources/i18n/lt/usuario.php index 1718269..62ade06 100644 --- a/src/User/resources/i18n/lt/usuario.php +++ b/src/User/resources/i18n/lt/usuario.php @@ -17,6 +17,7 @@ * NOTE: this file must be saved in UTF-8 encoding. */ return [ + '{0, date, MMM dd, YYYY HH:mm}' => '@@@@', '(not set)' => '', 'A confirmation message has been sent to your new email address' => '', 'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => '', @@ -298,5 +299,4 @@ return [ '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}' => '@@@@', ]; diff --git a/src/User/resources/i18n/nl/usuario.php b/src/User/resources/i18n/nl/usuario.php index 7f6f783..634de5e 100644 --- a/src/User/resources/i18n/nl/usuario.php +++ b/src/User/resources/i18n/nl/usuario.php @@ -17,36 +17,6 @@ * 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@@', - 'Enable Two-factor auth' => '@@Tweetraps authenticatie inschakelen@@', - '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}' => '@@Ik ga akkoord dat mijn persoonlijke data en cookies worden verwerkt voor het gebruik van deze website. Voor meer informatie lees onze {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}' => '@@Ik ga akkoord dat mijn persoonlijke data en cookies worden verwerkt voor het gebruik van deze website. Voor meer informatie lees onze {privacyPolicy}@@', - 'Invalid two-factor code' => '@@Ongeldige tweetraps authenticatie code@@', - 'Last login' => '@@Laatste login@@', - 'Registration ip' => '@@Registratie IP@@', - 'Rule class can not be instantiated' => '@@Registratie IP@@', - 'Rule class must extend "yii\\rbac\\Rule"' => '@@Regel klasse moet worden uitgebreid met "yii\\rbac\\Rule"@@', - 'This will disable two-factor auth. Are you sure?' => '@@Dit zal de tweetraps authenticatie uitschakelen. Ben je zeker?@@', - 'Two Factor Authentication' => '@@Tweetraps authenticatie@@', - 'Two factor authentication protects you against stolen credentials' => '@@Tweetraps authenticatie beschermt je tegen gestolen inloggegevens@@', - 'Two factor successfully enabled.' => '@@Tweetraps authenticatie ingeschakeld@@', - 'Two-Factor Authentication' => '@@Tweetraps authenticatie@@', - 'Two-factor auth protects you against stolen credentials' => '@@Tweetraps authenticatie beschermt je tegen gestolen authenticatie gegevens@@', - 'Two-factor authentication code' => '@@Tweetraps authenticatie code@@', - 'Two-factor authorization has been disabled.' => '@@Tweetraps authenticatie werd uitgeschakeld.@@', - 'Two-factor code' => '@@Tweetraps authenticatie code@@', - 'Unable to disable two-factor authorization.' => '@@Tweetraps authenticatie kon niet worden uitgeschakeld@@', - 'We couldn\'t re-send the mail to confirm your address. ' => '@@Wij konden de email bevestigingsmail niet opnieuw naar jouw adres verzenden.@@', - 'We have sent confirmation links to both old and new email addresses. ' => '@@We hebben de bevestigingsmail naar zowel jouw oud als nieuw emailadres verzonden.@@', '(not set)' => '(niet ingesteld)', 'A confirmation message has been sent to your new email address' => 'Er werd een bevestigingsmail naar het nieuwe emailadres verzonden', 'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => 'Een email met daarin een bevestigingslink werd verzonden naar jouw email adres. Klik op de link om de registratie te vervolledigen.', @@ -299,4 +269,34 @@ return [ '{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} kan niet leeg zijn.', + '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@@', + 'Enable Two-factor auth' => '@@Tweetraps authenticatie inschakelen@@', + '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}' => '@@Ik ga akkoord dat mijn persoonlijke data en cookies worden verwerkt voor het gebruik van deze website. Voor meer informatie lees onze {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}' => '@@Ik ga akkoord dat mijn persoonlijke data en cookies worden verwerkt voor het gebruik van deze website. Voor meer informatie lees onze {privacyPolicy}@@', + 'Invalid two-factor code' => '@@Ongeldige tweetraps authenticatie code@@', + 'Last login' => '@@Laatste login@@', + 'Registration ip' => '@@Registratie IP@@', + 'Rule class can not be instantiated' => '@@Registratie IP@@', + 'Rule class must extend "yii\\rbac\\Rule"' => '@@Regel klasse moet worden uitgebreid met "yii\\rbac\\Rule"@@', + 'This will disable two-factor auth. Are you sure?' => '@@Dit zal de tweetraps authenticatie uitschakelen. Ben je zeker?@@', + 'Two Factor Authentication' => '@@Tweetraps authenticatie@@', + 'Two factor authentication protects you against stolen credentials' => '@@Tweetraps authenticatie beschermt je tegen gestolen inloggegevens@@', + 'Two factor successfully enabled.' => '@@Tweetraps authenticatie ingeschakeld@@', + 'Two-Factor Authentication' => '@@Tweetraps authenticatie@@', + 'Two-factor auth protects you against stolen credentials' => '@@Tweetraps authenticatie beschermt je tegen gestolen authenticatie gegevens@@', + 'Two-factor authentication code' => '@@Tweetraps authenticatie code@@', + 'Two-factor authorization has been disabled.' => '@@Tweetraps authenticatie werd uitgeschakeld.@@', + 'Two-factor code' => '@@Tweetraps authenticatie code@@', + 'Unable to disable two-factor authorization.' => '@@Tweetraps authenticatie kon niet worden uitgeschakeld@@', + 'We couldn\'t re-send the mail to confirm your address. ' => '@@Wij konden de email bevestigingsmail niet opnieuw naar jouw adres verzenden.@@', + 'We have sent confirmation links to both old and new email addresses. ' => '@@We hebben de bevestigingsmail naar zowel jouw oud als nieuw emailadres verzonden.@@', ]; diff --git a/src/User/resources/i18n/pl/usuario.php b/src/User/resources/i18n/pl/usuario.php index 8803782..a8ef1f3 100644 --- a/src/User/resources/i18n/pl/usuario.php +++ b/src/User/resources/i18n/pl/usuario.php @@ -17,28 +17,6 @@ * 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 - 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' => '@@Nieprawidłowy kod uwierzytelniania dwuetapowego@@', - 'Last login' => '@@Data ostatniego logowania@@', - 'This will disable two-factor auth. Are you sure?' => '@@To wyłączy uwierzytelnianie dwuetapowe. Czy jesteś pewny?@@', - 'Two Factor Authentication' => '@@Uwierzytelnianie dwuetapowe@@', - 'Two factor authentication protects you against stolen credentials' => '@@Uwierzytelnianie dwuetapowe chroni Cię przed kradzieżą danych logowania@@', - 'Two factor successfully enabled.' => '@@Dwuetapowe uwierzytelnianie poprawnie włączone.@@', - 'Two-Factor Authentication' => '@@Uwierzytelnianie dwuetapowe@@', - 'Two-factor auth protects you against stolen credentials' => '@@Uwierzytelnianie dwuetapowe chroni Cię przed kradzieżą danych logowania@@', - 'Two-factor authentication code' => '@@Kod uwierzytelniania dwuetapowego@@', - 'Two-factor authorization has been disabled.' => '@@Dwuetapowa autoryzacja została wyłączona.@@', - 'Two-factor code' => '@@Kod dwuetapowy@@', - 'Unable to disable two-factor authorization.' => '@@Nie można wyłączyć dwuetapowej autoryzacji.@@', '(not set)' => '(nie podano)', 'A confirmation message has been sent to your new email address' => 'Potwierdzenie zostało wysłane na Twój nowy adres email', 'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => 'Wysłaliśmy wiadomość na Twój adres email, zawierającą link aktywacyjny, w który musisz kliknąć, aby zakończyć rejestrację.', @@ -291,4 +269,26 @@ return [ '{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', + '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 + 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' => '@@Nieprawidłowy kod uwierzytelniania dwuetapowego@@', + 'Last login' => '@@Data ostatniego logowania@@', + 'This will disable two-factor auth. Are you sure?' => '@@To wyłączy uwierzytelnianie dwuetapowe. Czy jesteś pewny?@@', + 'Two Factor Authentication' => '@@Uwierzytelnianie dwuetapowe@@', + 'Two factor authentication protects you against stolen credentials' => '@@Uwierzytelnianie dwuetapowe chroni Cię przed kradzieżą danych logowania@@', + 'Two factor successfully enabled.' => '@@Dwuetapowe uwierzytelnianie poprawnie włączone.@@', + 'Two-Factor Authentication' => '@@Uwierzytelnianie dwuetapowe@@', + 'Two-factor auth protects you against stolen credentials' => '@@Uwierzytelnianie dwuetapowe chroni Cię przed kradzieżą danych logowania@@', + 'Two-factor authentication code' => '@@Kod uwierzytelniania dwuetapowego@@', + 'Two-factor authorization has been disabled.' => '@@Dwuetapowa autoryzacja została wyłączona.@@', + 'Two-factor code' => '@@Kod dwuetapowy@@', + 'Unable to disable two-factor authorization.' => '@@Nie można wyłączyć dwuetapowej autoryzacji.@@', ]; diff --git a/src/User/resources/i18n/pt-BR/usuario.php b/src/User/resources/i18n/pt-BR/usuario.php index be9b247..201c930 100644 --- a/src/User/resources/i18n/pt-BR/usuario.php +++ b/src/User/resources/i18n/pt-BR/usuario.php @@ -17,36 +17,6 @@ * 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@@', - 'Enable Two-factor auth' => '@@Habilitar autenticação em dois fatores@@', - '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}' => '@@Concordo com o processamento de meus dados pessoais e o uso de cookies para facilitar a operação deste site. Para mais informações, leia nosso {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}' => '@@Concordo com o processamento de meus dados pessoais e o uso de cookies para facilitar a operação deste site. Para mais informações, leia nosso {privacyPolicy}@@', - 'Invalid two-factor code' => '@@Código de dois fatores inválido@@', - 'Last login' => '@@Último login@@', - 'Registration ip' => '@@IP de registro@@', - 'Rule class can not be instantiated' => '@@A classe de regras não pode ser instanciada@@', - 'Rule class must extend "yii\\rbac\\Rule"' => '@@A classe de regras deve estender de "yii\\rbac\\Rule"@@', - 'This will disable two-factor auth. Are you sure?' => '@@Isso desativará a autenticação de dois fatores. Você tem certeza?@@', - 'Two Factor Authentication' => '@@Autenticação de dois fatores@@', - 'Two factor authentication protects you against stolen credentials' => '@@A autenticação de dois fatores protege você contra credenciais roubadas@@', - 'Two factor successfully enabled.' => '@@Dois fatores habilitados com sucesso.@@', - 'Two-Factor Authentication' => '@@Autenticação de dois fatores@@', - 'Two-factor auth protects you against stolen credentials' => '@@Autenticação de dois fatores protege você contra credenciais roubadas@@', - 'Two-factor authentication code' => '@@Código de autenticação de dois fatores@@', - 'Two-factor authorization has been disabled.' => '@@A autorização de dois fatores foi desabilitada.@@', - 'Two-factor code' => '@@Código de dois fatores@@', - 'Unable to disable two-factor authorization.' => '@@Não é possível desabilitar a autorização de dois fatores.@@', - 'We couldn\'t re-send the mail to confirm your address. ' => '@@Não poderíamos re-enviar o correio para confirmar o seu endereço.@@', - 'We have sent confirmation links to both old and new email addresses. ' => '@@Enviamos links de confirmação para endereços de e-mail antigo e novo.@@', '(not set)' => '(não informado)', 'A confirmation message has been sent to your new email address' => 'Uma mensagem de confirmação foi enviada para seu novo endereço de e-mail', 'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => 'Uma mensagem foi enviada para o seu endereço de e-mail. Ele contém um link de confirmação que você deve clicar para completar o registro.', @@ -299,4 +269,34 @@ return [ '{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', + '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@@', + 'Enable Two-factor auth' => '@@Habilitar autenticação em dois fatores@@', + '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}' => '@@Concordo com o processamento de meus dados pessoais e o uso de cookies para facilitar a operação deste site. Para mais informações, leia nosso {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}' => '@@Concordo com o processamento de meus dados pessoais e o uso de cookies para facilitar a operação deste site. Para mais informações, leia nosso {privacyPolicy}@@', + 'Invalid two-factor code' => '@@Código de dois fatores inválido@@', + 'Last login' => '@@Último login@@', + 'Registration ip' => '@@IP de registro@@', + 'Rule class can not be instantiated' => '@@A classe de regras não pode ser instanciada@@', + 'Rule class must extend "yii\\rbac\\Rule"' => '@@A classe de regras deve estender de "yii\\rbac\\Rule"@@', + 'This will disable two-factor auth. Are you sure?' => '@@Isso desativará a autenticação de dois fatores. Você tem certeza?@@', + 'Two Factor Authentication' => '@@Autenticação de dois fatores@@', + 'Two factor authentication protects you against stolen credentials' => '@@A autenticação de dois fatores protege você contra credenciais roubadas@@', + 'Two factor successfully enabled.' => '@@Dois fatores habilitados com sucesso.@@', + 'Two-Factor Authentication' => '@@Autenticação de dois fatores@@', + 'Two-factor auth protects you against stolen credentials' => '@@Autenticação de dois fatores protege você contra credenciais roubadas@@', + 'Two-factor authentication code' => '@@Código de autenticação de dois fatores@@', + 'Two-factor authorization has been disabled.' => '@@A autorização de dois fatores foi desabilitada.@@', + 'Two-factor code' => '@@Código de dois fatores@@', + 'Unable to disable two-factor authorization.' => '@@Não é possível desabilitar a autorização de dois fatores.@@', + 'We couldn\'t re-send the mail to confirm your address. ' => '@@Não poderíamos re-enviar o correio para confirmar o seu endereço.@@', + 'We have sent confirmation links to both old and new email addresses. ' => '@@Enviamos links de confirmação para endereços de e-mail antigo e novo.@@', ]; diff --git a/src/User/resources/i18n/pt-PT/usuario.php b/src/User/resources/i18n/pt-PT/usuario.php index 8d6ee7d..e8d547f 100644 --- a/src/User/resources/i18n/pt-PT/usuario.php +++ b/src/User/resources/i18n/pt-PT/usuario.php @@ -17,48 +17,6 @@ * 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.', @@ -299,4 +257,46 @@ return [ 'privacy policy' => 'politica de privacidade', '{0, date, MMM dd, YYYY HH:mm}' => '@@@@', '{0} cannot be blank.' => '{0} não pode ficar vazio.', + '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. ' => '@@@@', ]; diff --git a/src/User/resources/i18n/ro/usuario.php b/src/User/resources/i18n/ro/usuario.php index dbb0079..3fff21e 100644 --- a/src/User/resources/i18n/ro/usuario.php +++ b/src/User/resources/i18n/ro/usuario.php @@ -17,32 +17,6 @@ * 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@@', - '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}' => '@@Am agregat prelucrarea datelor mele personale și utilizarea cookie-urilor pentru a facilita funcționarea acestui site. Pentru mai multe informații, citiți {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}' => '@@Am agregat prelucrarea datelor mele personale și utilizarea cookie-urilor pentru a facilita funcționarea acestui site. Pentru mai multe informații, citiți {privacyPolicy}@@', - 'Invalid two-factor code' => '@@Cod de două factori nevalid@@', - 'Last login' => '@@Ultima logare@@', - 'This will disable two-factor auth. Are you sure?' => '@@Aceasta va dezactiva auth-ul cu două factori. Esti sigur?@@', - 'Two Factor Authentication' => '@@Două autentificare cu factori@@', - 'Two factor authentication protects you against stolen credentials' => '@@Autentificarea cu două factori vă protejează împotriva acreditărilor furate@@', - 'Two factor successfully enabled.' => '@@Doi factori activat cu succes.@@', - 'Two-Factor Authentication' => '@@Două factori de autentificare@@', - 'Two-factor auth protects you against stolen credentials' => '@@Autostradă cu două factori vă protejează împotriva acreditărilor furate@@', - 'Two-factor authentication code' => '@@Cod de autentificare cu două factori@@', - 'Two-factor authorization has been disabled.' => '@@A fost dezactivată autorizația cu două factori.@@', - 'Two-factor code' => '@@Cod de două factori@@', - 'Unable to disable two-factor authorization.' => '@@Imposibil de dezactivat autorizația cu două factori.@@', - 'We couldn\'t re-send the mail to confirm your address. ' => '@@Nu am putut retrimite mesajul pentru a vă confirma adresa.@@', - 'We have sent confirmation links to both old and new email addresses. ' => '@@Am trimis legături de confirmare adreselor de e-mail vechi și noi.@@', '(not set)' => '(nu este setat)', 'A confirmation message has been sent to your new email address' => 'Un mesaj de confirmare a fost trimis la noua dvs. adresă de e-mail', 'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => 'A fost trimis un mesaj la adresa dvs. de e-mail. Acesta conține un link de confirmare pe care trebuie să faceți clic pentru a finaliza înregistrarea.', @@ -295,4 +269,30 @@ return [ '{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.', + '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@@', + '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}' => '@@Am agregat prelucrarea datelor mele personale și utilizarea cookie-urilor pentru a facilita funcționarea acestui site. Pentru mai multe informații, citiți {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}' => '@@Am agregat prelucrarea datelor mele personale și utilizarea cookie-urilor pentru a facilita funcționarea acestui site. Pentru mai multe informații, citiți {privacyPolicy}@@', + 'Invalid two-factor code' => '@@Cod de două factori nevalid@@', + 'Last login' => '@@Ultima logare@@', + 'This will disable two-factor auth. Are you sure?' => '@@Aceasta va dezactiva auth-ul cu două factori. Esti sigur?@@', + 'Two Factor Authentication' => '@@Două autentificare cu factori@@', + 'Two factor authentication protects you against stolen credentials' => '@@Autentificarea cu două factori vă protejează împotriva acreditărilor furate@@', + 'Two factor successfully enabled.' => '@@Doi factori activat cu succes.@@', + 'Two-Factor Authentication' => '@@Două factori de autentificare@@', + 'Two-factor auth protects you against stolen credentials' => '@@Autostradă cu două factori vă protejează împotriva acreditărilor furate@@', + 'Two-factor authentication code' => '@@Cod de autentificare cu două factori@@', + 'Two-factor authorization has been disabled.' => '@@A fost dezactivată autorizația cu două factori.@@', + 'Two-factor code' => '@@Cod de două factori@@', + 'Unable to disable two-factor authorization.' => '@@Imposibil de dezactivat autorizația cu două factori.@@', + 'We couldn\'t re-send the mail to confirm your address. ' => '@@Nu am putut retrimite mesajul pentru a vă confirma adresa.@@', + 'We have sent confirmation links to both old and new email addresses. ' => '@@Am trimis legături de confirmare adreselor de e-mail vechi și noi.@@', ]; diff --git a/src/User/resources/i18n/ru/usuario.php b/src/User/resources/i18n/ru/usuario.php index edfccac..e3a7d7d 100644 --- a/src/User/resources/i18n/ru/usuario.php +++ b/src/User/resources/i18n/ru/usuario.php @@ -17,30 +17,6 @@ * NOTE: this file must be saved in UTF-8 encoding. */ return [ - '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' => '@@Отключить двухфакторную авторизацию@@', - '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}' => '@@@@', - 'Invalid two-factor code' => '@@Неверный код двухфакторной авторизации@@', - 'Last login' => '@@Последний вход@@', - 'Registration ip' => '@@IP при регистрации@@', - 'Rule class can not be instantiated' => '@@Класс правила не может быть создан@@', - 'Rule class must extend "yii\\rbac\\Rule"' => '@@Класс правила должен наследоваться от "yii\\rbac\\Rule"@@', - 'This will disable two-factor auth. Are you sure?' => '@@Вы уверены, что хотите отключить двухфакторную авторизацию?@@', - 'Two Factor Authentication' => '@@Двухфакторная авторизация@@', - 'Two factor authentication protects you against stolen credentials' => '@@Двухфакторная авторизация защитит вас от кражи параметров доступа@@', - '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)' => '(не задано)', 'A confirmation message has been sent to your new email address' => 'На указанный адрес было отправлено письмо с дальнейшими инструкциями', 'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => 'На вашу электронную почту было отправлено сообщение со ссылкой подтверждения регистрации.', @@ -297,4 +273,28 @@ return [ '{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} не может быть пустым.', + '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' => '@@Отключить двухфакторную авторизацию@@', + '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}' => '@@@@', + 'Invalid two-factor code' => '@@Неверный код двухфакторной авторизации@@', + 'Last login' => '@@Последний вход@@', + 'Registration ip' => '@@IP при регистрации@@', + 'Rule class can not be instantiated' => '@@Класс правила не может быть создан@@', + 'Rule class must extend "yii\\rbac\\Rule"' => '@@Класс правила должен наследоваться от "yii\\rbac\\Rule"@@', + 'This will disable two-factor auth. Are you sure?' => '@@Вы уверены, что хотите отключить двухфакторную авторизацию?@@', + 'Two Factor Authentication' => '@@Двухфакторная авторизация@@', + 'Two factor authentication protects you against stolen credentials' => '@@Двухфакторная авторизация защитит вас от кражи параметров доступа@@', + '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. ' => '@@Мы отправили письма на ваш старый и новый почтовые ящики. Вы должны перейти по обеим, чтобы завершить процесс смены адреса.@@', ]; diff --git a/src/User/resources/i18n/th/usuario.php b/src/User/resources/i18n/th/usuario.php index 1718269..62ade06 100644 --- a/src/User/resources/i18n/th/usuario.php +++ b/src/User/resources/i18n/th/usuario.php @@ -17,6 +17,7 @@ * NOTE: this file must be saved in UTF-8 encoding. */ return [ + '{0, date, MMM dd, YYYY HH:mm}' => '@@@@', '(not set)' => '', 'A confirmation message has been sent to your new email address' => '', 'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => '', @@ -298,5 +299,4 @@ return [ '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}' => '@@@@', ]; diff --git a/src/User/resources/i18n/tr-TR/usuario.php b/src/User/resources/i18n/tr-TR/usuario.php index 1718269..62ade06 100644 --- a/src/User/resources/i18n/tr-TR/usuario.php +++ b/src/User/resources/i18n/tr-TR/usuario.php @@ -17,6 +17,7 @@ * NOTE: this file must be saved in UTF-8 encoding. */ return [ + '{0, date, MMM dd, YYYY HH:mm}' => '@@@@', '(not set)' => '', 'A confirmation message has been sent to your new email address' => '', 'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => '', @@ -298,5 +299,4 @@ return [ '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}' => '@@@@', ]; diff --git a/src/User/resources/i18n/uk/usuario.php b/src/User/resources/i18n/uk/usuario.php index 1718269..62ade06 100644 --- a/src/User/resources/i18n/uk/usuario.php +++ b/src/User/resources/i18n/uk/usuario.php @@ -17,6 +17,7 @@ * NOTE: this file must be saved in UTF-8 encoding. */ return [ + '{0, date, MMM dd, YYYY HH:mm}' => '@@@@', '(not set)' => '', 'A confirmation message has been sent to your new email address' => '', 'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => '', @@ -298,5 +299,4 @@ return [ '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}' => '@@@@', ]; diff --git a/src/User/resources/i18n/vi/usuario.php b/src/User/resources/i18n/vi/usuario.php index 1718269..62ade06 100644 --- a/src/User/resources/i18n/vi/usuario.php +++ b/src/User/resources/i18n/vi/usuario.php @@ -17,6 +17,7 @@ * NOTE: this file must be saved in UTF-8 encoding. */ return [ + '{0, date, MMM dd, YYYY HH:mm}' => '@@@@', '(not set)' => '', 'A confirmation message has been sent to your new email address' => '', 'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => '', @@ -298,5 +299,4 @@ return [ '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}' => '@@@@', ]; diff --git a/src/User/resources/i18n/zh-CN/usuario.php b/src/User/resources/i18n/zh-CN/usuario.php index 1718269..62ade06 100644 --- a/src/User/resources/i18n/zh-CN/usuario.php +++ b/src/User/resources/i18n/zh-CN/usuario.php @@ -17,6 +17,7 @@ * NOTE: this file must be saved in UTF-8 encoding. */ return [ + '{0, date, MMM dd, YYYY HH:mm}' => '@@@@', '(not set)' => '', 'A confirmation message has been sent to your new email address' => '', 'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => '', @@ -298,5 +299,4 @@ return [ '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}' => '@@@@', ]; From c0861c221278f3a83a0e0aa6365badd58bbbd81b Mon Sep 17 00:00:00 2001 From: tsdogs Date: Tue, 4 Jun 2019 14:17:21 +0200 Subject: [PATCH 22/51] As pointed out it's require and not add --- docs/installation/migration-guide-from-dektrium-tools.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/installation/migration-guide-from-dektrium-tools.md b/docs/installation/migration-guide-from-dektrium-tools.md index 5f77fb8..a806c4d 100644 --- a/docs/installation/migration-guide-from-dektrium-tools.md +++ b/docs/installation/migration-guide-from-dektrium-tools.md @@ -13,7 +13,7 @@ composer remove dektrium/yii2-rbac ## Install yii2-usuario ``` -composer add 2amigos/yii2-usuario +composer require 2amigos/yii2-usuario ``` ## Configuration From 6ee63d29161a7228830d494f42d27aa829b34057 Mon Sep 17 00:00:00 2001 From: Alessandro Briosi Date: Thu, 21 Jun 2018 18:10:36 +0200 Subject: [PATCH 23/51] Add documentation on how to apply/mark migrations to existing projects #172 --- .../migration-guide-from-dektrium-tools.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/docs/installation/migration-guide-from-dektrium-tools.md b/docs/installation/migration-guide-from-dektrium-tools.md index 80da4eb..e84c4b5 100644 --- a/docs/installation/migration-guide-from-dektrium-tools.md +++ b/docs/installation/migration-guide-from-dektrium-tools.md @@ -11,6 +11,11 @@ composer remove dektrium/yii2-user composer remove dektrium/yii2-rbac ``` +## Install yii2-usuario +``` +composer add 2amigos/yii2-usuario +``` + ## Configuration Configure the `config/console.php` stuff: @@ -114,6 +119,19 @@ This functionality has been dropped. Use `deny` rule in your configuration direc ``` +## Mark migrations as applied in an existing project + +If you already have a production project which has all the necessary user tables from dektrium simply run the following commands to +mark some migrations as already applied. + +``` +./yii migrate/mark "Da\User\Migration\m000000_000005_add_last_login_at" +./yii migrate/to "Da\User\Migration\m000000_000007_enable_password_expiration" +``` + +The first command will mark the migration as applied, the second will apply missing migrations. +The second command is optiona as a simple ```./yii migrate/up``` would apply all missing migrations anyway. + ## 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. From 30223692ba9854ce5289373e2b39f383fe5d2abe Mon Sep 17 00:00:00 2001 From: Alessandro Briosi Date: Fri, 22 Jun 2018 11:07:41 +0200 Subject: [PATCH 24/51] fix typo --- docs/installation/migration-guide-from-dektrium-tools.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/installation/migration-guide-from-dektrium-tools.md b/docs/installation/migration-guide-from-dektrium-tools.md index e84c4b5..aef1a61 100644 --- a/docs/installation/migration-guide-from-dektrium-tools.md +++ b/docs/installation/migration-guide-from-dektrium-tools.md @@ -130,7 +130,7 @@ mark some migrations as already applied. ``` The first command will mark the migration as applied, the second will apply missing migrations. -The second command is optiona as a simple ```./yii migrate/up``` would apply all missing migrations anyway. +The second command is optional as a simple ```./yii migrate/up``` would apply all missing migrations anyway. ## Rbac migrations From c1ed9c0e9567ecdc73cdb95e2f7184a2f7555c78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Bo=CC=88hnke?= Date: Thu, 30 May 2019 11:07:31 +0200 Subject: [PATCH 25/51] fix typo --- src/User/resources/i18n/de/usuario.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/User/resources/i18n/de/usuario.php b/src/User/resources/i18n/de/usuario.php index 2860c15..17e5931 100644 --- a/src/User/resources/i18n/de/usuario.php +++ b/src/User/resources/i18n/de/usuario.php @@ -52,7 +52,7 @@ return [ 'Account details have been updated' => 'Kontodetails gespeichert', 'Account settings' => 'Kontoeinstellungen', 'Already registered? Sign in!' => 'Bereits registriert? Zur Anmeldung!', - '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.' => 'Eine Email mit Hinweisen, wie ein Kennwort erstellt wirdm wurde an {email} gesendet, sofern es mit dem Konto {appName} verbindund ist. Das aktuelle Kennwort wurde nicht geändert.', + '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.' => 'Eine E-Mail mit Hinweisen, wie ein Kennwort erstellt wird wurde an {email} gesendet, sofern es mit dem Konto {appName} verbunden ist. Das aktuelle Kennwort wurde nicht geändert.', '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?', From 8c2bc117ac8b9e0d5b6d7c7bf28588b64f8ed184 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Bo=CC=88hnke?= Date: Thu, 30 May 2019 11:16:26 +0200 Subject: [PATCH 26/51] run message/extract command --- src/User/resources/i18n/ca/usuario.php | 2 +- src/User/resources/i18n/da/usuario.php | 2 +- src/User/resources/i18n/de-DU/usuario.php | 2 +- src/User/resources/i18n/de/usuario.php | 48 ++++++------- src/User/resources/i18n/es/usuario.php | 14 ++-- src/User/resources/i18n/fa-IR/usuario.php | 2 +- src/User/resources/i18n/fi/usuario.php | 2 +- src/User/resources/i18n/fr/usuario.php | 1 + src/User/resources/i18n/hr/usuario.php | 2 +- src/User/resources/i18n/hu/usuario.php | 48 ++++++------- src/User/resources/i18n/it/usuario.php | 6 +- src/User/resources/i18n/kk/usuario.php | 2 +- src/User/resources/i18n/lt/usuario.php | 2 +- src/User/resources/i18n/nl/usuario.php | 60 ++++++++-------- src/User/resources/i18n/pl/usuario.php | 44 ++++++------ src/User/resources/i18n/pt-BR/usuario.php | 60 ++++++++-------- src/User/resources/i18n/pt-PT/usuario.php | 84 +++++++++++------------ src/User/resources/i18n/ro/usuario.php | 52 +++++++------- src/User/resources/i18n/ru/usuario.php | 48 ++++++------- src/User/resources/i18n/th/usuario.php | 2 +- src/User/resources/i18n/tr-TR/usuario.php | 2 +- src/User/resources/i18n/uk/usuario.php | 2 +- src/User/resources/i18n/vi/usuario.php | 2 +- src/User/resources/i18n/zh-CN/usuario.php | 2 +- 24 files changed, 246 insertions(+), 245 deletions(-) diff --git a/src/User/resources/i18n/ca/usuario.php b/src/User/resources/i18n/ca/usuario.php index 1718269..62ade06 100644 --- a/src/User/resources/i18n/ca/usuario.php +++ b/src/User/resources/i18n/ca/usuario.php @@ -17,6 +17,7 @@ * NOTE: this file must be saved in UTF-8 encoding. */ return [ + '{0, date, MMM dd, YYYY HH:mm}' => '@@@@', '(not set)' => '', 'A confirmation message has been sent to your new email address' => '', 'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => '', @@ -298,5 +299,4 @@ return [ '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}' => '@@@@', ]; diff --git a/src/User/resources/i18n/da/usuario.php b/src/User/resources/i18n/da/usuario.php index 1718269..62ade06 100644 --- a/src/User/resources/i18n/da/usuario.php +++ b/src/User/resources/i18n/da/usuario.php @@ -17,6 +17,7 @@ * NOTE: this file must be saved in UTF-8 encoding. */ return [ + '{0, date, MMM dd, YYYY HH:mm}' => '@@@@', '(not set)' => '', 'A confirmation message has been sent to your new email address' => '', 'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => '', @@ -298,5 +299,4 @@ return [ '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}' => '@@@@', ]; diff --git a/src/User/resources/i18n/de-DU/usuario.php b/src/User/resources/i18n/de-DU/usuario.php index 1718269..62ade06 100644 --- a/src/User/resources/i18n/de-DU/usuario.php +++ b/src/User/resources/i18n/de-DU/usuario.php @@ -17,6 +17,7 @@ * NOTE: this file must be saved in UTF-8 encoding. */ return [ + '{0, date, MMM dd, YYYY HH:mm}' => '@@@@', '(not set)' => '', 'A confirmation message has been sent to your new email address' => '', 'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => '', @@ -298,5 +299,4 @@ return [ '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}' => '@@@@', ]; diff --git a/src/User/resources/i18n/de/usuario.php b/src/User/resources/i18n/de/usuario.php index 17e5931..44bf1d9 100644 --- a/src/User/resources/i18n/de/usuario.php +++ b/src/User/resources/i18n/de/usuario.php @@ -17,30 +17,6 @@ * NOTE: this file must be saved in UTF-8 encoding. */ return [ - '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@@', - 'Enable Two-factor auth' => '@@Zweifaktor-Authentifizierung aktivieren@@', - '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' => '@@Ungültiger Zweifaktor Schlüssel@@', - 'Last login' => '@@Letzter Login@@', - 'Registration ip' => '@@Registrierungs-IP@@', - 'Rule class can not be instantiated' => '@@@@', - 'Rule class must extend "yii\\rbac\\Rule"' => '@@@@', - 'This will disable two-factor auth. Are you sure?' => '@@Dies wird die Zweifaktor-Authentifizierung deaktivieren. Sind Sie sicher?@@', - 'Two Factor Authentication' => '@@Zweifaktor-Authentifizierung@@', - 'Two factor authentication protects you against stolen credentials' => '@@@@', - 'Two factor successfully enabled.' => '@@Zweifaktor-Authentifizierung erfolgreich aktiviert.@@', - 'Two-Factor Authentication' => '@@Zweifaktor-Authentifizierung@@', - 'Two-factor auth protects you against stolen credentials' => '@@Zweifaktor-Authentifizierung schützt Sie vor gestohlenen Zugangsdaten@@', - 'Two-factor authentication code' => '@@Zweifaktor-Authentifizierungsschlüssel@@', - 'Two-factor authorization has been disabled.' => '@@Zweifaktor-Authentifizierung wurde deaktiviert.@@', - 'Two-factor code' => '@@Zweifaktor-Schlüssel@@', - 'Unable to disable two-factor authorization.' => '@@Unfähig die Zweifaktor-Authentifizierung zu deaktivieren.@@', - 'We couldn\'t re-send the mail to confirm your address. ' => '@@Wir konnte die Bestätigungs E-Mail nicht erneut versenden@@', - 'We have sent confirmation links to both old and new email addresses. ' => '@@Wir haben Bestätigungs E-Mails an die neue und alte E-Mail Adresse versandt.@@', '(not set)' => '(nicht gesetzt)', 'A confirmation message has been sent to your new email address' => 'Eine Bestätigungsnachricht wurde an Ihre neue E-Mail Adresse versandt', 'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => 'Eine Nachricht wurde an Ihre E-Mail-Adresse gesendet. Sie enthält einen Bestätigungslink den Sie klicken müssen um die Registrierung abzuschließen.', @@ -297,4 +273,28 @@ return [ '{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.', + '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@@', + 'Enable Two-factor auth' => '@@Zweifaktor-Authentifizierung aktivieren@@', + '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' => '@@Ungültiger Zweifaktor Schlüssel@@', + 'Last login' => '@@Letzter Login@@', + 'Registration ip' => '@@Registrierungs-IP@@', + 'Rule class can not be instantiated' => '@@@@', + 'Rule class must extend "yii\\rbac\\Rule"' => '@@@@', + 'This will disable two-factor auth. Are you sure?' => '@@Dies wird die Zweifaktor-Authentifizierung deaktivieren. Sind Sie sicher?@@', + 'Two Factor Authentication' => '@@Zweifaktor-Authentifizierung@@', + 'Two factor authentication protects you against stolen credentials' => '@@@@', + 'Two factor successfully enabled.' => '@@Zweifaktor-Authentifizierung erfolgreich aktiviert.@@', + 'Two-Factor Authentication' => '@@Zweifaktor-Authentifizierung@@', + 'Two-factor auth protects you against stolen credentials' => '@@Zweifaktor-Authentifizierung schützt Sie vor gestohlenen Zugangsdaten@@', + 'Two-factor authentication code' => '@@Zweifaktor-Authentifizierungsschlüssel@@', + 'Two-factor authorization has been disabled.' => '@@Zweifaktor-Authentifizierung wurde deaktiviert.@@', + 'Two-factor code' => '@@Zweifaktor-Schlüssel@@', + 'Unable to disable two-factor authorization.' => '@@Unfähig die Zweifaktor-Authentifizierung zu deaktivieren.@@', + 'We couldn\'t re-send the mail to confirm your address. ' => '@@Wir konnte die Bestätigungs E-Mail nicht erneut versenden@@', + 'We have sent confirmation links to both old and new email addresses. ' => '@@Wir haben Bestätigungs E-Mails an die neue und alte E-Mail Adresse versandt.@@', ]; diff --git a/src/User/resources/i18n/es/usuario.php b/src/User/resources/i18n/es/usuario.php index 34b2f4a..b21c17e 100644 --- a/src/User/resources/i18n/es/usuario.php +++ b/src/User/resources/i18n/es/usuario.php @@ -17,13 +17,6 @@ * 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', 'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => 'Se ha enviado un mensaje a su dirección de correo electrónico. Contiene un enlace de confirmación que tiene que seguir para completar el registro.', @@ -275,4 +268,11 @@ return [ 'privacy policy' => 'política de privacidad', '{0, date, MMMM dd, YYYY HH:mm}' => '{0, date, dd MMMM, YYYY HH:mm}', '{0} cannot be blank.' => '{0} no puede estar vacío.', + '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@@', ]; diff --git a/src/User/resources/i18n/fa-IR/usuario.php b/src/User/resources/i18n/fa-IR/usuario.php index 1718269..62ade06 100644 --- a/src/User/resources/i18n/fa-IR/usuario.php +++ b/src/User/resources/i18n/fa-IR/usuario.php @@ -17,6 +17,7 @@ * NOTE: this file must be saved in UTF-8 encoding. */ return [ + '{0, date, MMM dd, YYYY HH:mm}' => '@@@@', '(not set)' => '', 'A confirmation message has been sent to your new email address' => '', 'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => '', @@ -298,5 +299,4 @@ return [ '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}' => '@@@@', ]; diff --git a/src/User/resources/i18n/fi/usuario.php b/src/User/resources/i18n/fi/usuario.php index 1718269..62ade06 100644 --- a/src/User/resources/i18n/fi/usuario.php +++ b/src/User/resources/i18n/fi/usuario.php @@ -17,6 +17,7 @@ * NOTE: this file must be saved in UTF-8 encoding. */ return [ + '{0, date, MMM dd, YYYY HH:mm}' => '@@@@', '(not set)' => '', 'A confirmation message has been sent to your new email address' => '', 'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => '', @@ -298,5 +299,4 @@ return [ '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}' => '@@@@', ]; diff --git a/src/User/resources/i18n/fr/usuario.php b/src/User/resources/i18n/fr/usuario.php index 4c8b74d..586496e 100644 --- a/src/User/resources/i18n/fr/usuario.php +++ b/src/User/resources/i18n/fr/usuario.php @@ -272,4 +272,5 @@ return [ 'privacy policy' => 'politique de confidentialité', '{0, date, MMMM dd, YYYY HH:mm}' => '{0, date, dd MMMM YYYY HH:mm}', '{0} cannot be blank.' => '{0} ne peut être vide.', + '{0, date, MMM dd, YYYY HH:mm}' => '', ]; diff --git a/src/User/resources/i18n/hr/usuario.php b/src/User/resources/i18n/hr/usuario.php index 1718269..62ade06 100644 --- a/src/User/resources/i18n/hr/usuario.php +++ b/src/User/resources/i18n/hr/usuario.php @@ -17,6 +17,7 @@ * NOTE: this file must be saved in UTF-8 encoding. */ return [ + '{0, date, MMM dd, YYYY HH:mm}' => '@@@@', '(not set)' => '', 'A confirmation message has been sent to your new email address' => '', 'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => '', @@ -298,5 +299,4 @@ return [ '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}' => '@@@@', ]; diff --git a/src/User/resources/i18n/hu/usuario.php b/src/User/resources/i18n/hu/usuario.php index 5ba1f36..57e9ca3 100644 --- a/src/User/resources/i18n/hu/usuario.php +++ b/src/User/resources/i18n/hu/usuario.php @@ -17,30 +17,6 @@ * 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@@', - '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}' => '@@Aggregálom a személyes adataim feldolgozását és a cookie-k használatát a webhely működésének megkönnyítése érdekében. További információért olvassa el a {privacyPolicy}@@', - 'Invalid two-factor code' => '@@Érvénytelen kétütemű kód@@', - 'Last login' => '@@Utolsó bejelentkezés@@', - 'This will disable two-factor auth. Are you sure?' => '@@Ez letiltja a kétütemű hitelesítést. biztos vagy ebben?@@', - 'Two Factor Authentication' => '@@Két tényező hitelesítés@@', - 'Two factor authentication protects you against stolen credentials' => '@@Két tényező-hitelesítés megvédi az ellopott hitelesítő adatokat@@', - 'Two factor successfully enabled.' => '@@Két tényező sikeresen bekapcsolt.@@', - 'Two-Factor Authentication' => '@@Két faktoros hitelesítés@@', - 'Two-factor auth protects you against stolen credentials' => '@@A kétütemű auth védelmet nyújt az ellopott hitelesítő adatok ellen@@', - 'Two-factor authentication code' => '@@Kétszeres hitelesítési kód@@', - 'Two-factor authorization has been disabled.' => '@@A kétütemű engedélyezés le van tiltva.@@', - 'Two-factor code' => '@@Kétszámjegyű kód@@', - 'Unable to disable two-factor authorization.' => '@@Nem sikerült letiltani a kétütemű engedélyezést.@@', - 'We couldn\'t re-send the mail to confirm your address. ' => '@@A cím megerősítéséhez nem tudtuk újra elküldeni az e-mailt.@@', - 'We have sent confirmation links to both old and new email addresses. ' => '@@Megerősítő linkeket küldtünk régi és új e-mail címekre.@@', '(not set)' => '(nincs beállítva)', 'A confirmation message has been sent to your new email address' => 'Az új e-mail címére megerősítő üzenetet küldtek', 'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => 'Üzenet érkezett az e-mail címedre. Tartalmaz egy megerősítő linket, amelyet a regisztráció befejezéséhez ki kell kattintania.', @@ -293,4 +269,28 @@ return [ '{0, date, MMM dd, YYYY HH:mm}' => '{0, dátum, MMM dd, ÉÉÉÉ HH: mm}', '{0, date, MMMM dd, YYYY HH:mm}' => '{0, dátum, MMMM dd, ÉÉÉÉ HH: mm}', '{0} cannot be blank.' => '{0} nem lehet üres.', + '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@@', + '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}' => '@@Aggregálom a személyes adataim feldolgozását és a cookie-k használatát a webhely működésének megkönnyítése érdekében. További információért olvassa el a {privacyPolicy}@@', + 'Invalid two-factor code' => '@@Érvénytelen kétütemű kód@@', + 'Last login' => '@@Utolsó bejelentkezés@@', + 'This will disable two-factor auth. Are you sure?' => '@@Ez letiltja a kétütemű hitelesítést. biztos vagy ebben?@@', + 'Two Factor Authentication' => '@@Két tényező hitelesítés@@', + 'Two factor authentication protects you against stolen credentials' => '@@Két tényező-hitelesítés megvédi az ellopott hitelesítő adatokat@@', + 'Two factor successfully enabled.' => '@@Két tényező sikeresen bekapcsolt.@@', + 'Two-Factor Authentication' => '@@Két faktoros hitelesítés@@', + 'Two-factor auth protects you against stolen credentials' => '@@A kétütemű auth védelmet nyújt az ellopott hitelesítő adatok ellen@@', + 'Two-factor authentication code' => '@@Kétszeres hitelesítési kód@@', + 'Two-factor authorization has been disabled.' => '@@A kétütemű engedélyezés le van tiltva.@@', + 'Two-factor code' => '@@Kétszámjegyű kód@@', + 'Unable to disable two-factor authorization.' => '@@Nem sikerült letiltani a kétütemű engedélyezést.@@', + 'We couldn\'t re-send the mail to confirm your address. ' => '@@A cím megerősítéséhez nem tudtuk újra elküldeni az e-mailt.@@', + 'We have sent confirmation links to both old and new email addresses. ' => '@@Megerősítő linkeket küldtünk régi és új e-mail címekre.@@', ]; diff --git a/src/User/resources/i18n/it/usuario.php b/src/User/resources/i18n/it/usuario.php index 37ed5f5..1e18790 100644 --- a/src/User/resources/i18n/it/usuario.php +++ b/src/User/resources/i18n/it/usuario.php @@ -17,9 +17,6 @@ * 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.' => '', - '{0, date, MMM dd, YYYY HH:mm}' => '', - '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.', @@ -274,4 +271,7 @@ return [ 'privacy policy' => 'politica della privacy', '{0, date, MMMM dd, YYYY HH:mm}' => '{0, date, dd MMMM YYYY HH:mm}', '{0} cannot be blank.' => '{0} non può essere vuoto.', + '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}' => '', + 'An email has been sent with instructions for resetting your password' => '@@È stata inviata un\'email con le istruzioni per azzerare la tua password@@', ]; diff --git a/src/User/resources/i18n/kk/usuario.php b/src/User/resources/i18n/kk/usuario.php index 1718269..62ade06 100644 --- a/src/User/resources/i18n/kk/usuario.php +++ b/src/User/resources/i18n/kk/usuario.php @@ -17,6 +17,7 @@ * NOTE: this file must be saved in UTF-8 encoding. */ return [ + '{0, date, MMM dd, YYYY HH:mm}' => '@@@@', '(not set)' => '', 'A confirmation message has been sent to your new email address' => '', 'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => '', @@ -298,5 +299,4 @@ return [ '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}' => '@@@@', ]; diff --git a/src/User/resources/i18n/lt/usuario.php b/src/User/resources/i18n/lt/usuario.php index 1718269..62ade06 100644 --- a/src/User/resources/i18n/lt/usuario.php +++ b/src/User/resources/i18n/lt/usuario.php @@ -17,6 +17,7 @@ * NOTE: this file must be saved in UTF-8 encoding. */ return [ + '{0, date, MMM dd, YYYY HH:mm}' => '@@@@', '(not set)' => '', 'A confirmation message has been sent to your new email address' => '', 'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => '', @@ -298,5 +299,4 @@ return [ '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}' => '@@@@', ]; diff --git a/src/User/resources/i18n/nl/usuario.php b/src/User/resources/i18n/nl/usuario.php index 7f6f783..634de5e 100644 --- a/src/User/resources/i18n/nl/usuario.php +++ b/src/User/resources/i18n/nl/usuario.php @@ -17,36 +17,6 @@ * 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@@', - 'Enable Two-factor auth' => '@@Tweetraps authenticatie inschakelen@@', - '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}' => '@@Ik ga akkoord dat mijn persoonlijke data en cookies worden verwerkt voor het gebruik van deze website. Voor meer informatie lees onze {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}' => '@@Ik ga akkoord dat mijn persoonlijke data en cookies worden verwerkt voor het gebruik van deze website. Voor meer informatie lees onze {privacyPolicy}@@', - 'Invalid two-factor code' => '@@Ongeldige tweetraps authenticatie code@@', - 'Last login' => '@@Laatste login@@', - 'Registration ip' => '@@Registratie IP@@', - 'Rule class can not be instantiated' => '@@Registratie IP@@', - 'Rule class must extend "yii\\rbac\\Rule"' => '@@Regel klasse moet worden uitgebreid met "yii\\rbac\\Rule"@@', - 'This will disable two-factor auth. Are you sure?' => '@@Dit zal de tweetraps authenticatie uitschakelen. Ben je zeker?@@', - 'Two Factor Authentication' => '@@Tweetraps authenticatie@@', - 'Two factor authentication protects you against stolen credentials' => '@@Tweetraps authenticatie beschermt je tegen gestolen inloggegevens@@', - 'Two factor successfully enabled.' => '@@Tweetraps authenticatie ingeschakeld@@', - 'Two-Factor Authentication' => '@@Tweetraps authenticatie@@', - 'Two-factor auth protects you against stolen credentials' => '@@Tweetraps authenticatie beschermt je tegen gestolen authenticatie gegevens@@', - 'Two-factor authentication code' => '@@Tweetraps authenticatie code@@', - 'Two-factor authorization has been disabled.' => '@@Tweetraps authenticatie werd uitgeschakeld.@@', - 'Two-factor code' => '@@Tweetraps authenticatie code@@', - 'Unable to disable two-factor authorization.' => '@@Tweetraps authenticatie kon niet worden uitgeschakeld@@', - 'We couldn\'t re-send the mail to confirm your address. ' => '@@Wij konden de email bevestigingsmail niet opnieuw naar jouw adres verzenden.@@', - 'We have sent confirmation links to both old and new email addresses. ' => '@@We hebben de bevestigingsmail naar zowel jouw oud als nieuw emailadres verzonden.@@', '(not set)' => '(niet ingesteld)', 'A confirmation message has been sent to your new email address' => 'Er werd een bevestigingsmail naar het nieuwe emailadres verzonden', 'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => 'Een email met daarin een bevestigingslink werd verzonden naar jouw email adres. Klik op de link om de registratie te vervolledigen.', @@ -299,4 +269,34 @@ return [ '{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} kan niet leeg zijn.', + '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@@', + 'Enable Two-factor auth' => '@@Tweetraps authenticatie inschakelen@@', + '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}' => '@@Ik ga akkoord dat mijn persoonlijke data en cookies worden verwerkt voor het gebruik van deze website. Voor meer informatie lees onze {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}' => '@@Ik ga akkoord dat mijn persoonlijke data en cookies worden verwerkt voor het gebruik van deze website. Voor meer informatie lees onze {privacyPolicy}@@', + 'Invalid two-factor code' => '@@Ongeldige tweetraps authenticatie code@@', + 'Last login' => '@@Laatste login@@', + 'Registration ip' => '@@Registratie IP@@', + 'Rule class can not be instantiated' => '@@Registratie IP@@', + 'Rule class must extend "yii\\rbac\\Rule"' => '@@Regel klasse moet worden uitgebreid met "yii\\rbac\\Rule"@@', + 'This will disable two-factor auth. Are you sure?' => '@@Dit zal de tweetraps authenticatie uitschakelen. Ben je zeker?@@', + 'Two Factor Authentication' => '@@Tweetraps authenticatie@@', + 'Two factor authentication protects you against stolen credentials' => '@@Tweetraps authenticatie beschermt je tegen gestolen inloggegevens@@', + 'Two factor successfully enabled.' => '@@Tweetraps authenticatie ingeschakeld@@', + 'Two-Factor Authentication' => '@@Tweetraps authenticatie@@', + 'Two-factor auth protects you against stolen credentials' => '@@Tweetraps authenticatie beschermt je tegen gestolen authenticatie gegevens@@', + 'Two-factor authentication code' => '@@Tweetraps authenticatie code@@', + 'Two-factor authorization has been disabled.' => '@@Tweetraps authenticatie werd uitgeschakeld.@@', + 'Two-factor code' => '@@Tweetraps authenticatie code@@', + 'Unable to disable two-factor authorization.' => '@@Tweetraps authenticatie kon niet worden uitgeschakeld@@', + 'We couldn\'t re-send the mail to confirm your address. ' => '@@Wij konden de email bevestigingsmail niet opnieuw naar jouw adres verzenden.@@', + 'We have sent confirmation links to both old and new email addresses. ' => '@@We hebben de bevestigingsmail naar zowel jouw oud als nieuw emailadres verzonden.@@', ]; diff --git a/src/User/resources/i18n/pl/usuario.php b/src/User/resources/i18n/pl/usuario.php index 8803782..a8ef1f3 100644 --- a/src/User/resources/i18n/pl/usuario.php +++ b/src/User/resources/i18n/pl/usuario.php @@ -17,28 +17,6 @@ * 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 - 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' => '@@Nieprawidłowy kod uwierzytelniania dwuetapowego@@', - 'Last login' => '@@Data ostatniego logowania@@', - 'This will disable two-factor auth. Are you sure?' => '@@To wyłączy uwierzytelnianie dwuetapowe. Czy jesteś pewny?@@', - 'Two Factor Authentication' => '@@Uwierzytelnianie dwuetapowe@@', - 'Two factor authentication protects you against stolen credentials' => '@@Uwierzytelnianie dwuetapowe chroni Cię przed kradzieżą danych logowania@@', - 'Two factor successfully enabled.' => '@@Dwuetapowe uwierzytelnianie poprawnie włączone.@@', - 'Two-Factor Authentication' => '@@Uwierzytelnianie dwuetapowe@@', - 'Two-factor auth protects you against stolen credentials' => '@@Uwierzytelnianie dwuetapowe chroni Cię przed kradzieżą danych logowania@@', - 'Two-factor authentication code' => '@@Kod uwierzytelniania dwuetapowego@@', - 'Two-factor authorization has been disabled.' => '@@Dwuetapowa autoryzacja została wyłączona.@@', - 'Two-factor code' => '@@Kod dwuetapowy@@', - 'Unable to disable two-factor authorization.' => '@@Nie można wyłączyć dwuetapowej autoryzacji.@@', '(not set)' => '(nie podano)', 'A confirmation message has been sent to your new email address' => 'Potwierdzenie zostało wysłane na Twój nowy adres email', 'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => 'Wysłaliśmy wiadomość na Twój adres email, zawierającą link aktywacyjny, w który musisz kliknąć, aby zakończyć rejestrację.', @@ -291,4 +269,26 @@ return [ '{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', + '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 + 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' => '@@Nieprawidłowy kod uwierzytelniania dwuetapowego@@', + 'Last login' => '@@Data ostatniego logowania@@', + 'This will disable two-factor auth. Are you sure?' => '@@To wyłączy uwierzytelnianie dwuetapowe. Czy jesteś pewny?@@', + 'Two Factor Authentication' => '@@Uwierzytelnianie dwuetapowe@@', + 'Two factor authentication protects you against stolen credentials' => '@@Uwierzytelnianie dwuetapowe chroni Cię przed kradzieżą danych logowania@@', + 'Two factor successfully enabled.' => '@@Dwuetapowe uwierzytelnianie poprawnie włączone.@@', + 'Two-Factor Authentication' => '@@Uwierzytelnianie dwuetapowe@@', + 'Two-factor auth protects you against stolen credentials' => '@@Uwierzytelnianie dwuetapowe chroni Cię przed kradzieżą danych logowania@@', + 'Two-factor authentication code' => '@@Kod uwierzytelniania dwuetapowego@@', + 'Two-factor authorization has been disabled.' => '@@Dwuetapowa autoryzacja została wyłączona.@@', + 'Two-factor code' => '@@Kod dwuetapowy@@', + 'Unable to disable two-factor authorization.' => '@@Nie można wyłączyć dwuetapowej autoryzacji.@@', ]; diff --git a/src/User/resources/i18n/pt-BR/usuario.php b/src/User/resources/i18n/pt-BR/usuario.php index be9b247..201c930 100644 --- a/src/User/resources/i18n/pt-BR/usuario.php +++ b/src/User/resources/i18n/pt-BR/usuario.php @@ -17,36 +17,6 @@ * 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@@', - 'Enable Two-factor auth' => '@@Habilitar autenticação em dois fatores@@', - '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}' => '@@Concordo com o processamento de meus dados pessoais e o uso de cookies para facilitar a operação deste site. Para mais informações, leia nosso {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}' => '@@Concordo com o processamento de meus dados pessoais e o uso de cookies para facilitar a operação deste site. Para mais informações, leia nosso {privacyPolicy}@@', - 'Invalid two-factor code' => '@@Código de dois fatores inválido@@', - 'Last login' => '@@Último login@@', - 'Registration ip' => '@@IP de registro@@', - 'Rule class can not be instantiated' => '@@A classe de regras não pode ser instanciada@@', - 'Rule class must extend "yii\\rbac\\Rule"' => '@@A classe de regras deve estender de "yii\\rbac\\Rule"@@', - 'This will disable two-factor auth. Are you sure?' => '@@Isso desativará a autenticação de dois fatores. Você tem certeza?@@', - 'Two Factor Authentication' => '@@Autenticação de dois fatores@@', - 'Two factor authentication protects you against stolen credentials' => '@@A autenticação de dois fatores protege você contra credenciais roubadas@@', - 'Two factor successfully enabled.' => '@@Dois fatores habilitados com sucesso.@@', - 'Two-Factor Authentication' => '@@Autenticação de dois fatores@@', - 'Two-factor auth protects you against stolen credentials' => '@@Autenticação de dois fatores protege você contra credenciais roubadas@@', - 'Two-factor authentication code' => '@@Código de autenticação de dois fatores@@', - 'Two-factor authorization has been disabled.' => '@@A autorização de dois fatores foi desabilitada.@@', - 'Two-factor code' => '@@Código de dois fatores@@', - 'Unable to disable two-factor authorization.' => '@@Não é possível desabilitar a autorização de dois fatores.@@', - 'We couldn\'t re-send the mail to confirm your address. ' => '@@Não poderíamos re-enviar o correio para confirmar o seu endereço.@@', - 'We have sent confirmation links to both old and new email addresses. ' => '@@Enviamos links de confirmação para endereços de e-mail antigo e novo.@@', '(not set)' => '(não informado)', 'A confirmation message has been sent to your new email address' => 'Uma mensagem de confirmação foi enviada para seu novo endereço de e-mail', 'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => 'Uma mensagem foi enviada para o seu endereço de e-mail. Ele contém um link de confirmação que você deve clicar para completar o registro.', @@ -299,4 +269,34 @@ return [ '{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', + '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@@', + 'Enable Two-factor auth' => '@@Habilitar autenticação em dois fatores@@', + '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}' => '@@Concordo com o processamento de meus dados pessoais e o uso de cookies para facilitar a operação deste site. Para mais informações, leia nosso {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}' => '@@Concordo com o processamento de meus dados pessoais e o uso de cookies para facilitar a operação deste site. Para mais informações, leia nosso {privacyPolicy}@@', + 'Invalid two-factor code' => '@@Código de dois fatores inválido@@', + 'Last login' => '@@Último login@@', + 'Registration ip' => '@@IP de registro@@', + 'Rule class can not be instantiated' => '@@A classe de regras não pode ser instanciada@@', + 'Rule class must extend "yii\\rbac\\Rule"' => '@@A classe de regras deve estender de "yii\\rbac\\Rule"@@', + 'This will disable two-factor auth. Are you sure?' => '@@Isso desativará a autenticação de dois fatores. Você tem certeza?@@', + 'Two Factor Authentication' => '@@Autenticação de dois fatores@@', + 'Two factor authentication protects you against stolen credentials' => '@@A autenticação de dois fatores protege você contra credenciais roubadas@@', + 'Two factor successfully enabled.' => '@@Dois fatores habilitados com sucesso.@@', + 'Two-Factor Authentication' => '@@Autenticação de dois fatores@@', + 'Two-factor auth protects you against stolen credentials' => '@@Autenticação de dois fatores protege você contra credenciais roubadas@@', + 'Two-factor authentication code' => '@@Código de autenticação de dois fatores@@', + 'Two-factor authorization has been disabled.' => '@@A autorização de dois fatores foi desabilitada.@@', + 'Two-factor code' => '@@Código de dois fatores@@', + 'Unable to disable two-factor authorization.' => '@@Não é possível desabilitar a autorização de dois fatores.@@', + 'We couldn\'t re-send the mail to confirm your address. ' => '@@Não poderíamos re-enviar o correio para confirmar o seu endereço.@@', + 'We have sent confirmation links to both old and new email addresses. ' => '@@Enviamos links de confirmação para endereços de e-mail antigo e novo.@@', ]; diff --git a/src/User/resources/i18n/pt-PT/usuario.php b/src/User/resources/i18n/pt-PT/usuario.php index 8d6ee7d..e8d547f 100644 --- a/src/User/resources/i18n/pt-PT/usuario.php +++ b/src/User/resources/i18n/pt-PT/usuario.php @@ -17,48 +17,6 @@ * 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.', @@ -299,4 +257,46 @@ return [ 'privacy policy' => 'politica de privacidade', '{0, date, MMM dd, YYYY HH:mm}' => '@@@@', '{0} cannot be blank.' => '{0} não pode ficar vazio.', + '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. ' => '@@@@', ]; diff --git a/src/User/resources/i18n/ro/usuario.php b/src/User/resources/i18n/ro/usuario.php index dbb0079..3fff21e 100644 --- a/src/User/resources/i18n/ro/usuario.php +++ b/src/User/resources/i18n/ro/usuario.php @@ -17,32 +17,6 @@ * 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@@', - '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}' => '@@Am agregat prelucrarea datelor mele personale și utilizarea cookie-urilor pentru a facilita funcționarea acestui site. Pentru mai multe informații, citiți {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}' => '@@Am agregat prelucrarea datelor mele personale și utilizarea cookie-urilor pentru a facilita funcționarea acestui site. Pentru mai multe informații, citiți {privacyPolicy}@@', - 'Invalid two-factor code' => '@@Cod de două factori nevalid@@', - 'Last login' => '@@Ultima logare@@', - 'This will disable two-factor auth. Are you sure?' => '@@Aceasta va dezactiva auth-ul cu două factori. Esti sigur?@@', - 'Two Factor Authentication' => '@@Două autentificare cu factori@@', - 'Two factor authentication protects you against stolen credentials' => '@@Autentificarea cu două factori vă protejează împotriva acreditărilor furate@@', - 'Two factor successfully enabled.' => '@@Doi factori activat cu succes.@@', - 'Two-Factor Authentication' => '@@Două factori de autentificare@@', - 'Two-factor auth protects you against stolen credentials' => '@@Autostradă cu două factori vă protejează împotriva acreditărilor furate@@', - 'Two-factor authentication code' => '@@Cod de autentificare cu două factori@@', - 'Two-factor authorization has been disabled.' => '@@A fost dezactivată autorizația cu două factori.@@', - 'Two-factor code' => '@@Cod de două factori@@', - 'Unable to disable two-factor authorization.' => '@@Imposibil de dezactivat autorizația cu două factori.@@', - 'We couldn\'t re-send the mail to confirm your address. ' => '@@Nu am putut retrimite mesajul pentru a vă confirma adresa.@@', - 'We have sent confirmation links to both old and new email addresses. ' => '@@Am trimis legături de confirmare adreselor de e-mail vechi și noi.@@', '(not set)' => '(nu este setat)', 'A confirmation message has been sent to your new email address' => 'Un mesaj de confirmare a fost trimis la noua dvs. adresă de e-mail', 'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => 'A fost trimis un mesaj la adresa dvs. de e-mail. Acesta conține un link de confirmare pe care trebuie să faceți clic pentru a finaliza înregistrarea.', @@ -295,4 +269,30 @@ return [ '{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.', + '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@@', + '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}' => '@@Am agregat prelucrarea datelor mele personale și utilizarea cookie-urilor pentru a facilita funcționarea acestui site. Pentru mai multe informații, citiți {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}' => '@@Am agregat prelucrarea datelor mele personale și utilizarea cookie-urilor pentru a facilita funcționarea acestui site. Pentru mai multe informații, citiți {privacyPolicy}@@', + 'Invalid two-factor code' => '@@Cod de două factori nevalid@@', + 'Last login' => '@@Ultima logare@@', + 'This will disable two-factor auth. Are you sure?' => '@@Aceasta va dezactiva auth-ul cu două factori. Esti sigur?@@', + 'Two Factor Authentication' => '@@Două autentificare cu factori@@', + 'Two factor authentication protects you against stolen credentials' => '@@Autentificarea cu două factori vă protejează împotriva acreditărilor furate@@', + 'Two factor successfully enabled.' => '@@Doi factori activat cu succes.@@', + 'Two-Factor Authentication' => '@@Două factori de autentificare@@', + 'Two-factor auth protects you against stolen credentials' => '@@Autostradă cu două factori vă protejează împotriva acreditărilor furate@@', + 'Two-factor authentication code' => '@@Cod de autentificare cu două factori@@', + 'Two-factor authorization has been disabled.' => '@@A fost dezactivată autorizația cu două factori.@@', + 'Two-factor code' => '@@Cod de două factori@@', + 'Unable to disable two-factor authorization.' => '@@Imposibil de dezactivat autorizația cu două factori.@@', + 'We couldn\'t re-send the mail to confirm your address. ' => '@@Nu am putut retrimite mesajul pentru a vă confirma adresa.@@', + 'We have sent confirmation links to both old and new email addresses. ' => '@@Am trimis legături de confirmare adreselor de e-mail vechi și noi.@@', ]; diff --git a/src/User/resources/i18n/ru/usuario.php b/src/User/resources/i18n/ru/usuario.php index edfccac..e3a7d7d 100644 --- a/src/User/resources/i18n/ru/usuario.php +++ b/src/User/resources/i18n/ru/usuario.php @@ -17,30 +17,6 @@ * NOTE: this file must be saved in UTF-8 encoding. */ return [ - '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' => '@@Отключить двухфакторную авторизацию@@', - '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}' => '@@@@', - 'Invalid two-factor code' => '@@Неверный код двухфакторной авторизации@@', - 'Last login' => '@@Последний вход@@', - 'Registration ip' => '@@IP при регистрации@@', - 'Rule class can not be instantiated' => '@@Класс правила не может быть создан@@', - 'Rule class must extend "yii\\rbac\\Rule"' => '@@Класс правила должен наследоваться от "yii\\rbac\\Rule"@@', - 'This will disable two-factor auth. Are you sure?' => '@@Вы уверены, что хотите отключить двухфакторную авторизацию?@@', - 'Two Factor Authentication' => '@@Двухфакторная авторизация@@', - 'Two factor authentication protects you against stolen credentials' => '@@Двухфакторная авторизация защитит вас от кражи параметров доступа@@', - '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)' => '(не задано)', 'A confirmation message has been sent to your new email address' => 'На указанный адрес было отправлено письмо с дальнейшими инструкциями', 'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => 'На вашу электронную почту было отправлено сообщение со ссылкой подтверждения регистрации.', @@ -297,4 +273,28 @@ return [ '{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} не может быть пустым.', + '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' => '@@Отключить двухфакторную авторизацию@@', + '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}' => '@@@@', + 'Invalid two-factor code' => '@@Неверный код двухфакторной авторизации@@', + 'Last login' => '@@Последний вход@@', + 'Registration ip' => '@@IP при регистрации@@', + 'Rule class can not be instantiated' => '@@Класс правила не может быть создан@@', + 'Rule class must extend "yii\\rbac\\Rule"' => '@@Класс правила должен наследоваться от "yii\\rbac\\Rule"@@', + 'This will disable two-factor auth. Are you sure?' => '@@Вы уверены, что хотите отключить двухфакторную авторизацию?@@', + 'Two Factor Authentication' => '@@Двухфакторная авторизация@@', + 'Two factor authentication protects you against stolen credentials' => '@@Двухфакторная авторизация защитит вас от кражи параметров доступа@@', + '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. ' => '@@Мы отправили письма на ваш старый и новый почтовые ящики. Вы должны перейти по обеим, чтобы завершить процесс смены адреса.@@', ]; diff --git a/src/User/resources/i18n/th/usuario.php b/src/User/resources/i18n/th/usuario.php index 1718269..62ade06 100644 --- a/src/User/resources/i18n/th/usuario.php +++ b/src/User/resources/i18n/th/usuario.php @@ -17,6 +17,7 @@ * NOTE: this file must be saved in UTF-8 encoding. */ return [ + '{0, date, MMM dd, YYYY HH:mm}' => '@@@@', '(not set)' => '', 'A confirmation message has been sent to your new email address' => '', 'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => '', @@ -298,5 +299,4 @@ return [ '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}' => '@@@@', ]; diff --git a/src/User/resources/i18n/tr-TR/usuario.php b/src/User/resources/i18n/tr-TR/usuario.php index 1718269..62ade06 100644 --- a/src/User/resources/i18n/tr-TR/usuario.php +++ b/src/User/resources/i18n/tr-TR/usuario.php @@ -17,6 +17,7 @@ * NOTE: this file must be saved in UTF-8 encoding. */ return [ + '{0, date, MMM dd, YYYY HH:mm}' => '@@@@', '(not set)' => '', 'A confirmation message has been sent to your new email address' => '', 'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => '', @@ -298,5 +299,4 @@ return [ '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}' => '@@@@', ]; diff --git a/src/User/resources/i18n/uk/usuario.php b/src/User/resources/i18n/uk/usuario.php index 1718269..62ade06 100644 --- a/src/User/resources/i18n/uk/usuario.php +++ b/src/User/resources/i18n/uk/usuario.php @@ -17,6 +17,7 @@ * NOTE: this file must be saved in UTF-8 encoding. */ return [ + '{0, date, MMM dd, YYYY HH:mm}' => '@@@@', '(not set)' => '', 'A confirmation message has been sent to your new email address' => '', 'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => '', @@ -298,5 +299,4 @@ return [ '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}' => '@@@@', ]; diff --git a/src/User/resources/i18n/vi/usuario.php b/src/User/resources/i18n/vi/usuario.php index 1718269..62ade06 100644 --- a/src/User/resources/i18n/vi/usuario.php +++ b/src/User/resources/i18n/vi/usuario.php @@ -17,6 +17,7 @@ * NOTE: this file must be saved in UTF-8 encoding. */ return [ + '{0, date, MMM dd, YYYY HH:mm}' => '@@@@', '(not set)' => '', 'A confirmation message has been sent to your new email address' => '', 'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => '', @@ -298,5 +299,4 @@ return [ '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}' => '@@@@', ]; diff --git a/src/User/resources/i18n/zh-CN/usuario.php b/src/User/resources/i18n/zh-CN/usuario.php index 1718269..62ade06 100644 --- a/src/User/resources/i18n/zh-CN/usuario.php +++ b/src/User/resources/i18n/zh-CN/usuario.php @@ -17,6 +17,7 @@ * NOTE: this file must be saved in UTF-8 encoding. */ return [ + '{0, date, MMM dd, YYYY HH:mm}' => '@@@@', '(not set)' => '', 'A confirmation message has been sent to your new email address' => '', 'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => '', @@ -298,5 +299,4 @@ return [ '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}' => '@@@@', ]; From 0cba8f1786803d0f3a5f70330fc1f56e79280615 Mon Sep 17 00:00:00 2001 From: tsdogs Date: Tue, 4 Jun 2019 14:17:21 +0200 Subject: [PATCH 27/51] As pointed out it's require and not add --- docs/installation/migration-guide-from-dektrium-tools.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/installation/migration-guide-from-dektrium-tools.md b/docs/installation/migration-guide-from-dektrium-tools.md index aef1a61..8183143 100644 --- a/docs/installation/migration-guide-from-dektrium-tools.md +++ b/docs/installation/migration-guide-from-dektrium-tools.md @@ -13,7 +13,7 @@ composer remove dektrium/yii2-rbac ## Install yii2-usuario ``` -composer add 2amigos/yii2-usuario +composer require 2amigos/yii2-usuario ``` ## Configuration From 12378e6fe79ca0ff1892857f091db7ff819c2a3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Bo=CC=88hnke?= Date: Sat, 15 Jun 2019 18:18:55 +0200 Subject: [PATCH 28/51] change google OAuth response --- src/User/AuthClient/Google.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/User/AuthClient/Google.php b/src/User/AuthClient/Google.php index 4f04e01..a725978 100644 --- a/src/User/AuthClient/Google.php +++ b/src/User/AuthClient/Google.php @@ -21,9 +21,14 @@ class Google extends BaseGoogle implements AuthClientInterface */ public function getEmail() { - return isset($this->getUserAttributes()['emails'][0]['value']) - ? $this->getUserAttributes()['emails'][0]['value'] - : null; + $userAttributes = $this->getUserAttributes(); + if (isset($userAttributes['emails']) && isset($userAttributes['emails'][0]['value'])) { + return $userAttributes['emails'][0]['value']; + } elseif (isset($userAttributes['email'])) { + return $userAttributes['email']; + } + + return null; } /** From 2ef931d52e4258a5bed686ad6c279540b160b9ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Bo=CC=88hnke?= Date: Sun, 16 Jun 2019 12:24:28 +0200 Subject: [PATCH 29/51] add changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 71786f3..30aebc7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # CHANGELOG - Fix #307: Fix French translation (arollmann) + - Fix #316: Fix New Response from Google OAuth Api ## 1.5.0 April 19, 2019 - Fix: Fix condition in EmailChangeService (it was always false) (borisaeric) From 7bf7db6e5fb09e172b3900ac8a995655a2f41837 Mon Sep 17 00:00:00 2001 From: tonydspaniard Date: Sun, 16 Jun 2019 13:22:54 +0200 Subject: [PATCH 30/51] re #318 slight modification to the code provided by @Julian-B90 --- src/User/AuthClient/Google.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/User/AuthClient/Google.php b/src/User/AuthClient/Google.php index a725978..42c2495 100644 --- a/src/User/AuthClient/Google.php +++ b/src/User/AuthClient/Google.php @@ -22,9 +22,12 @@ class Google extends BaseGoogle implements AuthClientInterface public function getEmail() { $userAttributes = $this->getUserAttributes(); - if (isset($userAttributes['emails']) && isset($userAttributes['emails'][0]['value'])) { + + if (isset($userAttributes['emails'][0]['value'])) { return $userAttributes['emails'][0]['value']; - } elseif (isset($userAttributes['email'])) { + } + + if (isset($userAttributes['email'])) { return $userAttributes['email']; } From f5a13b9ae7be01263e45c4690f0cc1b224f65256 Mon Sep 17 00:00:00 2001 From: tonydspaniard Date: Mon, 17 Jun 2019 17:30:03 +0200 Subject: [PATCH 31/51] re #309 update docs --- docs/contributing/clean-code.md | 2 +- docs/contributing/how-to.md | 2 +- .../how-to-enhance-a-user-model.md | 2 +- .../overriding-classes.md | 2 +- .../overriding-controllers.md | 2 +- .../overriding-views.md | 2 +- docs/events/form-events.md | 2 +- docs/events/mail-events.md | 2 +- docs/events/reset-password-events.md | 2 +- docs/events/social-network-auth-events.md | 2 +- docs/events/social-network-connect-events.md | 22 +++++++++++++++++-- docs/events/user-events.md | 2 +- .../how-to-add-captcha-widget.md | 2 +- .../how-to-implement-two-factor-auth.md | 2 +- .../helpful-guides/how-to-swith-identities.md | 2 +- .../how-to-use-recaptcha-widget.md | 2 +- .../separate-frontend-and-backend-sessions.md | 2 +- .../social-network-authentication.md | 2 +- .../advanced-application-template.md | 2 +- docs/installation/available-actions.md | 2 +- docs/installation/configuration-options.md | 2 +- docs/installation/console-commands.md | 2 +- docs/installation/mailer.md | 2 +- docs/installation/rbac.md | 2 +- .../installation/yii2-application-template.md | 2 +- 25 files changed, 44 insertions(+), 26 deletions(-) diff --git a/docs/contributing/clean-code.md b/docs/contributing/clean-code.md index d052104..c05a6d2 100644 --- a/docs/contributing/clean-code.md +++ b/docs/contributing/clean-code.md @@ -57,4 +57,4 @@ We are using `Codeception` for testing the module. To run tests do the following We still need to add `unit` tests to the module. Feel free to add your tests to it as long as it makes use of `Codeception`. -© [2amigos](http://www.2amigos.us/) 2013-2017 +© [2amigos](http://www.2amigos.us/) 2013-2019 diff --git a/docs/contributing/how-to.md b/docs/contributing/how-to.md index 4205156..2538e14 100644 --- a/docs/contributing/how-to.md +++ b/docs/contributing/how-to.md @@ -29,4 +29,4 @@ All contributions should follow our [templates guidelines](https://github.com/2a - Follow the guidelines at [Clean Code](clean-code.md) -© [2amigos](http://www.2amigos.us/) 2013-2017 +© [2amigos](http://www.2amigos.us/) 2013-2019 diff --git a/docs/enhancing-and-overriding/how-to-enhance-a-user-model.md b/docs/enhancing-and-overriding/how-to-enhance-a-user-model.md index f316a3e..bf7cc78 100644 --- a/docs/enhancing-and-overriding/how-to-enhance-a-user-model.md +++ b/docs/enhancing-and-overriding/how-to-enhance-a-user-model.md @@ -74,4 +74,4 @@ class ProfileController extends Controller > This is absolutely good way to extend almost any class of the extension. For more information you could > check `Da\User\Bootstrap` class file to see what you have in your control. -© [2amigos](http://www.2amigos.us/) 2013-2017 +© [2amigos](http://www.2amigos.us/) 2013-2019 diff --git a/docs/enhancing-and-overriding/overriding-classes.md b/docs/enhancing-and-overriding/overriding-classes.md index 118635f..1a1d307 100644 --- a/docs/enhancing-and-overriding/overriding-classes.md +++ b/docs/enhancing-and-overriding/overriding-classes.md @@ -106,4 +106,4 @@ The definition can be any of the following (from Yii2's DI container): > See [how to enhance a User model](how-to-enhance-a-user-model.md) guide to see a practical example. -© [2amigos](http://www.2amigos.us/) 2013-2017 +© [2amigos](http://www.2amigos.us/) 2013-2019 diff --git a/docs/enhancing-and-overriding/overriding-controllers.md b/docs/enhancing-and-overriding/overriding-controllers.md index 7dfc8f6..9f34ca9 100644 --- a/docs/enhancing-and-overriding/overriding-controllers.md +++ b/docs/enhancing-and-overriding/overriding-controllers.md @@ -77,6 +77,6 @@ Now, the only thing that is missing is to add your brand new controller to the m ] ``` -© [2amigos](http://www.2amigos.us/) 2013-2017 +© [2amigos](http://www.2amigos.us/) 2013-2019 diff --git a/docs/enhancing-and-overriding/overriding-views.md b/docs/enhancing-and-overriding/overriding-views.md index fb9c216..0ee1291 100644 --- a/docs/enhancing-and-overriding/overriding-views.md +++ b/docs/enhancing-and-overriding/overriding-views.md @@ -54,4 +54,4 @@ There is another way, and is by setting the `viewPath` attribute of the module: But it will force you to override **ALL** views from the module. The recommended way is throughout the `theme` property of `view` component as previously mentioned. -© [2amigos](http://www.2amigos.us/) 2013-2017 +© [2amigos](http://www.2amigos.us/) 2013-2019 diff --git a/docs/events/form-events.md b/docs/events/form-events.md index b244381..5de7b94 100644 --- a/docs/events/form-events.md +++ b/docs/events/form-events.md @@ -83,5 +83,5 @@ $application->run(); ``` -© [2amigos](http://www.2amigos.us/) 2013-2017 +© [2amigos](http://www.2amigos.us/) 2013-2019 diff --git a/docs/events/mail-events.md b/docs/events/mail-events.md index b6efa03..d203e29 100644 --- a/docs/events/mail-events.md +++ b/docs/events/mail-events.md @@ -98,4 +98,4 @@ $application->run(); ``` -© [2amigos](http://www.2amigos.us/) 2013-2017 +© [2amigos](http://www.2amigos.us/) 2013-2019 diff --git a/docs/events/reset-password-events.md b/docs/events/reset-password-events.md index 0d9fdb6..c2c2cac 100644 --- a/docs/events/reset-password-events.md +++ b/docs/events/reset-password-events.md @@ -53,4 +53,4 @@ Event::on( ``` -© [2amigos](http://www.2amigos.us/) 2013-2017 +© [2amigos](http://www.2amigos.us/) 2013-2019 diff --git a/docs/events/social-network-auth-events.md b/docs/events/social-network-auth-events.md index b02a175..e7ec97a 100644 --- a/docs/events/social-network-auth-events.md +++ b/docs/events/social-network-auth-events.md @@ -45,4 +45,4 @@ Event::on( > [guide](../helpful-guides/social-network-authentication.md) -© [2amigos](http://www.2amigos.us/) 2013-2017 +© [2amigos](http://www.2amigos.us/) 2013-2019 diff --git a/docs/events/social-network-connect-events.md b/docs/events/social-network-connect-events.md index 3b4d63c..a418975 100644 --- a/docs/events/social-network-connect-events.md +++ b/docs/events/social-network-connect-events.md @@ -28,9 +28,13 @@ This event when triggered will contain a `Da\User\Model\User` model instance and // events.php file use Da\User\Controller\RegistrationController; +use Da\User\Controller\SecurityController; use Da\User\Event\SocialNetworkConnectEvent; +use Da\User\Event\SocialNetworkAuthEvent; use yii\base\Event; +// on RegistrationController + Event::on( RegistrationController::class, SocialNetworkConnectEvent::EVENT_BEFORE_CONNECT, @@ -42,6 +46,20 @@ Event::on( // ... your logic here }); -``` +// on SecurityController -© [2amigos](http://www.2amigos.us/) 2013-2017 +Event::on( + SecurityController::class, + SocialNetworkAuthEvent::EVENT_BEFORE_AUTHENTICATE, + function (SocialNetworkAuthEvent $event) { + + $client = $event->getClient(); + $account = $event->getAccount(); // $account is a Da\User\Model\SocialNetworkAccount + + // ... your logic here + }); + +``` + + +© [2amigos](http://www.2amigos.us/) 2013-2019 diff --git a/docs/events/user-events.md b/docs/events/user-events.md index 0ceaf56..d6c104f 100644 --- a/docs/events/user-events.md +++ b/docs/events/user-events.md @@ -117,4 +117,4 @@ $application->run(); ``` -© [2amigos](http://www.2amigos.us/) 2013-2017 +© [2amigos](http://www.2amigos.us/) 2013-2019 diff --git a/docs/helpful-guides/how-to-add-captcha-widget.md b/docs/helpful-guides/how-to-add-captcha-widget.md index 3bbefbc..a43c094 100644 --- a/docs/helpful-guides/how-to-add-captcha-widget.md +++ b/docs/helpful-guides/how-to-add-captcha-widget.md @@ -147,4 +147,4 @@ Finally, we have to configure the module and the application to ensure is using ``` -© [2amigos](http://www.2amigos.us/) 2013-2017 +© [2amigos](http://www.2amigos.us/) 2013-2019 diff --git a/docs/helpful-guides/how-to-implement-two-factor-auth.md b/docs/helpful-guides/how-to-implement-two-factor-auth.md index ac508f3..e59a25c 100644 --- a/docs/helpful-guides/how-to-implement-two-factor-auth.md +++ b/docs/helpful-guides/how-to-implement-two-factor-auth.md @@ -51,4 +51,4 @@ process. - [2amigos Two Factor Library Docs]()http://2fa-library.readthedocs.io/en/latest/) -© [2amigos](http://www.2amigos.us/) 2013-2017 +© [2amigos](http://www.2amigos.us/) 2013-2019 diff --git a/docs/helpful-guides/how-to-swith-identities.md b/docs/helpful-guides/how-to-swith-identities.md index 378c0c5..7431917 100644 --- a/docs/helpful-guides/how-to-swith-identities.md +++ b/docs/helpful-guides/how-to-swith-identities.md @@ -58,4 +58,4 @@ if(Yii::$app->session->has($module->switchIdentitySessionKey)) { Check the [switchIdentitySessionKey](../installation/configuration-options.md#switchidentitysessionkey) documentation for further information regarding this configuration option. -© [2amigos](http://www.2amigos.us/) 2013-2017 +© [2amigos](http://www.2amigos.us/) 2013-2019 diff --git a/docs/helpful-guides/how-to-use-recaptcha-widget.md b/docs/helpful-guides/how-to-use-recaptcha-widget.md index 2bb9dd3..4003d45 100644 --- a/docs/helpful-guides/how-to-use-recaptcha-widget.md +++ b/docs/helpful-guides/how-to-use-recaptcha-widget.md @@ -139,4 +139,4 @@ Finally, we have to configure the module and the application to ensure is using ``` -© [2amigos](http://www.2amigos.us/) 2013-2017 +© [2amigos](http://www.2amigos.us/) 2013-2019 diff --git a/docs/helpful-guides/separate-frontend-and-backend-sessions.md b/docs/helpful-guides/separate-frontend-and-backend-sessions.md index e6d246d..e89131b 100644 --- a/docs/helpful-guides/separate-frontend-and-backend-sessions.md +++ b/docs/helpful-guides/separate-frontend-and-backend-sessions.md @@ -4,4 +4,4 @@ Separate Frontend and Backend Sessions - TODO -© [2amigos](http://www.2amigos.us/) 2013-2017 +© [2amigos](http://www.2amigos.us/) 2013-2019 diff --git a/docs/helpful-guides/social-network-authentication.md b/docs/helpful-guides/social-network-authentication.md index 8a9552a..b8d927a 100644 --- a/docs/helpful-guides/social-network-authentication.md +++ b/docs/helpful-guides/social-network-authentication.md @@ -55,4 +55,4 @@ For further information about how to configure the clients, please visit the [Official Yii Auth Client Extension documentation](https://github.com/yiisoft/yii2-authclient/blob/master/docs/guide/installation.md). -© [2amigos](http://www.2amigos.us/) 2013-2017 +© [2amigos](http://www.2amigos.us/) 2013-2019 diff --git a/docs/installation/advanced-application-template.md b/docs/installation/advanced-application-template.md index 68c44e5..0abc838 100644 --- a/docs/installation/advanced-application-template.md +++ b/docs/installation/advanced-application-template.md @@ -96,4 +96,4 @@ is very convenient way to track new migration classes coming from this and possi > installation version. -© [2amigos](http://www.2amigos.us/) 2013-2017 +© [2amigos](http://www.2amigos.us/) 2013-2019 diff --git a/docs/installation/available-actions.md b/docs/installation/available-actions.md index 8fe7408..dfad23f 100644 --- a/docs/installation/available-actions.md +++ b/docs/installation/available-actions.md @@ -79,4 +79,4 @@ So they become: You can override them by setting the module's routes to an empty array. Then, configure the routes as you please. -© [2amigos](http://www.2amigos.us/) 2013-2017 +© [2amigos](http://www.2amigos.us/) 2013-2019 diff --git a/docs/installation/configuration-options.md b/docs/installation/configuration-options.md index 1ff98c7..1f5148c 100644 --- a/docs/installation/configuration-options.md +++ b/docs/installation/configuration-options.md @@ -201,4 +201,4 @@ Configures the name of the session key that will be used to hold the original ad -© [2amigos](http://www.2amigos.us/) 2013-2017 +© [2amigos](http://www.2amigos.us/) 2013-2019 diff --git a/docs/installation/console-commands.md b/docs/installation/console-commands.md index 5eac170..952f302 100644 --- a/docs/installation/console-commands.md +++ b/docs/installation/console-commands.md @@ -60,4 +60,4 @@ You can update a user's password whether by using its email or username. ``` -© [2amigos](http://www.2amigos.us/) 2013-2017 +© [2amigos](http://www.2amigos.us/) 2013-2019 diff --git a/docs/installation/mailer.md b/docs/installation/mailer.md index dd91bb3..9a4a73d 100644 --- a/docs/installation/mailer.md +++ b/docs/installation/mailer.md @@ -102,4 +102,4 @@ public function run() ``` -© [2amigos](http://www.2amigos.us/) 2013-2017 +© [2amigos](http://www.2amigos.us/) 2013-2019 diff --git a/docs/installation/rbac.md b/docs/installation/rbac.md index 6a29b3c..c0b76c4 100644 --- a/docs/installation/rbac.md +++ b/docs/installation/rbac.md @@ -67,4 +67,4 @@ class AdminController extends Controller ``` -© [2amigos](http://www.2amigos.us/) 2013-2017 +© [2amigos](http://www.2amigos.us/) 2013-2019 diff --git a/docs/installation/yii2-application-template.md b/docs/installation/yii2-application-template.md index 1b9a581..9f0dc3c 100644 --- a/docs/installation/yii2-application-template.md +++ b/docs/installation/yii2-application-template.md @@ -85,6 +85,6 @@ is very convenient way to track new migration classes coming from this and possi > Namespaced migrations were introduced in Yii 2.0.10, so before using them consider updating your framework > installation version. -© [2amigos](http://www.2amigos.us/) 2013-2017 +© [2amigos](http://www.2amigos.us/) 2013-2019 From 222483253c11ef652620f6e0bf77f6cd1a28771b Mon Sep 17 00:00:00 2001 From: tonydspaniard Date: Mon, 17 Jun 2019 17:31:10 +0200 Subject: [PATCH 32/51] re #309 added roave security advisories package --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index efca136..f6b8c45 100644 --- a/composer.json +++ b/composer.json @@ -57,7 +57,8 @@ "phpmd/phpmd": "@stable", "codeception/specify": "^0.4.3", "codeception/verify": "^0.3.1", - "codeception/codeception": "*" + "codeception/codeception": "*", + "roave/security-advisories": "dev-master" }, "autoload": { "psr-4": { From dd407f50b482b472f290fdff741b85e8b52bacce Mon Sep 17 00:00:00 2001 From: tonydspaniard Date: Mon, 17 Jun 2019 17:35:22 +0200 Subject: [PATCH 33/51] re #309 remove the creation of a user on social auth and force creation of account through RegistrationController --- src/User/Bootstrap.php | 11 +++---- .../SocialNetworkAuthenticateService.php | 31 ++----------------- .../resources/views/registration/register.php | 2 +- 3 files changed, 8 insertions(+), 36 deletions(-) diff --git a/src/User/Bootstrap.php b/src/User/Bootstrap.php index 90ca741..5a22a9c 100644 --- a/src/User/Bootstrap.php +++ b/src/User/Bootstrap.php @@ -13,22 +13,21 @@ namespace Da\User; use Da\User\Component\AuthDbManagerComponent; use Da\User\Contracts\AuthManagerInterface; +use Da\User\Controller\SecurityController; +use Da\User\Event\FormEvent; use Da\User\Helper\ClassMapHelper; use Da\User\Model\User; use Yii; use yii\authclient\Collection; use yii\base\Application; use yii\base\BootstrapInterface; +use yii\base\Event as YiiEvent; use yii\base\Exception; use yii\base\InvalidConfigException; use yii\console\Application as ConsoleApplication; use yii\i18n\PhpMessageSource; use yii\web\Application as WebApplication; -use yii\base\Event as YiiEvent; -use Da\User\Event\FormEvent; -use Da\User\Controller\SecurityController; - /** * Bootstrap class of the yii2-usuario extension. Configures container services, initializes translations, * builds class map, and does the other setup actions participating in the application bootstrap process. @@ -127,7 +126,7 @@ class Bootstrap implements BootstrapInterface foreach ($map as $class => $definition) { $di->set($class, $definition); $model = is_array($definition) ? $definition['class'] : $definition; - $name = (substr($class, strrpos($class, '\\') + 1)); + $name = substr($class, strrpos($class, '\\') + 1); $modelClassMap[$class] = $model; if (in_array($name, ['User', 'Profile', 'Token', 'SocialNetworkAccount'])) { $di->set( @@ -152,7 +151,7 @@ class Bootstrap implements BootstrapInterface } // Attach an event to check if the password has expired - if (!is_null(Yii::$app->getModule('user')->maxPasswordAge)) { + if (null !== Yii::$app->getModule('user')->maxPasswordAge) { YiiEvent::on(SecurityController::class, FormEvent::EVENT_AFTER_LOGIN, function (FormEvent $event) { $user = $event->form->user; if ($user->password_age >= Yii::$app->getModule('user')->maxPasswordAge) { diff --git a/src/User/Service/SocialNetworkAuthenticateService.php b/src/User/Service/SocialNetworkAuthenticateService.php index 1e621f9..e1ec09d 100644 --- a/src/User/Service/SocialNetworkAuthenticateService.php +++ b/src/User/Service/SocialNetworkAuthenticateService.php @@ -104,40 +104,13 @@ class SocialNetworkAuthenticateService implements ServiceInterface if (($user = $this->getUser($account)) instanceof User) { $account->user_id = $user->id; $account->save(false); - - return $account; } - return false; + return $account; } protected function getUser(SocialNetworkAccount $account) { - $user = $this->userQuery->whereEmail($account->email)->one(); - if (null !== $user) { - return $user; - } - /** @var User $user */ - $user = $this->controller->make( - User::class, - [], - [ - 'scenario' => 'connect', - 'username' => $account->username, - 'email' => $account->email, - ] - ); - - if (!$user->validate(['email'])) { - $user->email = null; - } - - if (!$user->validate(['username'])) { - $user->username = null; - } - - $mailService = MailFactory::makeWelcomeMailerService($user); - - return $this->controller->make(UserCreateService::class, [$user, $mailService])->run() ? $user : false; + return $this->userQuery->whereEmail($account->email)->one(); } } diff --git a/src/User/resources/views/registration/register.php b/src/User/resources/views/registration/register.php index 9e5dab1..29d1e75 100644 --- a/src/User/resources/views/registration/register.php +++ b/src/User/resources/views/registration/register.php @@ -41,7 +41,7 @@ $this->params['breadcrumbs'][] = $this->title; field($model, 'username') ?> - generatePasswords == false): ?> + generatePasswords === false): ?> field($model, 'password')->passwordInput() ?> From 4417f17c7fbaa67ed5ec8eee7123d8ba87ab5baf Mon Sep 17 00:00:00 2001 From: tsdogs Date: Mon, 24 Jun 2019 22:04:49 +0200 Subject: [PATCH 34/51] First try to fix boolean defaultValue #314 --- src/User/Helper/MigrationHelper.php | 14 ++++++++++++++ .../m000000_000006_add_two_factor_fields.php | 3 ++- .../m000000_000009_add_gdpr_consent_fields.php | 5 +++-- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/User/Helper/MigrationHelper.php b/src/User/Helper/MigrationHelper.php index 7de2c41..2f6046b 100644 --- a/src/User/Helper/MigrationHelper.php +++ b/src/User/Helper/MigrationHelper.php @@ -71,4 +71,18 @@ class MigrationHelper { return self::resolveDbType($driverName) === 'sqlsrv'; } + + public static function getBooleanValue($driverName,$value=false) + { + switch (self::resolveDbType($driverName)) { + case 'sqlsrv': + return $value?1:0; + break; + case 'pgsql': + return $value?true:false; + break; + default: + return $value; + } + } } diff --git a/src/User/Migration/m000000_000006_add_two_factor_fields.php b/src/User/Migration/m000000_000006_add_two_factor_fields.php index 2da4dc7..4227069 100644 --- a/src/User/Migration/m000000_000006_add_two_factor_fields.php +++ b/src/User/Migration/m000000_000006_add_two_factor_fields.php @@ -12,13 +12,14 @@ namespace Da\User\Migration; use yii\db\Migration; +use Da\User\Helper\MigrationHelper; class m000000_000006_add_two_factor_fields extends Migration { public function safeUp() { $this->addColumn('{{%user}}', 'auth_tf_key', $this->string(16)); - $this->addColumn('{{%user}}', 'auth_tf_enabled', $this->boolean()->defaultValue(0)); + $this->addColumn('{{%user}}', 'auth_tf_enabled', $this->boolean()->defaultValue(MigrationHelper::getBooleanValue($this->db->driverName,false))); } public function safeDown() diff --git a/src/User/Migration/m000000_000009_add_gdpr_consent_fields.php b/src/User/Migration/m000000_000009_add_gdpr_consent_fields.php index 2cf6907..32c4c02 100644 --- a/src/User/Migration/m000000_000009_add_gdpr_consent_fields.php +++ b/src/User/Migration/m000000_000009_add_gdpr_consent_fields.php @@ -12,14 +12,15 @@ namespace Da\User\Migration; use yii\db\Migration; +use Da\User\Helper\MigrationHelper; class m000000_000009_add_gdpr_consent_fields extends Migration { public function safeUp() { - $this->addColumn('{{%user}}', 'gdpr_consent', $this->boolean()->defaultValue(false)); + $this->addColumn('{{%user}}', 'gdpr_consent', $this->boolean()->defaultValue(MigrationHelper::getBooleanValue($this->db->driverName,false))); $this->addColumn('{{%user}}', 'gdpr_consent_date', $this->integer(11)->null()); - $this->addColumn('{{%user}}', 'gdpr_deleted', $this->boolean()->defaultValue(false)); + $this->addColumn('{{%user}}', 'gdpr_deleted', $this->boolean()->defaultValue(MigrationHelper::getBooleanValue($this->db->driverName,false))); } public function safeDown() From e5267510b0d0d4170be662990449d36bbd426f47 Mon Sep 17 00:00:00 2001 From: tonydspaniard Date: Wed, 26 Jun 2019 09:15:38 +0200 Subject: [PATCH 35/51] close #321 fix linked in response --- CHANGELOG.md | 3 ++- src/User/AuthClient/LinkedIn.php | 14 +++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 30aebc7..f27562f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # CHANGELOG - Fix #307: Fix French translation (arollmann) - - Fix #316: Fix New Response from Google OAuth Api + - Fix #316: Fix new response from Google OAuth Api (Julian-B90) + - Fix #321: Fix new response from LinkedIn OAuth Api (tonydspaniard) ## 1.5.0 April 19, 2019 - Fix: Fix condition in EmailChangeService (it was always false) (borisaeric) diff --git a/src/User/AuthClient/LinkedIn.php b/src/User/AuthClient/LinkedIn.php index b99aa5b..b0fc422 100644 --- a/src/User/AuthClient/LinkedIn.php +++ b/src/User/AuthClient/LinkedIn.php @@ -21,9 +21,17 @@ class LinkedIn extends BaseLinkedIn implements AuthClientInterface */ public function getEmail() { - return isset($this->getUserAttributes()['email-address']) - ? $this->getUserAttributes()['email-address'] - : null; + $userAttributes = $this->getUserAttributes(); + + if (isset($userAttributes['email-address'])) { + return $userAttributes['email-address']; + } + + if (isset($userAttributes['email'])) { + return $userAttributes['email']; + } + + return null; } /** From c963b9461f61f8123d86d0fb447f71509bed3221 Mon Sep 17 00:00:00 2001 From: Antonio Ramirez Date: Fri, 28 Jun 2019 20:52:09 +0200 Subject: [PATCH 36/51] Update MigrationHelper.php --- src/User/Helper/MigrationHelper.php | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/User/Helper/MigrationHelper.php b/src/User/Helper/MigrationHelper.php index 2f6046b..ae0b92d 100644 --- a/src/User/Helper/MigrationHelper.php +++ b/src/User/Helper/MigrationHelper.php @@ -74,15 +74,9 @@ class MigrationHelper public static function getBooleanValue($driverName,$value=false) { - switch (self::resolveDbType($driverName)) { - case 'sqlsrv': - return $value?1:0; - break; - case 'pgsql': - return $value?true:false; - break; - default: - return $value; + if(self::isMicrosoftSQLServer($driverName)) { + return $value? 1: 0; } + return $value; } } From 019660d4f65bfa0e0766afd94f60614dbad88384 Mon Sep 17 00:00:00 2001 From: tonydspaniard Date: Fri, 28 Jun 2019 21:21:26 +0200 Subject: [PATCH 37/51] re #314 add credits to @tsdogs for its work --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f27562f..769d2d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ - Fix #307: Fix French translation (arollmann) - Fix #316: Fix new response from Google OAuth Api (Julian-B90) - Fix #321: Fix new response from LinkedIn OAuth Api (tonydspaniard) + - Fix #322: Fix boolean values in migrations for SQL server (tsdogs) ## 1.5.0 April 19, 2019 - Fix: Fix condition in EmailChangeService (it was always false) (borisaeric) From fc326d0a61d4a9cd7da2ff2b70d23d2333b7e6eb Mon Sep 17 00:00:00 2001 From: tonydspaniard Date: Fri, 28 Jun 2019 23:45:49 +0200 Subject: [PATCH 38/51] close #326 fix rule for the user auth_tf_enabled field --- .../Migration/m000000_000006_add_two_factor_fields.php | 8 ++++++-- src/User/Model/User.php | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/User/Migration/m000000_000006_add_two_factor_fields.php b/src/User/Migration/m000000_000006_add_two_factor_fields.php index 4227069..1aa13ed 100644 --- a/src/User/Migration/m000000_000006_add_two_factor_fields.php +++ b/src/User/Migration/m000000_000006_add_two_factor_fields.php @@ -11,15 +11,19 @@ namespace Da\User\Migration; -use yii\db\Migration; use Da\User\Helper\MigrationHelper; +use yii\db\Migration; class m000000_000006_add_two_factor_fields extends Migration { public function safeUp() { $this->addColumn('{{%user}}', 'auth_tf_key', $this->string(16)); - $this->addColumn('{{%user}}', 'auth_tf_enabled', $this->boolean()->defaultValue(MigrationHelper::getBooleanValue($this->db->driverName,false))); + $this->addColumn( + '{{%user}}', + 'auth_tf_enabled', + $this->boolean()->defaultValue(MigrationHelper::getBooleanValue($this->db->driverName)) + ); } public function safeDown() diff --git a/src/User/Model/User.php b/src/User/Model/User.php index c029708..0581719 100644 --- a/src/User/Model/User.php +++ b/src/User/Model/User.php @@ -248,7 +248,7 @@ class User extends ActiveRecord implements IdentityInterface // two factor auth rules 'twoFactorSecretTrim' => ['auth_tf_key', 'trim'], 'twoFactorSecretLength' => ['auth_tf_key', 'string', 'max' => 16], - 'twoFactorEnabledNumber' => ['auth_tf_enabled', 'integer'] + 'twoFactorEnabledNumber' => ['auth_tf_enabled', 'boolean'] ]; } From 94dab4b28b299ae58fec6f8c1b7e2558077b3498 Mon Sep 17 00:00:00 2001 From: tonydspaniard Date: Fri, 28 Jun 2019 23:49:06 +0200 Subject: [PATCH 39/51] close #325 added support for sqlite3 + give credits to @santilin --- CHANGELOG.md | 2 ++ src/User/Helper/MigrationHelper.php | 15 +++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 769d2d8..21178ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ - Fix #316: Fix new response from Google OAuth Api (Julian-B90) - Fix #321: Fix new response from LinkedIn OAuth Api (tonydspaniard) - Fix #322: Fix boolean values in migrations for SQL server (tsdogs) + - Enh #325: Added support for sqlite3 (santilin) + - Fix #326: Fix rule for the user auth_tf_enabled field (santilin) ## 1.5.0 April 19, 2019 - Fix: Fix condition in EmailChangeService (it was always false) (borisaeric) diff --git a/src/User/Helper/MigrationHelper.php b/src/User/Helper/MigrationHelper.php index ae0b92d..f0392d1 100644 --- a/src/User/Helper/MigrationHelper.php +++ b/src/User/Helper/MigrationHelper.php @@ -31,6 +31,7 @@ class MigrationHelper case 'dblib': case 'mssql': case 'sqlsrv': + case 'sqlite': return null; default: throw new RuntimeException('Your database is not supported!'); @@ -48,8 +49,8 @@ class MigrationHelper { switch ($driverName) { case 'mysql': - return $driverName; case 'pgsql': + case 'sqlite': return $driverName; case 'dblib': case 'mssql': @@ -72,10 +73,16 @@ class MigrationHelper return self::resolveDbType($driverName) === 'sqlsrv'; } - public static function getBooleanValue($driverName,$value=false) + /** + * @param $driverName + * @param bool $value + * + * @return bool|int + */ + public static function getBooleanValue($driverName, $value = false) { - if(self::isMicrosoftSQLServer($driverName)) { - return $value? 1: 0; + if (self::isMicrosoftSQLServer($driverName)) { + return $value ? 1 : 0; } return $value; } From d4695a60d2e922531d833474e12f5be700845b0f Mon Sep 17 00:00:00 2001 From: tonydspaniard Date: Sat, 29 Jun 2019 08:07:28 +0200 Subject: [PATCH 40/51] re #290 view name for confirmation email --- CHANGELOG.md | 1 + src/User/Factory/MailFactory.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 21178ab..88aef6f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Fix #322: Fix boolean values in migrations for SQL server (tsdogs) - Enh #325: Added support for sqlite3 (santilin) - Fix #326: Fix rule for the user auth_tf_enabled field (santilin) + - Fix #290: Fix wrong email message for resending confirmation (tonydspaniard) ## 1.5.0 April 19, 2019 - Fix: Fix condition in EmailChangeService (it was always false) (borisaeric) diff --git a/src/User/Factory/MailFactory.php b/src/User/Factory/MailFactory.php index ba81bca..e21336c 100644 --- a/src/User/Factory/MailFactory.php +++ b/src/User/Factory/MailFactory.php @@ -86,7 +86,7 @@ class MailFactory 'token' => $token, ]; - return static::makeMailerService(MailEvent::TYPE_CONFIRM, $from, $to, $subject, 'recovery', $params); + return static::makeMailerService(MailEvent::TYPE_CONFIRM, $from, $to, $subject, 'confirmation', $params); } /** From 8c551d9030085503806f0be823c2e5acd934992c Mon Sep 17 00:00:00 2001 From: tonydspaniard Date: Sat, 29 Jun 2019 08:32:35 +0200 Subject: [PATCH 41/51] Close #269 added help for console commands + php-cs-fixer --- CHANGELOG.md | 1 + src/User/Command/ConfirmController.php | 15 ++-- src/User/Command/CreateController.php | 12 +++ src/User/Command/DeleteController.php | 11 +++ src/User/Command/PasswordController.php | 9 ++ src/User/Controller/RecoveryController.php | 1 - .../Controller/RegistrationController.php | 1 - src/User/Controller/RuleController.php | 4 +- src/User/Controller/SecurityController.php | 1 - src/User/Controller/SettingsController.php | 83 +++++++++---------- src/User/Event/GdprEvent.php | 1 - src/User/Factory/MailFactory.php | 12 +-- src/User/Filter/PasswordAgeEnforceFilter.php | 1 - src/User/Form/GdprDeleteForm.php | 4 +- src/User/Form/LoginForm.php | 2 +- src/User/Form/RegistrationForm.php | 10 ++- src/User/Form/SettingsForm.php | 2 +- .../m000000_000002_create_profile_table.php | 2 +- .../m000000_000008_add_last_login_ip.php | 11 ++- ...m000000_000009_add_gdpr_consent_fields.php | 6 +- src/User/Model/Rule.php | 2 +- src/User/Model/SocialNetworkAccount.php | 2 +- src/User/Model/Token.php | 2 +- src/User/Model/User.php | 2 +- src/User/Service/PasswordExpireService.php | 2 +- src/User/Service/UserCreateService.php | 7 +- src/User/Widget/ReCaptchaWidget.php | 2 +- 27 files changed, 123 insertions(+), 85 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 88aef6f..22da579 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Enh #325: Added support for sqlite3 (santilin) - Fix #326: Fix rule for the user auth_tf_enabled field (santilin) - Fix #290: Fix wrong email message for resending confirmation (tonydspaniard) + - Enh #269: Added help documentation to console commands (tonydspaniard) ## 1.5.0 April 19, 2019 - Fix: Fix condition in EmailChangeService (it was always false) (borisaeric) diff --git a/src/User/Command/ConfirmController.php b/src/User/Command/ConfirmController.php index 79accf4..f0e5978 100644 --- a/src/User/Command/ConfirmController.php +++ b/src/User/Command/ConfirmController.php @@ -32,17 +32,22 @@ class ConfirmController extends Controller parent::__construct($id, $module, $config); } + /** + * Confirms a a user by setting its field `confirmed_at` to current time. + * + * @param string $usernameOrEmail Username or email of the user + * + * @throws \yii\base\InvalidConfigException + */ public function actionIndex($usernameOrEmail) { $user = $this->userQuery->whereUsernameOrEmail($usernameOrEmail)->one(); if ($user === null) { $this->stdout(Yii::t('usuario', 'User is not found') . "\n", Console::FG_RED); + } elseif ($this->make(UserConfirmationService::class, [$user])->run()) { + $this->stdout(Yii::t('usuario', 'User has been confirmed') . "\n", Console::FG_GREEN); } else { - if ($this->make(UserConfirmationService::class, [$user])->run()) { - $this->stdout(Yii::t('usuario', 'User has been confirmed') . "\n", Console::FG_GREEN); - } else { - $this->stdout(Yii::t('usuario', '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/src/User/Command/CreateController.php b/src/User/Command/CreateController.php index a98e98c..0af7d66 100644 --- a/src/User/Command/CreateController.php +++ b/src/User/Command/CreateController.php @@ -23,6 +23,18 @@ class CreateController extends Controller { use ContainerAwareTrait; + /** + * This command creates a new user account. If no password is not set, an 8-char password will be generated. After + * saving user to database, this command uses mailer component to send credentials (username and password) to user + * via email. A role can be also assigned but it must exists previously on the database. + * + * @param string $email Email + * @param string $username Username + * @param string|null $password The password. If null it will be generated automatically + * @param string|null $role Role to assign (must already exist) + * + * @throws \yii\base\InvalidConfigException + */ public function actionIndex($email, $username, $password = null, $role = null) { /** @var User $user */ diff --git a/src/User/Command/DeleteController.php b/src/User/Command/DeleteController.php index 54af4f3..50e4621 100644 --- a/src/User/Command/DeleteController.php +++ b/src/User/Command/DeleteController.php @@ -12,9 +12,11 @@ namespace Da\User\Command; use Da\User\Query\UserQuery; +use Throwable; use Yii; use yii\base\Module; use yii\console\Controller; +use yii\db\StaleObjectException; use yii\helpers\Console; class DeleteController extends Controller @@ -27,6 +29,15 @@ class DeleteController extends Controller parent::__construct($id, $module, $config); } + /** + * This command deletes a user. + * + * @param string $usernameOrEmail Email or username of the user to delete + * + * + * @throws Throwable + * @throws StaleObjectException + */ public function actionIndex($usernameOrEmail) { if ($this->confirm(Yii::t('usuario', 'Are you sure? Deleted user can not be restored'))) { diff --git a/src/User/Command/PasswordController.php b/src/User/Command/PasswordController.php index 62dc497..9e97fcb 100644 --- a/src/User/Command/PasswordController.php +++ b/src/User/Command/PasswordController.php @@ -16,6 +16,7 @@ use Da\User\Query\UserQuery; use Da\User\Service\ResetPasswordService; use Da\User\Traits\ContainerAwareTrait; use Yii; +use yii\base\InvalidConfigException; use yii\base\Module; use yii\console\Controller; use yii\helpers\Console; @@ -32,6 +33,14 @@ class PasswordController extends Controller parent::__construct($id, $module, $config); } + /** + * This command updates the user's password. + * + * @param string $usernameOrEmail Username or email of the user who's password needs to be updated + * @param string $password The new password + * + * @throws InvalidConfigException + */ public function actionIndex($usernameOrEmail, $password) { /** @var User $user */ diff --git a/src/User/Controller/RecoveryController.php b/src/User/Controller/RecoveryController.php index a935669..9925c87 100644 --- a/src/User/Controller/RecoveryController.php +++ b/src/User/Controller/RecoveryController.php @@ -39,7 +39,6 @@ class RecoveryController extends Controller protected $userQuery; protected $tokenQuery; - /** * RecoveryController constructor. * diff --git a/src/User/Controller/RegistrationController.php b/src/User/Controller/RegistrationController.php index 424d8b0..452476e 100644 --- a/src/User/Controller/RegistrationController.php +++ b/src/User/Controller/RegistrationController.php @@ -43,7 +43,6 @@ class RegistrationController extends Controller protected $userQuery; protected $socialNetworkAccountQuery; - /** * RegistrationController constructor. * diff --git a/src/User/Controller/RuleController.php b/src/User/Controller/RuleController.php index 74626ca..3a05cea 100644 --- a/src/User/Controller/RuleController.php +++ b/src/User/Controller/RuleController.php @@ -11,18 +11,18 @@ namespace Da\User\Controller; +use Da\User\Filter\AccessRuleFilter; use Da\User\Model\Rule; use Da\User\Search\RuleSearch; use Da\User\Service\AuthRuleEditionService; use Da\User\Traits\AuthManagerAwareTrait; use Da\User\Traits\ContainerAwareTrait; use Da\User\Validator\AjaxRequestModelValidator; -use Da\User\Filter\AccessRuleFilter; use Yii; +use yii\filters\AccessControl; use yii\filters\VerbFilter; use yii\web\Controller; use yii\web\NotFoundHttpException; -use yii\filters\AccessControl; class RuleController extends Controller { diff --git a/src/User/Controller/SecurityController.php b/src/User/Controller/SecurityController.php index 5412e5f..31ecbb5 100644 --- a/src/User/Controller/SecurityController.php +++ b/src/User/Controller/SecurityController.php @@ -38,7 +38,6 @@ class SecurityController extends Controller protected $socialNetworkAccountQuery; - /** * SecurityController constructor. * diff --git a/src/User/Controller/SettingsController.php b/src/User/Controller/SettingsController.php index 0f77e9e..810e82c 100644 --- a/src/User/Controller/SettingsController.php +++ b/src/User/Controller/SettingsController.php @@ -11,7 +11,6 @@ namespace Da\User\Controller; - use Da\User\Contracts\MailChangeStrategyInterface; use Da\User\Event\GdprEvent; use Da\User\Event\ProfileEvent; @@ -56,16 +55,15 @@ class SettingsController extends Controller protected $userQuery; protected $socialNetworkAccountQuery; - /** * SettingsController constructor. * - * @param string $id - * @param Module $module - * @param ProfileQuery $profileQuery - * @param UserQuery $userQuery + * @param string $id + * @param Module $module + * @param ProfileQuery $profileQuery + * @param UserQuery $userQuery * @param SocialNetworkAccountQuery $socialNetworkAccountQuery - * @param array $config + * @param array $config */ public function __construct( $id, @@ -74,8 +72,7 @@ class SettingsController extends Controller UserQuery $userQuery, SocialNetworkAccountQuery $socialNetworkAccountQuery, array $config = [] - ) - { + ) { $this->profileQuery = $profileQuery; $this->userQuery = $userQuery; $this->socialNetworkAccountQuery = $socialNetworkAccountQuery; @@ -159,9 +156,9 @@ class SettingsController extends Controller public function actionPrivacy() { - if (!$this->module->enableGdprCompliance) + if (!$this->module->enableGdprCompliance) { throw new NotFoundHttpException(); - + } return $this->render('privacy', [ 'module' => $this->module ]); @@ -169,9 +166,9 @@ class SettingsController extends Controller public function actionGdprDelete() { - if (!$this->module->enableGdprCompliance) + if (!$this->module->enableGdprCompliance) { throw new NotFoundHttpException(); - + } /** @var GdprDeleteForm $form */ $form = $this->make(GdprDeleteForm::class); @@ -209,15 +206,12 @@ class SettingsController extends Controller 'website' => $anonymReplacement . ".tld", 'bio' => Yii::t('usuario', 'Deleted by GDPR request') ]); - - } $this->trigger(GdprEvent::EVENT_AFTER_DELETE, $event); Yii::$app->session->setFlash('info', Yii::t('usuario', 'Your personal information has been removed')); return $this->goHome(); - } return $this->render('gdpr-delete', [ @@ -225,32 +219,6 @@ class SettingsController extends Controller ]); } - /** - * @param $id - * @throws ForbiddenHttpException - * @throws NotFoundHttpException - * @throws \Exception - * @throws \Throwable - * @throws \yii\db\StaleObjectException - */ - protected function disconnectSocialNetwork($id) - { - /** @var SocialNetworkAccount $account */ - $account = $this->socialNetworkAccountQuery->whereId($id)->one(); - - if ($account === null) { - throw new NotFoundHttpException(); - } - if ($account->user_id !== Yii::$app->user->id) { - throw new ForbiddenHttpException(); - } - $event = $this->make(SocialNetworkConnectEvent::class, [Yii::$app->user->identity, $account]); - - $this->trigger(SocialNetworkConnectEvent::EVENT_BEFORE_DISCONNECT, $event); - $account->delete(); - $this->trigger(SocialNetworkConnectEvent::EVENT_AFTER_DISCONNECT, $event); - } - /** * Exports the data from the current user in a mechanical readable format (csv). Properties exported can be defined * in the module configuration. @@ -260,9 +228,9 @@ class SettingsController extends Controller */ public function actionExport() { - if (!$this->module->enableGdprCompliance) + if (!$this->module->enableGdprCompliance) { throw new NotFoundHttpException(); - + } try { $properties = $this->module->gdprExportProperties; $user = Yii::$app->user->identity; @@ -294,7 +262,6 @@ class SettingsController extends Controller } catch (\Throwable $e) { throw $e; } - } public function actionAccount() @@ -444,4 +411,30 @@ class SettingsController extends Controller $this->redirect(['account']); } + + /** + * @param $id + * @throws ForbiddenHttpException + * @throws NotFoundHttpException + * @throws \Exception + * @throws \Throwable + * @throws \yii\db\StaleObjectException + */ + protected function disconnectSocialNetwork($id) + { + /** @var SocialNetworkAccount $account */ + $account = $this->socialNetworkAccountQuery->whereId($id)->one(); + + if ($account === null) { + throw new NotFoundHttpException(); + } + if ($account->user_id !== Yii::$app->user->id) { + throw new ForbiddenHttpException(); + } + $event = $this->make(SocialNetworkConnectEvent::class, [Yii::$app->user->identity, $account]); + + $this->trigger(SocialNetworkConnectEvent::EVENT_BEFORE_DISCONNECT, $event); + $account->delete(); + $this->trigger(SocialNetworkConnectEvent::EVENT_AFTER_DISCONNECT, $event); + } } diff --git a/src/User/Event/GdprEvent.php b/src/User/Event/GdprEvent.php index d038b96..703c191 100644 --- a/src/User/Event/GdprEvent.php +++ b/src/User/Event/GdprEvent.php @@ -19,7 +19,6 @@ use yii\base\Event; */ class GdprEvent extends Event { - const EVENT_BEFORE_DELETE = 'beforeDelete'; const EVENT_AFTER_DELETE = 'afterDelete'; /** diff --git a/src/User/Factory/MailFactory.php b/src/User/Factory/MailFactory.php index e21336c..6cb7920 100644 --- a/src/User/Factory/MailFactory.php +++ b/src/User/Factory/MailFactory.php @@ -117,12 +117,12 @@ class MailFactory /** * Builds a MailerService. * - * @param string $type + * @param string $type * @param string|array|\Closure $from - * @param string $to - * @param string $subject - * @param string $view - * @param array $params + * @param string $to + * @param string $subject + * @param string $view + * @param array $params * * @throws InvalidConfigException * @return MailService @@ -130,7 +130,7 @@ class MailFactory */ public static function makeMailerService($type, $from, $to, $subject, $view, $params = []) { - if ($from instanceof \Closure){ + if ($from instanceof \Closure) { $from = $from($type); } /** @noinspection PhpIncompatibleReturnTypeInspection */ diff --git a/src/User/Filter/PasswordAgeEnforceFilter.php b/src/User/Filter/PasswordAgeEnforceFilter.php index 9f92746..a0334a7 100644 --- a/src/User/Filter/PasswordAgeEnforceFilter.php +++ b/src/User/Filter/PasswordAgeEnforceFilter.php @@ -4,7 +4,6 @@ * This file is part of the 2amigos/yii2-usuario project. * * (c) 2amigOS! - * @author Lorenzo Milesi * * For the full copyright and license information, please view * the LICENSE file that was distributed with this source code. diff --git a/src/User/Form/GdprDeleteForm.php b/src/User/Form/GdprDeleteForm.php index 427376c..a720907 100644 --- a/src/User/Form/GdprDeleteForm.php +++ b/src/User/Form/GdprDeleteForm.php @@ -4,7 +4,6 @@ * This file is part of the 2amigos/yii2-usuario project. * * (c) 2amigOS! - * @author E. Alamo * * For the full copyright and license information, please view * the LICENSE file that was distributed with this source code. @@ -12,7 +11,6 @@ namespace Da\User\Form; - use Da\User\Helper\SecurityHelper; use Da\User\Model\User; use Da\User\Traits\ContainerAwareTrait; @@ -42,7 +40,7 @@ class GdprDeleteForm extends Model /** * @param SecurityHelper $securityHelper - * @param array $config + * @param array $config */ public function __construct(SecurityHelper $securityHelper, $config = []) { diff --git a/src/User/Form/LoginForm.php b/src/User/Form/LoginForm.php index 3327fba..c086b34 100644 --- a/src/User/Form/LoginForm.php +++ b/src/User/Form/LoginForm.php @@ -142,7 +142,7 @@ class LoginForm extends Model * Validates form and logs the user in. * * @throws InvalidParamException - * @return bool whether the user is logged in successfully + * @return bool whether the user is logged in successfully */ public function login() { diff --git a/src/User/Form/RegistrationForm.php b/src/User/Form/RegistrationForm.php index 79156b4..bd96894 100644 --- a/src/User/Form/RegistrationForm.php +++ b/src/User/Form/RegistrationForm.php @@ -103,13 +103,17 @@ class RegistrationForm extends Model public function attributeHints() { return [ - 'gdpr_consent' => Yii::t('usuario', '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}', + 'gdpr_consent' => Yii::t( + 'usuario', + '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}', [ - 'privacyPolicy' => Html::a(Yii::t('usuario', 'privacy policy'), + 'privacyPolicy' => Html::a( + Yii::t('usuario', 'privacy policy'), $this->module->gdprPrivacyPolicyUrl, ['target' => '_blank'] ) - ]) + ] + ) ]; } } diff --git a/src/User/Form/SettingsForm.php b/src/User/Form/SettingsForm.php index 3366b34..803a6d6 100644 --- a/src/User/Form/SettingsForm.php +++ b/src/User/Form/SettingsForm.php @@ -55,7 +55,7 @@ class SettingsForm extends Model * SettingsForm constructor. * * @param SecurityHelper $securityHelper - * @param array $config + * @param array $config */ public function __construct(SecurityHelper $securityHelper, array $config = []) { diff --git a/src/User/Migration/m000000_000002_create_profile_table.php b/src/User/Migration/m000000_000002_create_profile_table.php index aec68f6..e92105d 100644 --- a/src/User/Migration/m000000_000002_create_profile_table.php +++ b/src/User/Migration/m000000_000002_create_profile_table.php @@ -34,7 +34,7 @@ class m000000_000002_create_profile_table extends Migration MigrationHelper::resolveTableOptions($this->db->driverName) ); - $this->addPrimaryKey('{{%profile_pk}}','{{%profile}}','user_id'); + $this->addPrimaryKey('{{%profile_pk}}', '{{%profile}}', 'user_id'); $restrict = MigrationHelper::isMicrosoftSQLServer($this->db->driverName) ? 'NO ACTION' : 'RESTRICT'; diff --git a/src/User/Migration/m000000_000008_add_last_login_ip.php b/src/User/Migration/m000000_000008_add_last_login_ip.php index 4b9f8d9..8d03a1c 100644 --- a/src/User/Migration/m000000_000008_add_last_login_ip.php +++ b/src/User/Migration/m000000_000008_add_last_login_ip.php @@ -1,10 +1,19 @@ + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + namespace Da\User\Migration; use yii\db\Migration; use yii\db\Schema; - /** * Class m000000_000008_add_last_login_ip * @author: Kartik Visweswaran diff --git a/src/User/Migration/m000000_000009_add_gdpr_consent_fields.php b/src/User/Migration/m000000_000009_add_gdpr_consent_fields.php index 32c4c02..9dc5590 100644 --- a/src/User/Migration/m000000_000009_add_gdpr_consent_fields.php +++ b/src/User/Migration/m000000_000009_add_gdpr_consent_fields.php @@ -11,16 +11,16 @@ namespace Da\User\Migration; -use yii\db\Migration; use Da\User\Helper\MigrationHelper; +use yii\db\Migration; class m000000_000009_add_gdpr_consent_fields extends Migration { public function safeUp() { - $this->addColumn('{{%user}}', 'gdpr_consent', $this->boolean()->defaultValue(MigrationHelper::getBooleanValue($this->db->driverName,false))); + $this->addColumn('{{%user}}', 'gdpr_consent', $this->boolean()->defaultValue(MigrationHelper::getBooleanValue($this->db->driverName, false))); $this->addColumn('{{%user}}', 'gdpr_consent_date', $this->integer(11)->null()); - $this->addColumn('{{%user}}', 'gdpr_deleted', $this->boolean()->defaultValue(MigrationHelper::getBooleanValue($this->db->driverName,false))); + $this->addColumn('{{%user}}', 'gdpr_deleted', $this->boolean()->defaultValue(MigrationHelper::getBooleanValue($this->db->driverName, false))); } public function safeDown() diff --git a/src/User/Model/Rule.php b/src/User/Model/Rule.php index 1803947..a406b35 100644 --- a/src/User/Model/Rule.php +++ b/src/User/Model/Rule.php @@ -14,8 +14,8 @@ namespace Da\User\Model; use Da\User\Traits\AuthManagerAwareTrait; use Da\User\Validator\RbacRuleNameValidator; use Da\User\Validator\RbacRuleValidator; -use yii\base\Model; use Yii; +use yii\base\Model; class Rule extends Model { diff --git a/src/User/Model/SocialNetworkAccount.php b/src/User/Model/SocialNetworkAccount.php index a064103..3251880 100644 --- a/src/User/Model/SocialNetworkAccount.php +++ b/src/User/Model/SocialNetworkAccount.php @@ -75,7 +75,7 @@ class SocialNetworkAccount extends ActiveRecord /** * @throws Exception * @throws InvalidParamException - * @return string the connection url + * @return string the connection url */ public function getConnectionUrl() { diff --git a/src/User/Model/Token.php b/src/User/Model/Token.php index 27d441c..2ee8e97 100644 --- a/src/User/Model/Token.php +++ b/src/User/Model/Token.php @@ -101,7 +101,7 @@ class Token extends ActiveRecord /** * @throws RuntimeException - * @return bool Whether token has expired + * @return bool Whether token has expired */ public function getIsExpired() { diff --git a/src/User/Model/User.php b/src/User/Model/User.php index 0581719..212ff73 100644 --- a/src/User/Model/User.php +++ b/src/User/Model/User.php @@ -286,7 +286,7 @@ class User extends ActiveRecord implements IdentityInterface /** * @throws InvalidConfigException - * @return bool whether the user is an admin or not + * @return bool whether the user is an admin or not */ public function getIsAdmin() { diff --git a/src/User/Service/PasswordExpireService.php b/src/User/Service/PasswordExpireService.php index 4f668fd..bcbc611 100644 --- a/src/User/Service/PasswordExpireService.php +++ b/src/User/Service/PasswordExpireService.php @@ -11,9 +11,9 @@ namespace Da\User\Service; -use Yii; use Da\User\Contracts\ServiceInterface; use Da\User\Model\User; +use Yii; class PasswordExpireService implements ServiceInterface { diff --git a/src/User/Service/UserCreateService.php b/src/User/Service/UserCreateService.php index 2800460..60ff7eb 100644 --- a/src/User/Service/UserCreateService.php +++ b/src/User/Service/UserCreateService.php @@ -59,6 +59,7 @@ class UserCreateService implements ServiceInterface ? $model->password : $this->securityHelper->generatePassword(8); + /** @var UserEvent $event */ $event = $this->make(UserEvent::class, [$model]); $model->trigger(UserEvent::EVENT_BEFORE_CREATE, $event); @@ -75,15 +76,15 @@ class UserCreateService implements ServiceInterface ['email' => $model->email] ); // from web display a flash message (if enabled) - if($this->getModule()->enableFlashMessages == TRUE && is_a(Yii::$app, yii\web\Application::class)) { + if ($this->getModule()->enableFlashMessages === true && is_a(Yii::$app, yii\web\Application::class)) { Yii::$app->session->setFlash( 'warning', $error_msg ); } // if we're from console add an error to the model in order to return an error message - if(is_a(Yii::$app, yii\console\Application::class)) { - $model->addError("username", $error_msg); + if (is_a(Yii::$app, yii\console\Application::class)) { + $model->addError('username', $error_msg); } $transaction->rollBack(); return false; diff --git a/src/User/Widget/ReCaptchaWidget.php b/src/User/Widget/ReCaptchaWidget.php index dfae5ce..f5bd278 100644 --- a/src/User/Widget/ReCaptchaWidget.php +++ b/src/User/Widget/ReCaptchaWidget.php @@ -83,7 +83,7 @@ class ReCaptchaWidget extends InputWidget /** * @throws InvalidConfigException - * @return array the google recaptcha options. + * @return array the google recaptcha options. */ protected function getCaptchaOptions() { From 097640c297afa77940761bdd5094a7bec202245c Mon Sep 17 00:00:00 2001 From: tonydspaniard Date: Sat, 29 Jun 2019 09:00:15 +0200 Subject: [PATCH 42/51] Close #244 Fix forced inclusion of a suggested class --- CHANGELOG.md | 1 + src/User/Form/LoginForm.php | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 22da579..7319f01 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Fix #326: Fix rule for the user auth_tf_enabled field (santilin) - Fix #290: Fix wrong email message for resending confirmation (tonydspaniard) - Enh #269: Added help documentation to console commands (tonydspaniard) + - Fix #244: Fix forced inclusion of a suggested class (tonydspaniard) ## 1.5.0 April 19, 2019 - Fix: Fix condition in EmailChangeService (it was always false) (borisaeric) diff --git a/src/User/Form/LoginForm.php b/src/User/Form/LoginForm.php index c086b34..ca33b05 100644 --- a/src/User/Form/LoginForm.php +++ b/src/User/Form/LoginForm.php @@ -11,7 +11,6 @@ namespace Da\User\Form; -use Da\TwoFA\Exception\InvalidSecretKeyException; use Da\User\Helper\SecurityHelper; use Da\User\Model\User; use Da\User\Query\UserQuery; @@ -82,7 +81,7 @@ class LoginForm extends Model /** * {@inheritdoc} * - * @throws InvalidSecretKeyException + * @throws \Da\TwoFA\Exception\InvalidSecretKeyException (only if package is being used) */ public function rules() { From 35fda70e14cd36d845d7b56b4ae91bf78381c125 Mon Sep 17 00:00:00 2001 From: tonydspaniard Date: Sat, 29 Jun 2019 13:31:10 +0200 Subject: [PATCH 43/51] optimize imports --- src/User/Service/SocialNetworkAuthenticateService.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/User/Service/SocialNetworkAuthenticateService.php b/src/User/Service/SocialNetworkAuthenticateService.php index e1ec09d..da80f65 100644 --- a/src/User/Service/SocialNetworkAuthenticateService.php +++ b/src/User/Service/SocialNetworkAuthenticateService.php @@ -15,7 +15,6 @@ use Da\User\Contracts\AuthClientInterface; use Da\User\Contracts\ServiceInterface; use Da\User\Controller\SecurityController; use Da\User\Event\SocialNetworkAuthEvent; -use Da\User\Factory\MailFactory; use Da\User\Model\SocialNetworkAccount; use Da\User\Model\User; use Da\User\Query\SocialNetworkAccountQuery; From 342432068463bb7c383a4237e1bd98cc4d989f76 Mon Sep 17 00:00:00 2001 From: Thoulah Date: Sun, 30 Jun 2019 02:01:25 +0200 Subject: [PATCH 44/51] optimize imports --- src/User/Migration/m000000_000008_add_last_login_ip.php | 1 - src/User/Model/AbstractAuthItem.php | 1 - src/User/Service/PasswordExpireService.php | 1 - 3 files changed, 3 deletions(-) diff --git a/src/User/Migration/m000000_000008_add_last_login_ip.php b/src/User/Migration/m000000_000008_add_last_login_ip.php index 8d03a1c..8d3f790 100644 --- a/src/User/Migration/m000000_000008_add_last_login_ip.php +++ b/src/User/Migration/m000000_000008_add_last_login_ip.php @@ -12,7 +12,6 @@ namespace Da\User\Migration; use yii\db\Migration; -use yii\db\Schema; /** * Class m000000_000008_add_last_login_ip diff --git a/src/User/Model/AbstractAuthItem.php b/src/User/Model/AbstractAuthItem.php index ed5061f..b550b10 100644 --- a/src/User/Model/AbstractAuthItem.php +++ b/src/User/Model/AbstractAuthItem.php @@ -14,7 +14,6 @@ namespace Da\User\Model; use Da\User\Traits\AuthManagerAwareTrait; use Da\User\Validator\RbacItemsValidator; use Da\User\Validator\RbacRuleExistsValidator; -use Da\User\Validator\RbacRuleValidator; use Yii; use yii\base\Model; use yii\rbac\Item; diff --git a/src/User/Service/PasswordExpireService.php b/src/User/Service/PasswordExpireService.php index bcbc611..bfec3f7 100644 --- a/src/User/Service/PasswordExpireService.php +++ b/src/User/Service/PasswordExpireService.php @@ -13,7 +13,6 @@ namespace Da\User\Service; use Da\User\Contracts\ServiceInterface; use Da\User\Model\User; -use Yii; class PasswordExpireService implements ServiceInterface { From 311da9d551d1f63f122fc9ac8b4341adbe15668f Mon Sep 17 00:00:00 2001 From: Thoulah Date: Sun, 30 Jun 2019 02:04:09 +0200 Subject: [PATCH 45/51] Test against PHP 7.4 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 0e7dc4a..1b409f5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,7 @@ php: - 7.1 - 7.2 - 7.3 + - 7.4snapshot - nightly matrix: From 4fc2c257df99de28fca2974b30cc863ffdad0131 Mon Sep 17 00:00:00 2001 From: Lorenzo Milesi Date: Mon, 1 Jul 2019 18:17:53 +0200 Subject: [PATCH 46/51] Fix user account events in admin controller --- CHANGELOG.md | 1 + docs/events/user-events.md | 2 ++ src/User/Controller/AdminController.php | 4 ++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7319f01..fe30aec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - Fix #290: Fix wrong email message for resending confirmation (tonydspaniard) - Enh #269: Added help documentation to console commands (tonydspaniard) - Fix #244: Fix forced inclusion of a suggested class (tonydspaniard) + - Fix user event triggering in admin controller (maxxer) ## 1.5.0 April 19, 2019 - Fix: Fix condition in EmailChangeService (it was always false) (borisaeric) diff --git a/docs/events/user-events.md b/docs/events/user-events.md index d6c104f..3c2edd2 100644 --- a/docs/events/user-events.md +++ b/docs/events/user-events.md @@ -9,6 +9,8 @@ On Controllers - **AdminController** - **UserEvent::EVENT_BEFORE_CREATE**: Occurs before a user has been created - **UserEvent::EVENT_AFTER_CREATE**: Occurs after a user has been created + - **UserEvent::EVENT_BEFORE_ACCOUNT_UPDATE**: Occurs before a user's account has been updated + - **UserEvent::EVENT_AFTER_ACCOUNT_UPDATE**: Occurs after a user's account has been updated - **UserEvent::EVENT_BEFORE_PROFILE_UPDATE**: Occurs before a user's profile has been updated - **UserEvent::EVENT_AFTER_PROFILE_UPDATE**: Occurs after a user's profile has been updated - **UserEvent::EVENT_BEFORE_CONFIRMATION**: Occurs before a user's email has been confirmed diff --git a/src/User/Controller/AdminController.php b/src/User/Controller/AdminController.php index f63cd73..912b8d8 100644 --- a/src/User/Controller/AdminController.php +++ b/src/User/Controller/AdminController.php @@ -160,11 +160,11 @@ class AdminController extends Controller $this->make(AjaxRequestModelValidator::class, [$user])->validate(); if ($user->load(Yii::$app->request->post())) { - $this->trigger(ActiveRecord::EVENT_BEFORE_UPDATE, $event); + $this->trigger(UserEvent::EVENT_BEFORE_ACCOUNT_UPDATE, $event); if ($user->save()) { Yii::$app->getSession()->setFlash('success', Yii::t('usuario', 'Account details have been updated')); - $this->trigger(ActiveRecord::EVENT_AFTER_UPDATE, $event); + $this->trigger(UserEvent::EVENT_AFTER_ACCOUNT_UPDATE, $event); return $this->refresh(); } From fc730a9aba4044592271dcf456c28ebd78009316 Mon Sep 17 00:00:00 2001 From: Oleg Malynovskyi Date: Tue, 9 Jul 2019 16:46:20 +0300 Subject: [PATCH 47/51] Added Ukrainian translations --- src/User/resources/i18n/uk/usuario.php | 561 ++++++++++++------------- 1 file changed, 280 insertions(+), 281 deletions(-) diff --git a/src/User/resources/i18n/uk/usuario.php b/src/User/resources/i18n/uk/usuario.php index 62ade06..19831df 100644 --- a/src/User/resources/i18n/uk/usuario.php +++ b/src/User/resources/i18n/uk/usuario.php @@ -17,286 +17,285 @@ * NOTE: this file must be saved in UTF-8 encoding. */ return [ - '{0, date, MMM dd, YYYY HH:mm}' => '@@@@', - '(not set)' => '', - 'A confirmation message has been sent to your new email address' => '', - 'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => '', - 'A new confirmation link has been sent' => '', - 'A password will be generated automatically if not provided' => '', - 'Account' => '', - 'Account confirmation' => '', - 'Account details' => '', - 'Account details have been updated' => '', - 'Account settings' => '', - 'Already registered? Sign in!' => '', - '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?' => '', - 'Are you sure you want to delete this user?' => '', - 'Are you sure you want to switch to this user for the rest of this Session?' => '', - 'Are you sure you want to unblock this user?' => '', - 'Are you sure you wish the user to change their password at next login?' => '', - 'Are you sure you wish to send a password recovery email to this user?' => '', - 'Are you sure? Deleted user can not be restored' => '', - 'Are you sure? There is no going back' => '', - 'Assignments' => '', - 'Assignments have been updated' => '', - 'Auth item with such name already exists' => '', - 'Authentication rule class {0} can not be instantiated' => '', - 'Authorization item successfully created.' => '', - 'Authorization item successfully removed.' => '', - 'Authorization item successfully updated.' => '', - 'Authorization rule has been added.' => '', - 'Authorization rule has been removed.' => '', - 'Authorization rule has been updated.' => '', - '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' => '', - 'Bio' => '', - 'Block' => '', - 'Block status' => '', - 'Blocked at {0, date, MMMM dd, YYYY HH:mm}' => '', - 'Cancel' => '', - 'Cannot assign role "{0}" as the AuthManager is not configured on your console application.' => '', - 'Change your avatar at Gravatar.com' => '', - 'Children' => '', - 'Class' => '', - 'Close' => '', - 'Complete password reset on {0}' => '', - 'Confirm' => '', - 'Confirm account on {0}' => '', - 'Confirm email change on {0}' => '', - 'Confirmation' => '', - 'Confirmation status' => '', - 'Confirmation time' => '', - 'Confirmed' => '', - 'Confirmed at {0, date, MMMM dd, YYYY HH:mm}' => '', - 'Connect' => '', - 'Continue' => '', - 'Create' => '', - 'Create a user account' => '', - 'Create new permission' => '', - 'Create new role' => '', - 'Create new rule' => '', - 'Created at' => '', - 'Credentials will be sent to the user by email' => '', - 'Current password' => '', - 'Current password is not valid' => '', - 'Data processing consent' => '', - 'Delete' => '', - 'Delete account' => '', - 'Delete my account' => '', - 'Delete personal data' => '', - 'Deleted by GDPR request' => '', - 'Description' => '', - 'Didn\'t receive confirmation message?' => '', - 'Disable two factor authentication' => '', - 'Disconnect' => '', - 'Don\'t have an account? Sign up!' => '', - 'Download my data' => '', - 'Email' => '', - 'Email (public)' => '', - 'Enable' => '', - 'Enable two factor authentication' => '', - 'Error occurred while changing password' => '', - 'Error occurred while confirming user' => '', - 'Error occurred while deleting user' => '', - 'Error sending registration message to "{email}". Please try again later.' => '', - 'Error sending welcome message to "{email}". Please try again later.' => '', - 'Export my data' => '', - 'Finish' => '', - 'Force password change at next login' => '', - 'Forgot password?' => '', - 'Gravatar email' => '', - 'Hello' => '', - 'Here you can download your personal data in a comma separated values format.' => '', - '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}' => '', - 'If you already registered, sign in and connect this account on settings page' => '', - 'If you cannot click the link, please try pasting the text into your browser' => '', - 'If you did not make this request you can ignore this email' => '', - 'Impersonate this user' => '', - 'In order to complete your registration, please click the link below' => '', - 'In order to complete your request, please click the link below' => '', - 'In order to finish your registration, we need you to enter following fields' => '', - 'Information' => '', - 'Invalid login or password' => '', - 'Invalid or expired link' => '', - 'Invalid password' => '', - 'Invalid two factor authentication code' => '', - 'Invalid value' => '', - 'It will be deleted forever' => '', - 'Items' => '', - 'Joined on {0, date}' => '', - 'Last login IP' => '', - 'Last login time' => '', - 'Last password change' => '', - 'Location' => '', - 'Login' => '', - 'Logout' => '', - 'Manage users' => '', - 'Name' => '', - 'Networks' => '', - 'Never' => '', - 'New email' => '', - 'New password' => '', - 'New permission' => '', - 'New role' => '', - 'New rule' => '', - 'New user' => '', - 'Not blocked' => '', - 'Not found' => '', - 'Once you delete your account, there is no going back' => '', - 'Once you have deleted your data, you will not longer be able to sign in with this account.' => '', - 'Password' => '', - 'Password age' => '', - 'Password has been changed' => '', - 'Permissions' => '', - 'Please be certain' => '', - 'Please click the link below to complete your password reset' => '', - 'Please fix following errors:' => '', - 'Privacy' => '', - 'Privacy settings' => '', - 'Profile' => '', - 'Profile details' => '', - 'Profile details have been updated' => '', - 'Profile settings' => '', - 'Recover your password' => '', - 'Recovery link is invalid or expired. Please try requesting a new one.' => '', + '{0, date, MMM dd, YYYY HH:mm}' => '{0, date, MMM dd, YYYY HH:mm}', + '(not set)' => '{не задано}', + 'A confirmation message has been sent to your new email address' => 'Підтверджуюче повідомлення надіслано на Вашу нову електронну адресу', + 'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => 'На Вашу електронну адресу було надіслано повідомлення. Воно містить посилання, по якому Ви маєте перейти, щоб підтвердити реєстрацію', + 'A new confirmation link has been sent' => 'Нове посилання для підтвердження було надіслано', + 'A password will be generated automatically if not provided' => 'Пароль буде сгенерований автоматично, якщо не буде вказаний', + 'Account' => 'Акаунт', + 'Account confirmation' => 'Підтвердження акаунту', + 'Account details' => 'Деталі акаунту', + 'Account details have been updated' => 'Деталі акаунту оновлені', + 'Account settings' => 'Налаштування акаунту', + 'Already registered? Sign in!' => 'Вже зареєстровані? Авторизуйтесь!', + '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}. Ваш існуючий пароль не був змінений.', + 'An error occurred processing your request' => 'Помилка при обробці запиту', + 'Are you sure you want to block this user?' => 'Ви впевнені, що бажаєте заблокувати даного користувача?', + 'Are you sure you want to confirm this user?' => 'Ви впевнені, що бажаєте підтвердити даного користувача?', + 'Are you sure you want to delete this user?' => 'Ви впевнені, що бажаєте видалити даного користувача?', + 'Are you sure you want to switch to this user for the rest of this Session?' => 'Ви впевнені, що бажаєте переключитись на цього користувача для даної Сесії', + 'Are you sure you want to unblock this user?' => 'Ви впевнені, що бажаєте розблокувати даного користувача?', + 'Are you sure you wish the user to change their password at next login?' => 'Ви впевнені, що бажаєте зміни пароля користувача при наступній авторизації?', + 'Are you sure you wish to send a password recovery email to this user?' => 'Ви впевнені, що бажаєте надіслати листа для відновлення пароля даному користувачу?', + 'Are you sure? Deleted user can not be restored' => 'Ви впевнені? Видалених користувачів відновити неможливо', + 'Are you sure? There is no going back' => 'Ви впевнені? Це невідворотній процес', + 'Assignments' => 'Призначення', + 'Assignments have been updated' => 'Призначення оновлені', + 'Auth item with such name already exists' => 'Елемент аутентифікації з такою назвою вже існує', + 'Authentication rule class {0} can not be instantiated' => 'Клас аутентифікації {0} не може бути ініційований', + 'Authorization item successfully created.' => 'Елемент авторизації створений успішно', + 'Authorization item successfully removed.' => 'Елемент авторизації видалений успішно', + 'Authorization item successfully updated.' => 'Елемент авторизації оновлений успішно', + 'Authorization rule has been added.' => 'Правило авторизації додане', + 'Authorization rule has been removed.' => 'Правило авторизації видалене', + 'Authorization rule has been updated.' => 'Правило авторизації оновлене', + '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' => 'Назад до налаштувань приватності', + 'Bio' => 'Біографія', + 'Block' => 'Заблокувати', + 'Block status' => 'Статус блокування', + 'Blocked at {0, date, MMMM dd, YYYY HH:mm}' => 'Заблоковано від {0, date, MMMM dd, YYYY HH:mm}', + 'Cancel' => 'Відмінити', + 'Cannot assign role "{0}" as the AuthManager is not configured on your console application.' => 'Неможливо призначити роль, так як AuthManager не налаштований у консольному додатку.', + 'Change your avatar at Gravatar.com' => 'Змініть Ваш аватар на Gravatar.com', + 'Children' => 'Дочірні елементи', + 'Class' => 'Клас', + 'Close' => 'Закрити', + 'Complete password reset on {0}' => 'Завершіть скидання пароля на {0}', + 'Confirm' => 'Підтвердити', + 'Confirm account on {0}' => 'Підтвердіть акаунт на {0}', + 'Confirm email change on {0}' => 'Підтвердіть зміну email на {0}', + 'Confirmation' => 'Підтвердження', + 'Confirmation status' => 'Статус підтвердження', + 'Confirmation time' => 'Час підтвердження', + 'Confirmed' => 'Підтверджено', + 'Confirmed at {0, date, MMMM dd, YYYY HH:mm}' => 'Підтверджено {0, date, MMMM dd, YYYY HH:mm}', + 'Connect' => 'Підключити', + 'Continue' => 'Продовжити', + 'Create' => 'Створити', + 'Create a user account' => 'Створити акаунт користувача', + 'Create new permission' => 'Створити новий дозвіл', + 'Create new role' => 'Створити нову роль', + 'Create new rule' => 'Створити нове правило', + 'Created at' => 'Дата створення', + 'Credentials will be sent to the user by email' => 'Дані будуть надіслані користувачу на електронну адресу', + 'Current password' => 'Існуючий пароль', + 'Current password is not valid' => 'Існуючий пароль вказано невірно', + 'Data processing consent' => 'Обробка персональних даних', + 'Delete' => 'Видалити', + 'Delete account' => 'Видалити акаунт', + 'Delete my account' => 'Видалити мій акаунт', + 'Delete personal data' => 'Видалити персональні дані', + 'Deleted by GDPR request' => 'Видалено за запитом щодо захисту персональних даних', + 'Description' => 'Опис', + 'Didn\'t receive confirmation message?' => 'Ви не отримали підтверджуюче повідомлення?', + 'Disable two factor authentication' => 'Вимкнути двофакторну аутентифікацію', + 'Disconnect' => 'Відключити', + 'Don\'t have an account? Sign up!' => 'Не маєте акаунту? Зареєструйтесь!', + 'Download my data' => 'Завантажити мої дані', + 'Email' => 'Email', + 'Email (public)' => 'Email (публічний)', + 'Enable' => 'Увімкнути', + 'Enable two factor authentication' => 'Увімкнути двофакторну аутентифікацію', + 'Error occurred while changing password' => 'Помилка при зміні пароля', + 'Error occurred while confirming user' => 'Помилка при підтвердженні користувача', + 'Error occurred while deleting user' => 'Помилка при видаленні користувача', + 'Error sending registration message to "{email}". Please try again later.' => 'Помилка при відправленні реєстраціного повідомлення на "{email}". Спробуйте повторити пізніше, будь ласка.', + 'Error sending welcome message to "{email}". Please try again later.' => 'Помилка при відправленні запрошення на "{email}". Спробуйте повторити пізніше, будь ласка.', + 'Export my data' => 'Експортувати мої дані', + 'Finish' => 'Завершити', + 'Force password change at next login' => 'Ініціювати зміну пароля при наступній авторизації', + 'Forgot password?' => 'Забули пароль?', + 'Gravatar email' => 'Gravatar email', + 'Hello' => 'Привіт', + 'Here you can download your personal data in a comma separated values format.' => 'Тут Ви можете скачати Ваші персональні дані у форматі CSV.', + '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}' => 'Я даю згоду на обробку моїх персональних даних та на використання cookie даним сайтом. Для більш детальної інформації ознайомтесь з {privacyPolicy}', + 'If you already registered, sign in and connect this account on settings page' => 'Якщо Ви вже зареєстровані - увійдіть та підключіть цей акаунт в налаштуваннях.', + 'If you cannot click the link, please try pasting the text into your browser' => 'Якщо Ви не можете натиснути на посилання, спробуйте вставити його адресу у Ваш браузер.', + 'If you did not make this request you can ignore this email' => 'Якщо Ви не робили запит - можете ігнорувати дане повідомлення.', + 'Impersonate this user' => 'Видавати себе за цього користувача', + 'In order to complete your registration, please click the link below' => 'Для завершення реєстрації, перейдіть, будь ласка, за наступним посиланням', + 'In order to complete your request, please click the link below' => 'Для завершення Вашого запиту, перейдіть, будь ласка, за наступним посиланням', + 'In order to finish your registration, we need you to enter following fields' => 'Для завершення реєстрації, Ви маєте заповнити наступні поля', + 'Information' => 'Інформація', + 'Invalid login or password' => 'Невірний логін або пароль', + 'Invalid or expired link' => 'Невірне або застаріле посилання', + 'Invalid password' => 'Невірний пароль', + 'Invalid two factor authentication code' => 'Невірний код двофакторної аутентифікації', + 'Invalid value' => 'Невірне значення', + 'It will be deleted forever' => 'Буде видалено назавжди', + 'Items' => 'Елементи', + 'Joined on {0, date}' => 'Зареєстровано {0, date}', + 'Last login IP' => 'IP останнього логіну', + 'Last login time' => 'Час останнього логіну', + 'Last password change' => 'Остання зміна пароля', + 'Location' => 'Місцезнаходження', + 'Login' => 'Вхід', + 'Logout' => 'Вихід', + 'Manage users' => 'Керування користувачами', + 'Name' => 'Імʼя', + 'Networks' => 'Соціальні мережі', + 'Never' => 'Ніколи', + 'New email' => 'Нова електронна адреса', + 'New password' => 'Новий пароль', + 'New permission' => 'Новий дозвіл', + 'New role' => 'Нова роль', + 'New rule' => 'Нове правило', + 'New user' => 'Новий користувач', + 'Not blocked' => 'Не заблоковано', + 'Not found' => 'Не знайдено', + 'Once you delete your account, there is no going back' => 'Якщо Ви видалите акаунт, повернути його буде неможливо', + 'Once you have deleted your data, you will not longer be able to sign in with this account.' => 'Якщо Ви видалите Ваші дані, то більше не зможете увійти на сайт з даного акаунту', + 'Password' => 'Пароль', + 'Password age' => 'Час існування пароля', + 'Password has been changed' => 'Пароль змінено', + 'Permissions' => 'Дозволи', + 'Please be certain' => 'Будьте впевнені, будь ласка', + 'Please click the link below to complete your password reset' => 'Будь ласка, натисніть на наступне посилання, щоб завершити процедуру скидання пароля', + 'Please fix following errors:' => 'Будь ласка, виправте наступні помилки:', + 'Privacy' => 'Приватність', + 'Privacy settings' => 'Налаштування приватності', + 'Profile' => 'Профіль', + 'Profile details' => 'Деталі профілю', + 'Profile details have been updated' => 'Деталі профілю оновлені', + 'Profile settings' => 'Налаштування профілю', + 'Recover your password' => 'Відновити Ваш пароль', + 'Recovery link is invalid or expired. Please try requesting a new one.' => 'Посилання для відновлення пароля невірне або застаріле. Будь ласка, спробуйте створити новий запит.', 'Recovery message sent' => '', - 'Registration IP' => '', - 'Registration on this website is disabled' => '', - 'Registration time' => '', - 'Remember me next time' => '', - 'Request new confirmation message' => '', - 'Required "key" cannot be empty.' => '', - 'Required "secret" cannot be empty.' => '', - 'Reset your password' => '', - 'Role "{0}" not found. Creating it.' => '', - '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' => '', - 'Rule {0} not found.' => '', - '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' => '', - 'Something went wrong' => '', - 'Switch identities is disabled.' => '', - 'Thank you for signing up on {0}' => '', - 'Thank you, registration is now complete.' => '', - 'The "recaptcha" component must be configured.' => '', - 'The confirmation link is invalid or expired. Please try requesting a new one.' => '', - 'The verification code is incorrect.' => '', - 'There is neither role nor permission with name "{0}"' => '', - 'There was an error in saving user' => '', - 'This account has already been connected to another user' => '', - 'This email address has already been taken' => '', - 'This username has already been taken' => '', - '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.' => '', - 'Time zone' => '', - 'Time zone is not valid' => '', - 'Two Factor Authentication (2FA)' => '', - 'Two factor authentication code' => '', - 'Two factor authentication has been disabled.' => '', - 'Two factor authentication protects you in case of stolen credentials' => '', - 'Two factor authentication successfully enabled.' => '', - 'Unable to confirm user. Please, try again.' => '', - 'Unable to create an account.' => '', - 'Unable to create authorization item.' => '', - 'Unable to create new authorization rule.' => '', - 'Unable to delete user. Please, try again later.' => '', - 'Unable to disable Two factor authentication.' => '', - 'Unable to remove authorization item.' => '', - 'Unable to send confirmation link' => '', - 'Unable to send recovery message to the user' => '', - 'Unable to update authorization item.' => '', - 'Unable to update authorization rule.' => '', - 'Unable to update block status.' => '', - 'Unblock' => '', - 'Unconfirmed' => '', - 'Update' => '', - 'Update assignments' => '', - 'Update permission' => '', - 'Update role' => '', - 'Update rule' => '', - 'Update user account' => '', - 'Updated at' => '', - 'User account could not be created.' => '', - 'User block status has been updated.' => '', - 'User could not be registered.' => '', - 'User has been confirmed' => '', - 'User has been created' => '', - 'User has been deleted' => '', - 'User is not found' => '', - 'User not found.' => '', - 'User will be required to change password at next login' => '', - 'Username' => '', - 'Users' => '', - 'VKontakte' => '', - 'Verification failed. Please, enter new code.' => '', - 'We couldn\'t re-send the mail to confirm your address. Please, verify is the correct email or if it has been confirmed already.' => '', - '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 reset the password for your account on {0}' => '', - 'We have sent confirmation links to both old and new email addresses. You must click both links to complete your request.' => '', - 'Website' => '', - 'Welcome to {0}' => '', - 'Yandex' => '', - 'You are about to delete all your personal data from this site.' => '', - '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' => '', - 'You need to confirm your email address' => '', - 'Your account details have been updated' => '', - 'Your account has been blocked' => '', - 'Your account has been blocked.' => '', - 'Your account has been completely deleted' => '', - 'Your account has been connected' => '', - 'Your account has been created' => '', - '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 consent is required to register' => '', - 'Your email address has been changed' => '', - 'Your password has expired, you must change it now' => '', - 'Your personal information has been removed' => '', - 'Your profile has been updated' => '', - 'privacy policy' => '', - '{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' => '@@@@', - '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' => '@@@@', - '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. ' => '@@@@', + 'Registration IP' => 'IP реєстрації', + 'Registration on this website is disabled' => 'Реєстрація на даному сайті не дозволена', + 'Registration time' => 'Час реєстрації', + 'Remember me next time' => 'Запамʼятати мене наступного разу', + 'Request new confirmation message' => 'Запитати нове повідомлення для підтвердження', + 'Required "key" cannot be empty.' => 'Обовʼязкове поле "ключ" не може бути порожнім', + 'Required "secret" cannot be empty.' => 'Обовʼязкове поле "секрет" не може бути порожнім', + 'Reset your password' => 'Скинути Ваш пароль', + 'Role "{0}" not found. Creating it.' => 'Роль "{0}" не знайдена. Створюємо її.', + 'Roles' => 'Ролі', + 'Rule' => 'Правила', + 'Rule class must extend "yii\\rbac\\Rule".' => 'Клас для Правила має розширювати "yii\\rbac\\Rule"', + 'Rule class name' => 'Імʼя класу для Правила', + 'Rule name' => 'Імʼя Правила', + 'Rule name {0} is already in use' => 'Імʼя Правила {0} вже використовується', + 'Rule {0} does not exists' => 'Правило {0} не існує', + 'Rule {0} not found.' => 'Правило {0} не знайдено.', + 'Rules' => 'Правила', + 'Save' => 'Зберегти', + 'Scan the QrCode with Google Authenticator App, then insert its temporary code on the box and submit.' => 'Проскануйте Qr-код додатком Google Authenticator та вставте виданий ним тимчасовий код.', + 'Select rule...' => 'Виберіть правило...', + 'Send password recovery email' => 'Надіслати листа для відновлення пароля', + 'Sign in' => 'Увійти', + 'Sign up' => 'Зареєструватись', + 'Something went wrong' => 'Щось пішло не так', + 'Switch identities is disabled.' => 'Зміна ідентифікації відключена', + 'Thank you for signing up on {0}' => 'Дякуємо за реєстрацію {0}', + 'Thank you, registration is now complete.' => 'Дякуємо, реєстрація завершена.', + 'The "recaptcha" component must be configured.' => 'Компонент "recaptcha" має бути налаштований', + 'The confirmation link is invalid or expired. Please try requesting a new one.' => 'Посилання для підтвердження невірне або застаріле. Будь ласка, спробуйте запитати нове.', + 'The verification code is incorrect.' => 'Код верифікації невірний', + 'There is neither role nor permission with name "{0}"' => 'Роль або Дозвіл з назвою "{0}" не існує', + 'There was an error in saving user' => 'Помилка при збереженні користувача', + 'This account has already been connected to another user' => 'Цей акаунт належить іншому користувачу', + 'This email address has already been taken' => 'Ця адреса електронної пошти вже зареєстрована', + 'This username has already been taken' => 'Це імʼя користувача вже зареєстроване', + '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.' => 'Це видалить Ваші персональні дані з цього сайту. Ви більше не зможете увійти.', + 'Time zone' => 'Часовий пояс', + 'Time zone is not valid' => 'Часовий пояс невірний', + 'Two Factor Authentication (2FA)' => 'Двофакторна аутентифікація (2FA)', + 'Two factor authentication code' => 'Код двофакторної аутентифікації', + 'Two factor authentication has been disabled.' => 'Двофакторна аутентифікація відключена', + 'Two factor authentication protects you in case of stolen credentials' => 'Двафакторна аутентифікація дає додатковий захист Ваших даних авторизації', + 'Two factor authentication successfully enabled.' => 'Двофакторна аутентифікація успішно підключена', + 'Unable to confirm user. Please, try again.' => 'Неможливо підтвердити користувача. Будь ласка, спробуйте ще раз.', + 'Unable to create an account.' => 'Неможливо створити акаунт.', + 'Unable to create authorization item.' => 'Неможливо створити елемент авторизації.', + 'Unable to create new authorization rule.' => 'Неможливо створити нове правило авторизації.', + 'Unable to delete user. Please, try again later.' => 'Неможливо видалити користувача. Будь ласка, спробуйте ще раз пізніше.', + 'Unable to disable Two factor authentication.' => 'Неможливо відключити двофакторну аутентифікацію.', + 'Unable to remove authorization item.' => 'Неможливо видалити елемент авторизації.', + 'Unable to send confirmation link' => 'Неможливо надіслати посилання для підтвердження', + 'Unable to send recovery message to the user' => 'Неможливо надіслати відновлювальне повідомлення користувачу', + 'Unable to update authorization item.' => 'Неможливо оновити елемент авторизації.', + 'Unable to update authorization rule.' => 'Неможливо оновити правило авторизації', + 'Unable to update block status.' => 'Неможливо оновити статус блокування.', + 'Unblock' => 'Розблокувати', + 'Unconfirmed' => 'Непідтверджено', + 'Update' => 'Оновити', + 'Update assignments' => 'Оновити призначення', + 'Update permission' => 'Оновити дозвіл', + 'Update role' => 'Оновити роль', + 'Update rule' => 'Оновити правило', + 'Update user account' => 'Оновити акаунт користувача', + 'Updated at' => 'Дата оновлення', + 'User account could not be created.' => 'Акаунт користувача не може бути створений.', + 'User block status has been updated.' => 'Статус блокування користувача оновлено.', + 'User could not be registered.' => 'Користувач не може бути зареєстрований.', + 'User has been confirmed' => 'Користувач підтверджений', + 'User has been created' => 'Користувач створений', + 'User has been deleted' => 'Користувач видалений', + 'User is not found' => 'Користувач не знайдений', + 'User not found.' => 'Користувач не знайдений.', + 'User will be required to change password at next login' => 'Користувач має змінити пароль при наступній авторизації', + 'Username' => 'Логін користувача', + 'Users' => 'Користувачі', + 'VKontakte' => 'Вконтакті', + 'Verification failed. Please, enter new code.' => 'Невдала спроба верифікації. Будь ласка, ввежіть новий код.', + 'We couldn\'t re-send the mail to confirm your address. Please, verify is the correct email or if it has been confirmed already.' => 'Ми не змогли надіслати листа для підтвердження Вашої електронної адреси. Перевірте, будь ласка, правильність електронної адреси та чи підтверджена вона в системі.', + 'We have generated a password for you' => 'Ми згенерували пароль для Вас', + 'We have received a request to change the email address for your account on {0}' => 'Ми отримали запит на зміну адреси електронної пошти для Вашого акаунту {0}', + 'We have received a request to reset the password for your account on {0}' => 'Ми отримали запит на скидання пароля для Вашого акаунту {0}', + 'We have sent confirmation links to both old and new email addresses. You must click both links to complete your request.' => 'Ми надіслали листи з підтверджуючими посиланнями на обидві Ваші електронні адреси: стару і нову. Ви маєте перейти за обома посиланнями для завершення процедури.', + 'Website' => 'Вебсайт', + 'Welcome to {0}' => 'Ласкаво просимо до {0}', + 'Yandex' => 'Яндекс', + 'You are about to delete all your personal data from this site.' => 'Ви збираєтеся видалити всі свої персональні дані з цього сайту.', + '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' => 'Ви не можете видалити власний акаунт', + 'You need to confirm your email address' => 'Ви маєте підтвердити адресу електронної пошти', + 'Your account details have been updated' => 'Деталі Вашого акаунту оновлені', + 'Your account has been blocked' => 'Ваш акаунт заблокований', + 'Your account has been blocked.' => 'Ваш акаунт заблокований.', + 'Your account has been completely deleted' => 'Ваш акаунт повністю видалений', + 'Your account has been connected' => 'Ваш акаунт підключений', + 'Your account has been created' => 'Ваш акаунт створений', + 'Your account has been created and a message with further instructions has been sent to your email' => 'Ваш акаунт створений успішно. На Вашу електронну адресу надіслано повідомлення з подальшими інструкціями.', + 'Your account on {0} has been created' => 'Ваш акаунт на {0} створений', + 'Your confirmation token is invalid or expired' => 'Ваш підтверджуючий токен невірний або застарілий', + 'Your consent is required to register' => 'Для реєстрації необхідна Ваша згода', + 'Your email address has been changed' => 'Ваша адреса електронної пошти змінена', + 'Your password has expired, you must change it now' => 'Ваш пароль застарів, Ви маєте змінити його зараз', + 'Your personal information has been removed' => 'Ваші персональні дані видалені', + 'Your profile has been updated' => 'Ваш профіль оновлено', + 'privacy policy' => 'політика конфіденційності', + '{0, date, MMMM dd, YYYY HH:mm}' => '{0, date, MMMM dd, YYYY HH:mm}', + '{0} cannot be blank.' => '{0} не може бути порожнім.', + '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' => 'Вимкнути двофакторну аутентифікацію', + '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}' => 'Я даю згоду на обробку моїх персональних даних та на використання cookie даним сайтом. Для більш детальної інформації ознайомтесь з {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}' => 'Я даю згоду на обробку моїх персональних даних та на використання cookie даним сайтом. Для більш детальної інформації ознайомтесь з {privacyPolicy}', + 'Invalid two-factor code' => 'Невірний код двофакторної авторизації', + 'Last login' => 'Останній вхід', + 'Registration ip' => 'IP реєстрації', + 'Rule class can not be instantiated' => 'Клас Правила не може бути ініційований', + 'Rule class must extend "yii\\rbac\\Rule"' => 'Клас Правила має розширювати "yii\\rbac\\Rule"', + 'This will disable two-factor auth. Are you sure?' => 'Це вимкне двофакторну аутентифікацію. Ви впевнені?', + 'Two Factor Authentication' => 'Двофакторна аутентифікація', + 'Two factor authentication protects you against stolen credentials' => 'Двофакторна аутентифікація дає Вам додатковий захист даних авторизації', + '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. ' => 'Ми не змогли надіслати email для підтвердження Вашої електронної адреси.', + 'We have sent confirmation links to both old and new email addresses. ' => 'Ми надіслали повідомлення з підтверджуючими посиланнями на обидві Ваші електронні адреси: стару і нову.', ]; From f9d8ebaaa74f5f330eeb7df9d9c14b5d5b1c8726 Mon Sep 17 00:00:00 2001 From: Antonio Ramirez Date: Tue, 9 Jul 2019 16:24:52 +0200 Subject: [PATCH 48/51] Add credits to @kwazaro --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fe30aec..9739a7e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - Enh #269: Added help documentation to console commands (tonydspaniard) - Fix #244: Fix forced inclusion of a suggested class (tonydspaniard) - Fix user event triggering in admin controller (maxxer) + - Enh #331: Added Ukrainian translations (kwazaro) ## 1.5.0 April 19, 2019 - Fix: Fix condition in EmailChangeService (it was always false) (borisaeric) From b526cb9ccc987cb02cf94b14491bab185a06798f Mon Sep 17 00:00:00 2001 From: Marco Moreno Date: Fri, 19 Jul 2019 11:08:33 -0400 Subject: [PATCH 49/51] Added option to restrict user assignments to roles only --- CHANGELOG.md | 1 + docs/installation/configuration-options.md | 5 +++++ src/User/Module.php | 4 ++++ src/User/Widget/AssignmentsWidget.php | 19 ++++++++++++++----- 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9739a7e..0656516 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - Fix #244: Fix forced inclusion of a suggested class (tonydspaniard) - Fix user event triggering in admin controller (maxxer) - Enh #331: Added Ukrainian translations (kwazaro) + - Enh #324: Added option to restrict user assignments to roles only (CheckeredFlag) ## 1.5.0 April 19, 2019 - Fix: Fix condition in EmailChangeService (it was always false) (borisaeric) diff --git a/docs/installation/configuration-options.md b/docs/installation/configuration-options.md index 1f5148c..2a7b478 100644 --- a/docs/installation/configuration-options.md +++ b/docs/installation/configuration-options.md @@ -199,6 +199,11 @@ Configures the root directory of the view files. See [overriding views](../enhan Configures the name of the session key that will be used to hold the original admin identifier. +#### restrictUserPermissionAssignment (type: `boolean`, default: `false`) + +If `false`, allow the assignment of both roles and permissions to users. +Set to `true` to restrict user assignments to roles only. + © [2amigos](http://www.2amigos.us/) 2013-2019 diff --git a/src/User/Module.php b/src/User/Module.php index e71c65a..c7c1c2c 100644 --- a/src/User/Module.php +++ b/src/User/Module.php @@ -181,4 +181,8 @@ class Module extends BaseModule * @var integer If != NULL sets a max password age in days */ public $maxPasswordAge = null; + /** + * @var boolean whether to restrict assignment of permissions to users + */ + public $restrictUserPermissionAssignment = false; } diff --git a/src/User/Widget/AssignmentsWidget.php b/src/User/Widget/AssignmentsWidget.php index 1ef18fc..42a0931 100644 --- a/src/User/Widget/AssignmentsWidget.php +++ b/src/User/Widget/AssignmentsWidget.php @@ -15,10 +15,12 @@ use Da\User\Model\Assignment; use Da\User\Service\UpdateAuthAssignmentsService; use Da\User\Traits\AuthManagerAwareTrait; use Da\User\Traits\ContainerAwareTrait; +use Yii; use yii\base\InvalidConfigException; use yii\base\InvalidParamException; use yii\base\Widget; use yii\helpers\ArrayHelper; +use yii\rbac\Item; class AssignmentsWidget extends Widget { @@ -61,24 +63,31 @@ class AssignmentsWidget extends Widget $this->make(UpdateAuthAssignmentsService::class, [$model])->run(); } + $items[Yii::t('usuario', 'Roles')] = $this->getAvailableItems(Item::TYPE_ROLE); + if (!Yii::$app->getModule('user')->restrictUserPermissionAssignment) { + $items[Yii::t('usuario', 'Permissions')] = $this->getAvailableItems(Item::TYPE_PERMISSION); + } + return $this->render( '/widgets/assignments/form', [ 'model' => $model, - 'availableItems' => $this->getAvailableItems(), + 'availableItems' => $items, ] ); } /** - * Returns all available auth items to be attached to the user. - * + * Returns available auth items to be attached to the user. + * + * @param int|null type of auth items or null to return all + * * @return array */ - protected function getAvailableItems() + protected function getAvailableItems($type = null) { return ArrayHelper::map( - $this->getAuthManager()->getItems(), + $this->getAuthManager()->getItems($type), 'name', function ($item) { return empty($item->description) From 07a7a7bda79fa9fc1747019d4892323f85c41c55 Mon Sep 17 00:00:00 2001 From: tonydspaniard Date: Wed, 21 Aug 2019 09:25:52 +0200 Subject: [PATCH 50/51] re #322 allow failures on 7.4snapshot --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 1b409f5..ae1d77d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,7 @@ php: matrix: fast_finish: true allow_failures: + - php: 7.4snapshot - php: nightly # cache vendor dirs From 06202b3d9dabb6de9213e8031a33fec67ab10107 Mon Sep 17 00:00:00 2001 From: Antonio Ramirez Date: Wed, 21 Aug 2019 22:18:49 +0200 Subject: [PATCH 51/51] Update .travis.yml --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index ae1d77d..f97e041 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,9 @@ php: - 7.4snapshot - nightly +services: + - mysql + matrix: fast_finish: true allow_failures: