From f95d5d463991b6191a6abf3881654d38f5004414 Mon Sep 17 00:00:00 2001
From: decabeza <alberto@decabeza.es>
Date: Fri, 22 Dec 2017 12:32:34 +0100
Subject: [PATCH] improves generic error message

---
 app/views/shared/_errors.html.erb | 2 +-
 config/locales/en/devise.yml      | 4 ++--
 config/locales/en/general.yml     | 2 +-
 config/locales/es/devise.yml      | 4 ++--
 config/locales/es/general.yml     | 2 +-
 spec/support/common_actions.rb    | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/views/shared/_errors.html.erb b/app/views/shared/_errors.html.erb
index eab4906ed..3fe7d16c6 100644
--- a/app/views/shared/_errors.html.erb
+++ b/app/views/shared/_errors.html.erb
@@ -10,7 +10,7 @@
       <% if local_assigns[:message].present? %>
         <%= message %>
       <% else %>
-        <%= t("form.not_saved", resource: t("form.#{resource.class.to_s.underscore}")) %>
+        <%= t("form.not_saved_html", resource: t("form.#{resource.class.to_s.underscore}")) %>
       <% end %>
     </strong>
   </div>
diff --git a/config/locales/en/devise.yml b/config/locales/en/devise.yml
index c6d146f7a..7be2fefba 100644
--- a/config/locales/en/devise.yml
+++ b/config/locales/en/devise.yml
@@ -65,6 +65,6 @@ en:
       not_found: "not found."
       not_locked: "was not locked."
       not_saved:
-        one: "1 error prevented this %{resource} from being saved:"
-        other: "%{count} errors prevented this %{resource} from being saved:"
+        one: "1 error prevented this %{resource} from being saved. Please check the marked fields to know how to correct them:"
+        other: "%{count} errors prevented this %{resource} from being saved. Please check the marked fields to know how to correct them:"
       equal_to_current_password: "must be different than the current password."
\ No newline at end of file
diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml
index b0c5141a7..4555d6620 100644
--- a/config/locales/en/general.yml
+++ b/config/locales/en/general.yml
@@ -171,7 +171,7 @@ en:
     direct_message: private message
     error: error
     errors: errors
-    not_saved: 'prevented this %{resource} from being saved:'
+    not_saved_html: "prevented this %{resource} from being saved. <br>Please check the marked fields to know how to correct them:"
     policy: Privacy Policy
     proposal: Proposal
     proposal_notification: "Notification"
diff --git a/config/locales/es/devise.yml b/config/locales/es/devise.yml
index 103b33243..4b6983051 100644
--- a/config/locales/es/devise.yml
+++ b/config/locales/es/devise.yml
@@ -60,6 +60,6 @@ es:
       not_found: "no se ha encontrado."
       not_locked: "no estaba bloqueado."
       not_saved:
-        one: "1 error impidió que este %{resource} fuera guardado:"
-        other: "%{count} errores impidieron que este %{resource} fuera guardado:"
+        one: "1 error impidió que este %{resource} fuera guardado. Por favor revisa los campos marcados para saber cómo corregirlos:"
+        other: "%{count} errores impidieron que este %{resource} fuera guardado. Por favor revisa los campos marcados para saber cómo corregirlos:"
       equal_to_current_password: "debe ser diferente a la contraseña actual"
diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml
index 814febf8f..284d20487 100644
--- a/config/locales/es/general.yml
+++ b/config/locales/es/general.yml
@@ -171,7 +171,7 @@ es:
     direct_message: el mensaje privado
     error: error
     errors: errores
-    not_saved: 'impidieron guardar %{resource}:'
+    not_saved_html: "impidieron guardar %{resource}. <br>Por favor revisa los campos marcados para saber cómo corregirlos:"
     policy: Política de privacidad
     proposal: la propuesta
     proposal_notification: "la notificación"
diff --git a/spec/support/common_actions.rb b/spec/support/common_actions.rb
index 54c154cf8..4080afb8d 100644
--- a/spec/support/common_actions.rb
+++ b/spec/support/common_actions.rb
@@ -133,7 +133,7 @@ module CommonActions
 
   def error_message(resource_model = nil)
     resource_model ||= "(.*)"
-    /\d errors? prevented this #{resource_model} from being saved:/
+    /\d errors? prevented this #{resource_model} from being saved. Please check the marked fields to know how to correct them:/
   end
 
   def expect_to_be_signed_in