fixes conflicts

2015-08-29 00:40:15 +02:00
parent f75c21f40f 7847610c19
commit ee72096890
93 changed files with 1972 additions and 92 deletions
--- a/app/views/shared/_errors.html.erb
+++ b/app/views/shared/_errors.html.erb
@@ -1,8 +1,14 @@
 <% if resource.errors.any? %>
  <div id="error_explanation" class="alert-box alert radius">
-    <strong>
-    <%= pluralize resource.errors.count, t("form.error"), t("form.errors") %>
-    <%= t("form.not_saved", resource: t("form.#{resource.class.to_s.downcase}")) %>
-    </strong>
+      <strong>
+      <%= pluralize resource.errors.count, t("form.error"), t("form.errors") %>
+
+      <% if local_assigns[:message].present? %>
+        <%= message %>
+      <% else %>
+        <%= t("form.not_saved", resource: t("form.#{resource.class.to_s.downcase}")) %>
+      <% end %>
+
+      </strong>
  </div>
 <% end %>