Hexlet · fey · Feb 28, 2023 · Feb 25, 2023 · Feb 27, 2023
diff --git a/app/controllers/web/devise/registrations_controller.rb b/app/controllers/web/devise/registrations_controller.rb
@@ -10,11 +10,12 @@ class Web::Devise::RegistrationsController < Devise::RegistrationsController
   private
 
   def check_captcha
+    I18n.locale = session[:locale]
     return if verify_recaptcha
 
     self.resource = resource_class.new sign_up_params
     resource.validate
-    resource.errors.add(:base, t('recaptcha.errors.verification_failed')) unless resource.errors.any?
+    resource.errors.add(:base, t('recaptcha.errors.verification_failed', locale: I18n.locale)) unless resource.errors.any?
     set_minimum_password_length
     respond_with_navigational(resource) do
       f(:recaptcha_error, discard: true)

diff --git a/app/views/devise/confirmations/new.html.slim b/app/views/devise/confirmations/new.html.slim
@@ -1,7 +1,7 @@
 h2
   = t('.resend_confirmation_instructions')
 = simple_form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f|
-  = f.error_notification
+  = f.error_notification message: t('devise.correct_errors')
   = f.full_error :confirmation_token
   .form-inputs
     = f.input :email, required: true, autofocus: true,

diff --git a/app/views/devise/passwords/edit.html.slim b/app/views/devise/passwords/edit.html.slim
@@ -1,7 +1,7 @@
 h2
   = t('.change_your_password')
 = simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f|
-  = f.error_notification
+  = f.error_notification message: t('devise.correct_errors')
   = f.input :reset_password_token, as: :hidden
   = f.full_error :reset_password_token
   .form-inputs

diff --git a/app/views/devise/passwords/new.html.slim b/app/views/devise/passwords/new.html.slim
@@ -1,7 +1,7 @@
 h2
   = t('.forgot_your_password')
 = simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f|
-  = f.error_notification
+  = f.error_notification message: t('devise.correct_errors')
   .form-inputs
     = f.input :email, required: true, autofocus: true, input_html: { autocomplete: 'email' }
   .form-actions

diff --git a/app/views/devise/registrations/edit.html.slim b/app/views/devise/registrations/edit.html.slim
@@ -1,7 +1,7 @@
 h2
   = t('.title', resource: resource.model_name.human)
 = simple_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f|
-  = f.error_notification
+  = f.error_notification message: t('devise.correct_errors')
   .form-inputs
     = f.input :email, required: true, autofocus: true
     - if devise_mapping.confirmable? && resource.pending_reconfirmation?

diff --git a/app/views/devise/registrations/new.html.slim b/app/views/devise/registrations/new.html.slim
@@ -1,7 +1,7 @@
 h2
   = t('.sign_up')
 = simple_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f|
-  = f.error_notification
+  = f.error_notification message: t('devise.correct_errors')
   .form-inputs
     .mb-3
       = f.input :email, required: true, autofocus: true, input_html: { autocomplete: 'email' }

diff --git a/app/views/devise/unlocks/new.html.slim b/app/views/devise/unlocks/new.html.slim
@@ -1,7 +1,7 @@
 h2
   = t('.resend_unlock_instructions')
 = simple_form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f|
-  = f.error_notification
+  = f.error_notification message: t('devise.correct_errors')
   = f.full_error :unlock_token
   .form-inputs
     = f.input :email, required: true, autofocus: true, input_html: { autocomplete: 'email' }

diff --git a/app/views/layouts/devise.html.slim b/app/views/layouts/devise.html.slim
@@ -1,5 +1,5 @@
 doctype html
-html.h-100 lang="en"
+html.h-100 lang="#{I18n.locale}"
   head
     = render 'layouts/shared/head'
   body.d-flex.flex-column.h-100

diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml
@@ -2,6 +2,7 @@
 
 en:
   devise:
+    correct_errors: "please, correct the mistakes:"
     failure:
       user:
         banned: "You have been banned"

diff --git a/config/locales/devise.ru.yml b/config/locales/devise.ru.yml
@@ -1,5 +1,9 @@
 ru:
   devise:
+    correct_errors: "Пожалуйста, исправьте ошибки:"
     failure:
       user:
         banned: "Вы были забанены"
+        not_found_in_database: Не верный логин или пароль.
+        invalid: Не правильный логин или пароль.
+        unauthenticated: Вам необходимо войти в систему или зарегистрироваться.
diff --git a/config/locales/en.activerecord.yml b/config/locales/en.activerecord.yml
@@ -71,6 +71,7 @@ en:
         name: Name
         company: Company
       user:
+        password: password
         resume_answer_likes_count: Likes
         first_name: First name
         last_name: Surname

diff --git a/config/locales/ru.activerecord.yml b/config/locales/ru.activerecord.yml
@@ -27,6 +27,7 @@ ru:
       answer/comment: Комментарий
     attributes:
       user:
+        password: пароль
         resume_answer_likes_count: Количество лайков
         first_name: Имя
         last_name: Фамилия