translation.rb in activemodel-3.1.0.beta1

- old
+ new

@@ -16,16 +16,16 @@
   #   TranslatedPerson.human_attribute_name('my_attribute')
   #   # => "My attribute"
   #
   # This also provides the required class methods for hooking into the
   # Rails internationalization API, including being able to define a
-  # class based i18n_scope and lookup_ancestors to find translations in
+  # class based +i18n_scope+ and +lookup_ancestors+ to find translations in
   # parent classes.
   module Translation
     include ActiveModel::Naming
 
-    # Returns the i18n_scope for the class. Overwrite if you want custom lookup.
+    # Returns the +i18n_scope+ for the class. Overwrite if you want custom lookup.
     def i18n_scope
       :activemodel
     end
 
     # When localizing a string, it goes through the lookup returned by this
@@ -42,24 +42,17 @@
     #   Person.human_attribute_name("first_name") # => "First name"
     #
     # Specify +options+ with additional translating options.
     def human_attribute_name(attribute, options = {})
       defaults = lookup_ancestors.map do |klass|
-        [:"#{self.i18n_scope}.attributes.#{klass.model_name.i18n_key}.#{attribute}",
-         :"#{self.i18n_scope}.attributes.#{klass.model_name.i18n_key.to_s.tr('.', '/')}.#{attribute}"]
-      end.flatten
+        :"#{self.i18n_scope}.attributes.#{klass.model_name.i18n_key}.#{attribute}"
+      end
 
       defaults << :"attributes.#{attribute}"
       defaults << options.delete(:default) if options[:default]
       defaults << attribute.to_s.humanize
 
       options.reverse_merge! :count => 1, :default => defaults
       I18n.translate(defaults.shift, options)
-    end
-
-    # Model.human_name is deprecated. Use Model.model_name.human instead.
-    def human_name(*args)
-      ActiveSupport::Deprecation.warn("human_name has been deprecated, please use model_name.human instead", caller[0,5])
-      model_name.human(*args)
     end
   end
 end