Merge branch 'master' of github.com:webvimark/user-management

dtmonterrey · dtmonterrey · commit 817452e34c8a · 2015-06-30T22:12:18.000+01:00
Conflicts:
	messages/config.php
diff --git a/messages/cs/back.php b/messages/cs/back.php
@@ -19,6 +19,7 @@
 return [
     'Active' => '',
     'Are you sure you want to delete this user?' => '',
+    'Banned' => '',
     'Bind to IP' => '',
     'Browser' => '',
     'Change own password' => '',
diff --git a/messages/cs/front.php b/messages/cs/front.php
@@ -23,6 +23,7 @@
     'Check your e-mail {email} for instructions to activate account' => '',
     'Confirm' => '',
     'Confirm E-mail' => '',
+    'Continue' => '',
     'Could not send confirmation email' => '',
     'E-mail confirmation for' => '',
     'E-mail confirmed' => '',
diff --git a/messages/de/back.php b/messages/de/back.php
@@ -17,17 +17,22 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
+    'Banned' => '',
+    'Browser' => '',
+    'Code' => '',
+    'E-mail with activation link has been sent to <b>{email}</b>. This link will expire in {minutes} min.' => '',
+    'Login' => '',
+    'Name' => '',
+    'Status' => '',
     'Active' => 'Aktiv',
     'Are you sure you want to delete this user?' => 'Wollen Sie diesen Benutzer wirklich löschen?',
     'Bind to IP' => 'An IP binden',
-    'Browser' => '',
     'Change own password' => 'Eigenes Passwort ändern',
     'Change password' => 'Passwort ändern',
     'Changing password' => 'Ändere Passwort',
     'Changing password for user: ' => 'Ändere Passwort von Benutzer: ',
     'Child permissions' => 'Kind-Berechtigungen',
     'Child roles' => 'Kind-Rollen',
-    'Code' => '',
     'Create' => 'Erstellen',
     'Created' => 'Erstellt',
     'Creating permission group' => 'Erstelle Berechtigungs-Gruppe',
@@ -36,7 +41,6 @@
     'Delete' => 'Löschen',
     'Description' => 'Beschreibung',
     'E-mail confirmed' => 'E-Mail bestätigt',
-    'E-mail with activation link has been sent to <b>{email}</b>. This link will expire in {minutes} min.' => '',
     'Edit' => 'Bearbeiten',
     'Editing' => 'Bearbeite',
     'Editing permission group' => 'Bearbeite Berechtigungs-Gruppe',
@@ -47,8 +51,6 @@
     'Group' => 'Gruppe',
     'Inactive' => 'Inaktiv',
     'Language' => 'Sprache',
-    'Login' => '',
-    'Name' => '',
     'OS' => 'Betriebssystem',
     'Password' => 'Passwort',
     'Password has been changed' => 'Passwort wurde geändert',
@@ -69,7 +71,6 @@
     'Saved' => 'Gespeichert',
     'Search' => 'Suchen',
     'Settings for permission' => 'Einstellungen für Berechtigung',
-    'Status' => '',
     'Superadmin' => 'Super-Administrator',
     'Too many attempts' => 'Zu viele Versuche',
     'Type' => 'Typ',
diff --git a/messages/de/front.php b/messages/de/front.php
@@ -18,14 +18,14 @@
  */
 return [
     'Captcha' => '',
-    'Check your e-mail {email} for instructions to activate account' => 'Überprüfen Sie Ihre E-Mail-Adresse {email} für weitere Anweisungen zur Kontoaktivierung',
-    'Could not send confirmation email' => 'E-Mail zur Kontoaktivierung konnte nicht versandt werden',
+    'Continue' => 'Fortsetzen',
     'Login' => '',
-    'Registration - confirm your e-mail' => 'Registrierung - bestätigen Sie Ihre E-Mail-Adresse',
     'Authorization' => 'Autorisierung',
     'Check your E-mail for further instructions' => 'Überprüfen Sie Ihre E-Mail-Adresse für weitere Anweisungen',
+    'Check your e-mail {email} for instructions to activate account' => 'Überprüfen Sie Ihre E-Mail-Adresse {email} für weitere Anweisungen zur Kontoaktivierung',
     'Confirm' => 'Bestätigen',
     'Confirm E-mail' => 'E-Mail bestätigen',
+    'Could not send confirmation email' => 'E-Mail zur Kontoaktivierung konnte nicht versandt werden',
     'E-mail confirmation for' => 'E-Mail-Bestätigung für',
     'E-mail confirmed' => 'E-Mail bestätigt',
     'E-mail is invalid' => 'E-Mail ist ungültig',
@@ -38,6 +38,7 @@
     'Recover' => 'Wiederherstellen',
     'Register' => 'Registrieren',
     'Registration' => 'Registrierung',
+    'Registration - confirm your e-mail' => 'Registrierung - bestätigen Sie Ihre E-Mail-Adresse',
     'Remember me' => 'Login merken',
     'Repeat password' => 'Passwort wiederholen',
     'This E-mail already exists' => 'Diese E-Mail existiert bereits',
diff --git a/messages/ko-KR/back.php b/messages/ko-KR/back.php
@@ -17,6 +17,7 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
+    'Banned' => '',
     'Active' => '활성',
     'Are you sure you want to delete this user?' => '이 사용자를 삭제하시겠습니까?',
     'Bind to IP' => '아이피에 바인드',
diff --git a/messages/ko-KR/front.php b/messages/ko-KR/front.php
@@ -17,12 +17,13 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'Captcha' => '',
-    'Check your e-mail {email} for instructions to activate account' => '',
-    'Could not send confirmation email' => '',
-    'Login' => '',
-    'Registration - confirm your e-mail' => '',
-    'Authorization' => 'Authorisierung',
+    'Captcha' => '보안 문자',
+    'Check your e-mail {email} for instructions to activate account' => '계정을 활성화 하기위한 지침은 전자 메일 { 이메일을 확인 }',
+    'Continue' => '계속',
+    'Could not send confirmation email' => '확인 이메일을 보낼 수 없습니다',
+    'Login' => '로그인',
+    'Registration - confirm your e-mail' => '등록 - 귀하의 E-mail 확인',
+    'Authorization' => '권한 부여',
     'Check your E-mail for further instructions' => '다음에 따라 이메일을 체크해주세요',
     'Confirm' => '확인',
     'Confirm E-mail' => 'E-Mail 확인',
diff --git a/messages/pt-BR/back.php b/messages/pt-BR/back.php
@@ -17,6 +17,8 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
+    'Banned' => '',
+    'Superadmin' => '',
     'Active' => 'Ativo',
     'Are you sure you want to delete this user?' => 'Você tem certeza de que deseja excluir este usuário?',
     'Bind to IP' => 'Vincular a IP',
@@ -36,7 +38,7 @@
     'Delete' => 'Excluir',
     'Description' => 'Descrição',
     'E-mail confirmed' => 'E-mail confirmado',
-    'E-mail with activation link has been sent to <b>{email}</b>. This link will expire in {minutes} min.' =>'Um e-mail com o link de ativação foi enviado para <b>{email}</b>. Este link irá expirar em {minutes} minutos.',
+    'E-mail with activation link has been sent to <b>{email}</b>. This link will expire in {minutes} min.' => 'Um e-mail com o link de ativação foi enviado para <b>{email}</b>. Este link irá expirar em {minutes} minutos.',
     'Edit' => 'Editar',
     'Editing' => 'Editando',
     'Editing permission group' => 'Editando grupo de permissões',
@@ -70,7 +72,6 @@
     'Search' => 'Buscar',
     'Settings for permission' => 'Configurações de permissões',
     'Status' => 'Status',
-    'Superadmin' => '',
     'Too many attempts' => 'Muitas tentativas',
     'Type' => 'Tipo',
     'Updated' => 'Atualizado',
diff --git a/messages/pt-BR/front.php b/messages/pt-BR/front.php
@@ -18,26 +18,27 @@
  */
 return [
     'Captcha' => '',
-    'Check your e-mail {email} for instructions to activate account' => 'Verifique seu e-mail {mail} para obter instruções para ativar a conta',
-    'Could not send confirmation email' => 'Não foi possível enviar email de confirmação',
-    'Login' => 'Usuário',
-    'Registration - confirm your e-mail' => 'Registro - Confirmar seu e-mail',
+    'Continue' => 'Continuar',
     'Authorization' => 'Autorização',
     'Check your E-mail for further instructions' => 'Verifique seu e-mail para maiores instruções',
+    'Check your e-mail {email} for instructions to activate account' => 'Verifique seu e-mail {mail} para obter instruções para ativar a conta',
     'Confirm' => 'Confirmar',
     'Confirm E-mail' => 'Confirmar E-mail',
+    'Could not send confirmation email' => 'Não foi possível enviar email de confirmação',
     'E-mail confirmation for' => 'Confirmação de e-mail para',
     'E-mail confirmed' => 'E-mail confirmado',
     'E-mail is invalid' => 'E-mail inválido',
     'Forgot password ?' => 'Esqueceu a senha?',
     'Incorrect username or password.' => 'Nome do usuário ou senha incorreta.',
+    'Login' => 'Usuário',
     'Login has been taken' => 'Este login já existe',
     'Password' => 'Senha',
     'Password recovery' => 'Recuperação de senha',
     'Password reset for' => 'Redefinição de senha para',
     'Recover' => 'Recuperar',
     'Register' => 'Registrar',
     'Registration' => 'Registro',
+    'Registration - confirm your e-mail' => 'Registro - Confirmar seu e-mail',
     'Remember me' => 'Lembrar',
     'Repeat password' => 'Repita a senha',
     'This E-mail already exists' => 'Este E-mail já existe',
diff --git a/messages/ru/back.php b/messages/ru/back.php
@@ -17,7 +17,7 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'Saved' => 'Сохранено',
+    'Banned' => '',
     'Active' => 'Активен',
     'Are you sure you want to delete this user?' => 'Вы уверены, что хотите удалить этого пользователя ?',
     'Bind to IP' => 'Привязать к IP',
@@ -67,6 +67,7 @@
     'Roles and permissions for user:' => 'Роли и права для пользователя',
     'Rule' => 'Правило',
     'Save' => 'Сохранить',
+    'Saved' => 'Сохранено',
     'Search' => 'Поиск',
     'Settings for permission' => 'Настройки для права',
     'Status' => 'Статус',
diff --git a/messages/ru/front.php b/messages/ru/front.php
@@ -17,14 +17,14 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'Check your e-mail {email} for instructions to activate account' => 'Проверьте Ваш e-mail {email} для активации аккаунта',
-    'Could not send confirmation email' => 'Не удалось отправить e-mail для активации аккаунта',
-    'Registration - confirm your e-mail' => 'Регистрация - подтверждение аккаунта',
+    'Continue' => 'Продолжить',
     'Authorization' => 'Авторизация',
     'Captcha' => 'Каптча',
     'Check your E-mail for further instructions' => 'Проверьте Ваш E-mail для дальнейших инструкций',
+    'Check your e-mail {email} for instructions to activate account' => 'Проверьте Ваш e-mail {email} для активации аккаунта',
     'Confirm' => 'Подтвердить',
     'Confirm E-mail' => 'Подтвердить E-mail',
+    'Could not send confirmation email' => 'Не удалось отправить e-mail для активации аккаунта',
     'E-mail confirmation for' => 'Подтверждение E-mail для',
     'E-mail confirmed' => 'E-mail подтверждён',
     'E-mail is invalid' => 'Неверный E-mail',
@@ -38,6 +38,7 @@
     'Recover' => 'Восстановить',
     'Register' => 'Регистрация',
     'Registration' => 'Регистрация',
+    'Registration - confirm your e-mail' => 'Регистрация - подтверждение аккаунта',
     'Remember me' => 'Запомнить меня',
     'Repeat password' => 'Повторите пароль',
     'This E-mail already exists' => 'Такой E-mail уже существыет',
diff --git a/views/auth/confirmEmailSuccess.php b/views/auth/confirmEmailSuccess.php
@@ -1,6 +1,7 @@
 <?php
 
 use webvimark\modules\UserManagement\UserManagementModule;
+use yii\helpers\Html;
 
 /**
  * @var yii\web\View $this
@@ -14,6 +15,12 @@
 
 	<div class="alert alert-success text-center">
 		<?= UserManagementModule::t('front', 'E-mail confirmed') ?> - <b><?= $user->email ?></b>
+
+		<?php if ( isset($_GET['returnUrl']) ): ?>
+			<br/>
+			<br/>
+			<b><?= Html::a(UserManagementModule::t('front', 'Continue'), $_GET['returnUrl']) ?></b>
+		<?php endif; ?>
 	</div>
 
 </div>
diff --git a/views/mail/registrationEmailConfirmation.php b/views/mail/registrationEmailConfirmation.php
@@ -7,7 +7,9 @@
 
 ?>
 <?php
-$confirmLink = Yii::$app->urlManager->createAbsoluteUrl(['/user-management/auth/confirm-registration-email', 'token' => $user->confirmation_token]);
+$returnUrl = Yii::$app->user->returnUrl == Yii::$app->homeUrl ? null : rtrim(Yii::$app->homeUrl, '/') . Yii::$app->user->returnUrl;
+
+$confirmLink = Yii::$app->urlManager->createAbsoluteUrl(['/user-management/auth/confirm-registration-email', 'token' => $user->confirmation_token, 'returnUrl'=>$returnUrl]);
 ?>
 
 Hello, you have been registered on <?= Yii::$app->urlManager->hostInfo ?>
