Merge branch 'refactoring'

activeadmin-plugins · Jan 17, 2015 · 3785366 · 3785366
2 parents 8489147 + 97d6c48
commit 3785366
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/app/views/admin/import.html.erb b/app/views/admin/import.html.erb
@@ -2,7 +2,7 @@
    <%= raw(@active_admin_import_model.hint) %> 
 </p>
 <%= semantic_form_for @active_admin_import_model, url: {action: :do_import}, html: {multipart: true} do |f| %>
-    <%= f.inputs do %>
+    <%= f.inputs name: t("active_admin_import.details") do %>
         <%= f.input :file, as: :file %>
     <% end %>
     <%= f.actions do %>

diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -6,6 +6,7 @@ en:
     file_format_error: "You can import only valid csv file"
     file_empty_error: "You can't import empty file"
     no_file_error: "Please, select file to import"
+    details: "Please, select file to import"
     imported:
       one: "Successfully imported 1 %{model}"
       other: "Successfully imported %{count} %{plural_model}"

diff --git a/config/locales/it.yml b/config/locales/it.yml
@@ -6,6 +6,7 @@ it:
     file_format_error: "Puoi importare solo CSV conformi"
     no_file_error: "Per favore, seleziona un file da importare"
     file_empty_error: "Non è possibile importare file vuoto"
+    details: "Per favore, seleziona un file da importare"
     imported:
       one: "Importato 1 %{model} con successo"
       other: "Importati %{count} %{plural_model} con successo"