aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/admin_public_body_controller.rb
diff options
context:
space:
mode:
authorSeb Bacon <seb.bacon@gmail.com>2011-08-22 14:11:02 +0100
committerSeb Bacon <seb.bacon@gmail.com>2011-08-22 14:19:05 +0100
commit5c3881bfacdb34a605ddfbadf1531d0e341d7beb (patch)
tree088e752d1a6d2fb38d1409dbfb1cb332af92594c /app/controllers/admin_public_body_controller.rb
parent15a174375e638b91c138d771d4851613110f9cdc (diff)
parenta29b3aaf0ae77af49d38813b62dddcb6889c1ebe (diff)
merge from master and make tests pass
Diffstat (limited to 'app/controllers/admin_public_body_controller.rb')
-rw-r--r--app/controllers/admin_public_body_controller.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/admin_public_body_controller.rb b/app/controllers/admin_public_body_controller.rb
index f88b25572..021122734 100644
--- a/app/controllers/admin_public_body_controller.rb
+++ b/app/controllers/admin_public_body_controller.rb
@@ -154,10 +154,10 @@ class AdminPublicBodyController < AdminController
else
raise "internal error, unknown button label"
end
-
+
# Try with dry run first
csv_contents = params[:csv_file].read
- en = PublicBody.import_csv(csv_contents, params[:tag], true, admin_http_auth_user())
+ en = PublicBody.import_csv(csv_contents, params[:tag], true, admin_http_auth_user(), I18n.available_locales)
errors = en[0]
notes = en[1]
@@ -166,7 +166,7 @@ class AdminPublicBodyController < AdminController
notes.push("Dry run was successful, real run would do as above.")
else
# And if OK, with real run
- en = PublicBody.import_csv(csv_contents, params[:tag], false, admin_http_auth_user())
+ en = PublicBody.import_csv(csv_contents, params[:tag], false, admin_http_auth_user(), available_locales)
errors = en[0]
notes = en[1]
if errors.size != 0