diff options
| -rw-r--r-- | app/models/public_body.rb | 2 | ||||
| -rw-r--r-- | app/views/admin_public_body/_form.rhtml | 2 | ||||
| -rw-r--r-- | spec/controllers/admin_public_body_controller_spec.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/models/public_body.rb b/app/models/public_body.rb index 50071f1b1..7e0f6a5d6 100644 --- a/app/models/public_body.rb +++ b/app/models/public_body.rb @@ -52,7 +52,7 @@ class PublicBody < ActiveRecord::Base translates :name, :short_name, :request_email, :url_name, :notes, :first_letter, :publication_scheme # Convenience methods for creating/editing translations via forms - def translation(locale) + def find_translation_by_locale(locale) self.translations.find_by_locale(locale) end diff --git a/app/views/admin_public_body/_form.rhtml b/app/views/admin_public_body/_form.rhtml index 0d6ae51e2..7392b5bf3 100644 --- a/app/views/admin_public_body/_form.rhtml +++ b/app/views/admin_public_body/_form.rhtml @@ -18,7 +18,7 @@ prefix = "public_body[translated_versions][]" object = @public_body.new_record? ? PublicBody::Translation.new : - @public_body.translation(locale.to_s) || PublicBody::Translation.new + @public_body.find_translation_by_locale(locale.to_s) || PublicBody::Translation.new end fields_for prefix, object do |t| diff --git a/spec/controllers/admin_public_body_controller_spec.rb b/spec/controllers/admin_public_body_controller_spec.rb index 0fdc20338..3fcc9b36d 100644 --- a/spec/controllers/admin_public_body_controller_spec.rb +++ b/spec/controllers/admin_public_body_controller_spec.rb @@ -273,7 +273,7 @@ describe AdminPublicBodyController, "when administering public bodies with i18n" get :edit, {:id => 3, :locale => :en} # When editing a body, the controller returns all available translations - assigns[:public_body].translation("es").name.should == 'El Department for Humpadinking' + assigns[:public_body].find_translation_by_locale("es").name.should == 'El Department for Humpadinking' assigns[:public_body].name.should == 'Department for Humpadinking' response.should render_template('edit') end |