consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improves generic error message

Browse Source
This commit is contained in:
decabeza
2017-12-22 12:32:34 +01:00
parent 4ddc253bfe
commit f95d5d4639
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/shared/_errors.html.erb
View File

@@ -10,7 +10,7 @@
<% if local_assigns[:message].present? %> <% if local_assigns[:message].present? %>
<%= message %> <%= message %>
<% else %> <% 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 %> <% end %>
</strong> </strong>
</div> </div>

4
config/locales/en/devise.yml
View File

@@ -65,6 +65,6 @@ en:
not_found: "not found." not_found: "not found."
not_locked: "was not locked." not_locked: "was not locked."
not_saved: not_saved:
one: "1 error 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:" 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." equal_to_current_password: "must be different than the current password."

2
config/locales/en/general.yml
View File

@@ -171,7 +171,7 @@ en:
direct_message: private message direct_message: private message
error: error error: error
errors: errors 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 policy: Privacy Policy
proposal: Proposal proposal: Proposal
proposal_notification: "Notification" proposal_notification: "Notification"

4
config/locales/es/devise.yml
View File

@@ -60,6 +60,6 @@ es:
not_found: "no se ha encontrado." not_found: "no se ha encontrado."
not_locked: "no estaba bloqueado." not_locked: "no estaba bloqueado."
not_saved: not_saved:
one: "1 error impidió 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:" 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" equal_to_current_password: "debe ser diferente a la contraseña actual"

2
config/locales/es/general.yml
View File

@@ -171,7 +171,7 @@ es:
direct_message: el mensaje privado direct_message: el mensaje privado
error: error error: error
errors: errores 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 policy: Política de privacidad
proposal: la propuesta proposal: la propuesta
proposal_notification: "la notificación" proposal_notification: "la notificación"

2
spec/support/common_actions.rb
View File

@@ -133,7 +133,7 @@ module CommonActions
def error_message(resource_model = nil) def error_message(resource_model = nil)
resource_model ||= "(.*)" 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 end
def expect_to_be_signed_in def expect_to_be_signed_in