1
0
mirror of https://github.com/monstra-cms/monstra.git synced 2025-08-01 10:50:37 +02:00

Merge pull request #40 from stanislavsky/dev

Dev
This commit is contained in:
Sergey Romaneko
2012-10-21 13:26:31 -07:00
4 changed files with 8 additions and 9 deletions

View File

@@ -19,8 +19,8 @@
'New User Registration' => 'New User Registration',
'Delete user: :user' => 'Delete user: :user',
'User <i>:user</i> have been deleted.' => 'User <i>:user</i> have been deleted.',
'This field should not be empty' => 'This field should not be empty',
'This user alredy exist' => 'This user alredy exist',
'This user already exists' => 'This user already exists',
'This email already exists' => 'This email already exists',
'Changes saved' => 'Changes saved',
'Wrong old password' => 'Wrong old password',
'Admin' => 'Admin',

View File

@@ -18,8 +18,8 @@
'Register new user' => 'Crea un account',
'Delete user: :user' => 'Elimina utente: :user',
'User <i>:user</i> have been deleted.' => 'Utente <i>:user</i> è stato eliminato.',
'This field should not be empty' => 'Questo campo non può essere vuoto',
'This user alredy exist' => 'Questo utente è già esistente',
'This user already exists' => 'Questo utente è già esistente',
'This email already exists' => 'Questa email è già esistente',
'Changes saved' => 'Le modifiche sono state salvate',
'Wrong old password' => 'Vecchia password errata',
'Admin' => 'Amministratore',

View File

@@ -18,8 +18,8 @@
'Register new user' => 'Регистрация нового пользователя',
'Delete user: :user' => 'Удалить пользователя: :user',
'User <i>:user</i> have been deleted.' => 'Пользователь <i>:user</i> удален.',
'This field should not be empty' => 'Это поле не должно быть пустым',
'This user alredy exist' => 'Такой пользователь уже существует',
'This user already exists' => 'Такой пользователь уже существует',
'This email already exists' => 'Такая эл. почта уже существует',
'Changes saved' => 'Изменения сохранены',
'Wrong old password' => 'Неправильный старый пароль',
'Admin' => 'Администратор',
@@ -42,7 +42,6 @@
'User email is invalid' => 'Эл. почта является недействительной',
'Reset Password' => 'Сбросить пароль',
'Send New Password' => 'Отправить пароль',
'This user doesnt alredy exist' => 'Такого пользователя не существует',
'Users - Profile' => 'Пользователи - Профиль',
'Users - Edit Profile' => 'Пользователи - Редактирование профиля',
'Users - Login' => 'Пользователи - Вход',

View File

@@ -90,8 +90,8 @@
if ($user_login == '') $errors['users_empty_login'] = __('Required field', 'users');
if ($user_password == '') $errors['users_empty_password'] = __('Required field', 'users');
if ($user_email == '') $errors['users_empty_email'] = __('Required field', 'users');
if ($users->select("[login='".$user_login."']")) $errors['users_this_user_alredy_exists'] = __('This user alredy exist', 'users');
if ($users->select("[email='".$user_email."']")) $errors['users_this_email_alredy_exists'] = __('This email alredy exist', 'users');
if ($users->select("[login='".$user_login."']")) $errors['users_this_user_already_exists'] = __('This user already exists', 'users');
if ($users->select("[email='".$user_email."']")) $errors['users_this_email_already_exists'] = __('This email already exists', 'users');
if (count($errors) == 0) {
$users->insert(array('login' => Security::safeName($user_login),