Small clean up in Naming and TTranslation tests.

1 files changed, 1 insertions, 21 deletions

diff --git a/activemodel/lib/active_model/translation.rb b/activemodel/lib/active_model/translation.rb
index 42ca463f82..e5ef1e6114 100644
--- a/activemodel/lib/active_model/translation.rb
+++ b/activemodel/lib/active_model/translation.rb
@@ -37,28 +37,8 @@ module ActiveModel
 
     # 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,1])
+      ActiveSupport::Deprecation.warn("human_name has been deprecated, please use model_name.human instead", caller[0,5])
       model_name.human(*args)
     end
   end
-
-  class Name < String
-    # Transform the model name into a more humane format, using I18n. By default,
-    # it will underscore then humanize the class name (BlogPost.human_name #=> "Blog post").
-    # Specify +options+ with additional translating options.
-    def human(options={})
-      return @human unless @klass.respond_to?(:lookup_ancestors) &&
-                           @klass.respond_to?(:i18n_scope)
-
-      defaults = @klass.lookup_ancestors.map do |klass|
-        klass.model_name.underscore.to_sym
-      end
-
-      defaults << options.delete(:default) if options[:default]
-      defaults << @human
-
-      options.reverse_merge! :scope => [@klass.i18n_scope, :models], :count => 1, :default => defaults
-      I18n.translate(defaults.shift, options)
-    end
-  end
 end