Merge branch 'refactor/recapcha-error-message-locale' into 'master'

Refactor: let reCAPTCHA error messages use translation

See merge request gitlab-org/gitlab!81977

app/models/concerns/spammable.rb

@@ -78,8 +78,9 @@ module Spammable
   end
 
   def recaptcha_error!
-    self.errors.add(:base, "Your #{spammable_entity_type} has been recognized as spam. "\
-                    "Please, change the content or solve the reCAPTCHA to proceed.")
+    self.errors.add(:base, _("Your %{spammable_entity_type} has been recognized as spam. "\
+                    "Please, change the content or solve the reCAPTCHA to proceed.") \
+                    % { spammable_entity_type: spammable_entity_type })
   end
 
   def unrecoverable_spam_error!

locale/gitlab.pot

@@ -42389,6 +42389,9 @@ msgstr ""
 msgid "Your %{plan} subscription expires on %{expiry_date}"
 msgstr ""
 
+msgid "Your %{spammable_entity_type} has been recognized as spam. Please, change the content or solve the reCAPTCHA to proceed."
+msgstr ""
+
 msgid "Your %{strong}%{plan_name}%{strong_close} subscription expires on %{strong}%{expires_on}%{strong_close}. After that date, you cannot create issues or merge requests, or use many other features."
 msgstr ""
 

spec/controllers/confirmations_controller_spec.rb

@@ -152,7 +152,7 @@ RSpec.describe ConfirmationsController do
         perform_request
 
         expect(response).to render_template(:new)
-        expect(flash[:alert]).to include 'There was an error with the reCAPTCHA. Please solve the reCAPTCHA again.'
+        expect(flash[:alert]).to include _('There was an error with the reCAPTCHA. Please solve the reCAPTCHA again.')
       end
 
       it 'successfully sends password reset when reCAPTCHA is solved' do

spec/controllers/passwords_controller_spec.rb

@@ -121,7 +121,7 @@ RSpec.describe PasswordsController do
         perform_request
 
         expect(response).to render_template(:new)
-        expect(flash[:alert]).to include 'There was an error with the reCAPTCHA. Please solve the reCAPTCHA again.'
+        expect(flash[:alert]).to include _('There was an error with the reCAPTCHA. Please solve the reCAPTCHA again.')
       end
 
       it 'successfully sends password reset when reCAPTCHA is solved' do

spec/controllers/sessions_controller_spec.rb

@@ -235,7 +235,7 @@ RSpec.describe SessionsController do
             unsuccesful_login(user_params)
 
             expect(response).to render_template(:new)
-            expect(flash[:alert]).to include 'There was an error with the reCAPTCHA. Please solve the reCAPTCHA again.'
+            expect(flash[:alert]).to include _('There was an error with the reCAPTCHA. Please solve the reCAPTCHA again.')
             expect(subject.current_user).to be_nil
           end
 
@@ -259,7 +259,7 @@ RSpec.describe SessionsController do
               unsuccesful_login(user_params, sesion_params: { failed_login_attempts: 6 })
 
               expect(response).to render_template(:new)
-              expect(flash[:alert]).to include 'There was an error with the reCAPTCHA. Please solve the reCAPTCHA again.'
+              expect(flash[:alert]).to include _('There was an error with the reCAPTCHA. Please solve the reCAPTCHA again.')
               expect(subject.current_user).to be_nil
             end
 
@@ -279,7 +279,7 @@ RSpec.describe SessionsController do
               unsuccesful_login(user_params)
 
               expect(response).to render_template(:new)
-              expect(flash[:alert]).to include 'There was an error with the reCAPTCHA. Please solve the reCAPTCHA again.'
+              expect(flash[:alert]).to include _('There was an error with the reCAPTCHA. Please solve the reCAPTCHA again.')
               expect(subject.current_user).to be_nil
             end
 

spec/features/users/signup_spec.rb

@@ -324,7 +324,7 @@ RSpec.describe 'Signup' do
         fill_in_signup_form
 
         expect { click_button 'Register' }.not_to change { User.count }
-        expect(page).to have_content('There was an error with the reCAPTCHA. Please solve the reCAPTCHA again.')
+        expect(page).to have_content(_('There was an error with the reCAPTCHA. Please solve the reCAPTCHA again.'))
       end
     end
 

spec/models/concerns/spammable_spec.rb

@@ -55,7 +55,7 @@ RSpec.describe Spammable do
         subject { invalidate_if_spam(needs_recaptcha: true) }
 
         it 'has an error related to spam on the model' do
-          expect(subject.errors.messages[:base]).to match_array /solve the reCAPTCHA/
+          expect(subject.errors.messages[:base]).to match_array /content or solve the/
         end
       end
 
@@ -63,7 +63,7 @@ RSpec.describe Spammable do
         subject { invalidate_if_spam(is_spam: true, needs_recaptcha: true) }
 
         it 'has an error related to spam on the model' do
-          expect(subject.errors.messages[:base]).to match_array /solve the reCAPTCHA/
+          expect(subject.errors.messages[:base]).to match_array /content or solve the/
         end
       end