diff --git a/config/locales/activerecord/en.yml b/config/locales/activerecord/en.yml index c3800f8..8ee979e 100644 --- a/config/locales/activerecord/en.yml +++ b/config/locales/activerecord/en.yml @@ -4,6 +4,9 @@ en: membership_application: one: Membership application other: Membership applications + user: + one: User + other: Users attributes: membership_application: first_name: First name @@ -16,3 +19,27 @@ en: telegram_username: Telegram username organization_membership: Membership in other social organizations comment: Comment + user: + confirmation_sent_at: Confirmation sent at + confirmation_token: Confirmation token + confirmed_at: Confirmed at + created_at: Created at + current_password: Current password + current_sign_in_at: Current sign in at + current_sign_in_ip: Current sign in IP + email: Email + encrypted_password: Encrypted password + failed_attempts: Failed attempts + last_sign_in_at: Last sign in at + last_sign_in_ip: Last sign in IP + locked_at: Locked at + password: Password + password_confirmation: Password confirmation + remember_created_at: Remember created at + remember_me: Remember me + reset_password_sent_at: Reset password sent at + reset_password_token: Reset password token + sign_in_count: Sign in count + unconfirmed_email: Unconfirmed email + unlock_token: Unlock token + updated_at: Updated at diff --git a/config/locales/activerecord/ru.yml b/config/locales/activerecord/ru.yml index 5d3167f..cad4dfb 100644 --- a/config/locales/activerecord/ru.yml +++ b/config/locales/activerecord/ru.yml @@ -4,6 +4,9 @@ ru: membership_application: one: Заявление на вступление other: Заявления на вступление + user: + one: Пользователь + other: Пользователи attributes: membership_application: first_name: Имя @@ -16,3 +19,27 @@ ru: telegram_username: Имя пользователя в Telegram organization_membership: Членство в других общественных организациях comment: Комментарий + user: + confirmation_sent_at: Дата отправки подтверждения + confirmation_token: Токен подтверждения + confirmed_at: Дата подтверждения + created_at: Дата создания + current_password: Текущий пароль + current_sign_in_at: Дата текущего входа + current_sign_in_ip: IP текущего входа + email: Email + encrypted_password: Зашифрованный пароль + failed_attempts: Неудачные попытки + last_sign_in_at: Дата последнего входа + last_sign_in_ip: IP последнего входа + locked_at: Дата блокировки + password: Пароль + password_confirmation: Подтверждение пароля + remember_created_at: Дата создания запоминания + remember_me: Запомнить меня + reset_password_sent_at: Дата отправки сброса пароля + reset_password_token: Токен сброса пароля + sign_in_count: Количество входов + unconfirmed_email: Неподтвержденный email + unlock_token: Токен разблокировки + updated_at: Дата обновления diff --git a/config/locales/devise/en.yml b/config/locales/devise/en.yml index 4270a58..19770a5 100644 --- a/config/locales/devise/en.yml +++ b/config/locales/devise/en.yml @@ -1,34 +1,4 @@ en: - activerecord: - attributes: - user: - confirmation_sent_at: Confirmation sent at - confirmation_token: Confirmation token - confirmed_at: Confirmed at - created_at: Created at - current_password: Current password - current_sign_in_at: Current sign in at - current_sign_in_ip: Current sign in IP - email: Email - encrypted_password: Encrypted password - failed_attempts: Failed attempts - last_sign_in_at: Last sign in at - last_sign_in_ip: Last sign in IP - locked_at: Locked at - password: Password - password_confirmation: Password confirmation - remember_created_at: Remember created at - remember_me: Remember me - reset_password_sent_at: Reset password sent at - reset_password_token: Reset password token - sign_in_count: Sign in count - unconfirmed_email: Unconfirmed email - unlock_token: Unlock token - updated_at: Updated at - models: - user: - one: User - other: Users users: confirmations: confirmed: Your email address has been successfully confirmed. diff --git a/config/locales/devise/ru.yml b/config/locales/devise/ru.yml index 2214684..bdf2644 100644 --- a/config/locales/devise/ru.yml +++ b/config/locales/devise/ru.yml @@ -1,32 +1,4 @@ ru: - activerecord: - attributes: - user: - confirmation_sent_at: "Дата отправки подтверждения" - confirmation_token: "Токен подтверждения" - confirmed_at: "Дата подтверждения" - created_at: "Дата создания" - current_password: "Текущий пароль" - current_sign_in_at: "Дата текущего входа" - current_sign_in_ip: IP текущего входа - email: Email - encrypted_password: "Зашифрованный пароль" - failed_attempts: "Неудачные попытки" - last_sign_in_at: "Дата последнего входа" - last_sign_in_ip: IP последнего входа - locked_at: "Дата блокировки" - password: "Пароль" - password_confirmation: "Подтверждение пароля" - remember_created_at: "Дата создания запоминания" - remember_me: "Запомнить меня" - reset_password_sent_at: "Дата отправки сброса пароля" - reset_password_token: "Токен сброса пароля" - sign_in_count: "Количество входов" - unconfirmed_email: "Неподтвержденный email" - unlock_token: "Токен разблокировки" - updated_at: "Дата обновления" - models: - user: "Пользователь" users: confirmations: confirmed: "Ваш адрес эл. почты успешно подтвержден."