leonardo/yii2-usuario
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
resurtm
2017-01-11 22:42:15 +06:00
parent a3434504e6
commit 1cb60f0740
78 changed files with 354 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/User/Form/LoginForm.php
View File

@ -65,9 +65,9 @@ class LoginForm extends Model
public function attributeLabels()
{
return [
'login' => Yii::t('user', 'Login'),
'password' => Yii::t('user', 'Password'),
'rememberMe' => Yii::t('user', 'Remember me next time'),
'login' => Yii::t('usuario', 'Login'),
'password' => Yii::t('usuario', 'Password'),
'rememberMe' => Yii::t('usuario', 'Remember me next time'),
];
}
@ -85,7 +85,7 @@ class LoginForm extends Model
if ($this->user === null ||
!$this->securityHelper->validatePassword($this->password, $this->user->password_hash)
) {
$this->addError($attribute, Yii::t('user', 'Invalid login or password'));
$this->addError($attribute, Yii::t('usuario', 'Invalid login or password'));
}
},
],
@ -96,10 +96,10 @@ class LoginForm extends Model
$module = $this->getModule();
$confirmationRequired = $module->enableEmailConfirmation && !$module->allowUnconfirmedEmailLogin;
if ($confirmationRequired && !$this->user->getIsConfirmed()) {
$this->addError($attribute, Yii::t('user', 'You need to confirm your email address'));
$this->addError($attribute, Yii::t('usuario', 'You need to confirm your email address'));
}
if ($this->user->getIsBlocked()) {
$this->addError($attribute, Yii::t('user', 'Your account has been blocked'));
$this->addError($attribute, Yii::t('usuario', 'Your account has been blocked'));
}
}
},

4
lib/User/Form/RecoveryForm.php
View File

@ -52,8 +52,8 @@ class RecoveryForm extends Model
public function attributeLabels()
{
return [
'email' => Yii::t('user', 'Email'),
'password' => Yii::t('user', 'Password'),
'email' => Yii::t('usuario', 'Email'),
'password' => Yii::t('usuario', 'Password'),
];
}

10
lib/User/Form/RegistrationForm.php
View File

@ -53,7 +53,7 @@ class RegistrationForm extends Model
'username',
'unique',
'targetClass' => $user,
'message' => Yii::t('user', 'This username has already been taken'),
'message' => Yii::t('usuario', 'This username has already been taken'),
],
// email rules
'emailTrim' => ['email', 'filter', 'filter' => 'trim'],
@ -63,7 +63,7 @@ class RegistrationForm extends Model
'email',
'unique',
'targetClass' => $user,
'message' => Yii::t('user', 'This email address has already been taken'),
'message' => Yii::t('usuario', 'This email address has already been taken'),
],
// password rules
'passwordRequired' => ['password', 'required', 'skipOnEmpty' => $this->module->generatePasswords],
@ -77,9 +77,9 @@ class RegistrationForm extends Model
public function attributeLabels()
{
return [
'email' => Yii::t('user', 'Email'),
'username' => Yii::t('user', 'Username'),
'password' => Yii::t('user', 'Password'),
'email' => Yii::t('usuario', 'Email'),
'username' => Yii::t('usuario', 'Username'),
'password' => Yii::t('usuario', 'Password'),
];
}
}

2
lib/User/Form/ResendForm.php
View File

@ -53,7 +53,7 @@ class ResendForm extends Model
public function attributeLabels()
{
return [
'email' => Yii::t('user', 'Email'),
'email' => Yii::t('usuario', 'Email'),
];
}
}

10
lib/User/Form/SettingsForm.php
View File

@ -81,7 +81,7 @@ class SettingsForm extends Model
'current_password',
function ($attribute) {
if (!$this->securityHelper->validatePassword($this->$attribute, $this->getUser()->password_hash)) {
$this->addError($attribute, Yii::t('user', 'Current password is not valid'));
$this->addError($attribute, Yii::t('usuario', 'Current password is not valid'));
}
},
],
@ -94,10 +94,10 @@ class SettingsForm extends Model
public function attributeLabels()
{
return [
'email' => Yii::t('user', 'Email'),
'username' => Yii::t('user', 'Username'),
'new_password' => Yii::t('user', 'New password'),
'current_password' => Yii::t('user', 'Current password'),
'email' => Yii::t('usuario', 'Email'),
'username' => Yii::t('usuario', 'Username'),
'new_password' => Yii::t('usuario', 'New password'),
'current_password' => Yii::t('usuario', 'Current password'),
];
}