diff options
| author | Gareth Rees <gareth@mysociety.org> | 2015-03-20 14:34:09 +0000 |
|---|---|---|
| committer | Gareth Rees <gareth@mysociety.org> | 2015-03-20 14:34:09 +0000 |
| commit | b6cf3f88e9df1dda172f149927fa2a6cc4f3960a (patch) | |
| tree | 6cc4e1aa34bb056d5b630a7a8844b49a32f64ad3 /app/controllers/admin_public_body_controller.rb | |
| parent | 7d55b45dfb0de92dca420df3b02dcb5738753e32 (diff) | |
| parent | d748691956dc082ec5b2b520397e7702eaf7a488 (diff) | |
Merge remote-tracking branch 'origin/2140-translations-failed-validation-r3d' into rails-3-develop
Diffstat (limited to 'app/controllers/admin_public_body_controller.rb')
| -rw-r--r-- | app/controllers/admin_public_body_controller.rb | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/app/controllers/admin_public_body_controller.rb b/app/controllers/admin_public_body_controller.rb index d188f109d..7de27121a 100644 --- a/app/controllers/admin_public_body_controller.rb +++ b/app/controllers/admin_public_body_controller.rb @@ -23,10 +23,7 @@ class AdminPublicBodyController < AdminController def new @public_body = PublicBody.new - - I18n.available_locales.each do |locale| - @public_body.translations.build(:locale => locale) - end + @public_body.build_all_translations if params[:change_request_id] @change_request = PublicBodyChangeRequest.find(params[:change_request_id]) @@ -58,6 +55,7 @@ class AdminPublicBodyController < AdminController flash[:notice] = 'PublicBody was successfully created.' redirect_to admin_body_url(@public_body) else + @public_body.build_all_translations render :action => 'new' end end @@ -65,10 +63,7 @@ class AdminPublicBodyController < AdminController def edit @public_body = PublicBody.find(params[:id]) - - I18n.available_locales.each do |locale| - @public_body.translations.find_or_initialize_by_locale(locale) - end + @public_body.build_all_translations if params[:change_request_id] @change_request = PublicBodyChangeRequest.find(params[:change_request_id]) @@ -99,6 +94,7 @@ class AdminPublicBodyController < AdminController flash[:notice] = 'PublicBody was successfully updated.' redirect_to admin_body_url(@public_body) else + @public_body.build_all_translations render :action => 'edit' end end |