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

10
lib/User/Model/AbstractAuthItem.php
View File

@ -71,10 +71,10 @@ abstract class AbstractAuthItem extends Model
public function attributeLabels()
{
return [
'name' => Yii::t('user', 'Name'),
'description' => Yii::t('user', 'Description'),
'children' => Yii::t('user', 'Children'),
'rule' => Yii::t('user', 'Rule'),
'name' => Yii::t('usuario', 'Name'),
'description' => Yii::t('usuario', 'Description'),
'children' => Yii::t('usuario', 'Children'),
'rule' => Yii::t('usuario', 'Rule'),
];
}
@ -103,7 +103,7 @@ abstract class AbstractAuthItem extends Model
'name',
function () {
if ($this->getAuthManager()->getItem($this->name) !== null) {
$this->addError('name', Yii::t('user', 'Auth item with such name already exists'));
$this->addError('name', Yii::t('usuario', 'Auth item with such name already exists'));
}
},
'when' => function () {

2
lib/User/Model/Assignment.php
View File

@ -47,7 +47,7 @@ class Assignment extends Model
public function attributeLabels()
{
return [
'items' => Yii::t('user', 'Items'),
'items' => Yii::t('usuario', 'Items'),
];
}

16
lib/User/Model/Profile.php
View File

@ -73,7 +73,7 @@ class Profile extends ActiveRecord
'timezone',
function ($attribute) {
if ($this->make(TimeZoneValidator::class, [$attribute])->validate()) {
$this->addError($attribute, Yii::t('user', 'Time zone is not valid'));
$this->addError($attribute, Yii::t('usuario', 'Time zone is not valid'));
}
},
],
@ -94,13 +94,13 @@ class Profile extends ActiveRecord
public function attributeLabels()
{
return [
'name' => Yii::t('user', 'Name'),
'public_email' => Yii::t('user', 'Email (public)'),
'gravatar_email' => Yii::t('user', 'Gravatar email'),
'location' => Yii::t('user', 'Location'),
'website' => Yii::t('user', 'Website'),
'bio' => Yii::t('user', 'Bio'),
'timezone' => Yii::t('user', 'Time zone'),
'name' => Yii::t('usuario', 'Name'),
'public_email' => Yii::t('usuario', 'Email (public)'),
'gravatar_email' => Yii::t('usuario', 'Gravatar email'),
'location' => Yii::t('usuario', 'Location'),
'website' => Yii::t('usuario', 'Website'),
'bio' => Yii::t('usuario', 'Bio'),
'timezone' => Yii::t('usuario', 'Time zone'),
];
}

18
lib/User/Model/User.php
View File

@ -114,13 +114,13 @@ class User extends ActiveRecord implements IdentityInterface
public function attributeLabels()
{
return [
'username' => Yii::t('user', 'Username'),
'email' => Yii::t('user', 'Email'),
'registration_ip' => Yii::t('user', 'Registration ip'),
'unconfirmed_email' => Yii::t('user', 'New email'),
'password' => Yii::t('user', 'Password'),
'created_at' => Yii::t('user', 'Registration time'),
'confirmed_at' => Yii::t('user', 'Confirmation time'),
'username' => Yii::t('usuario', 'Username'),
'email' => Yii::t('usuario', 'Email'),
'registration_ip' => Yii::t('usuario', 'Registration ip'),
'unconfirmed_email' => Yii::t('usuario', 'New email'),
'password' => Yii::t('usuario', 'Password'),
'created_at' => Yii::t('usuario', 'Registration time'),
'confirmed_at' => Yii::t('usuario', 'Confirmation time'),
];
}
@ -155,7 +155,7 @@ class User extends ActiveRecord implements IdentityInterface
'usernameUnique' => [
'username',
'unique',
'message' => Yii::t('user', 'This username has already been taken'),
'message' => Yii::t('usuario', 'This username has already been taken'),
],
// email rules
@ -165,7 +165,7 @@ class User extends ActiveRecord implements IdentityInterface
'emailUnique' => [
'email',
'unique',
'message' => Yii::t('user', 'This email address has already been taken'),
'message' => Yii::t('usuario', 'This email address has already been taken'),
],
'emailTrim' => ['email', 'trim'],