gettext_i18n_rails 0.5.3 → 0.5.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gettext_i18n_rails (0.5.3)
+    gettext_i18n_rails (0.5.4)
       fast_gettext
 
 GEM

data/lib/gettext_i18n_rails/active_model.rb

@@ -4,4 +4,25 @@ module ActiveModel
       _(@klass.humanize_class_name)
     end
   end
+
+  module Translation
+    # CarDealer.sales_count -> s_('CarDealer|Sales count') -> 'Sales count' if no translation was found
+    def human_attribute_name(attribute, *args)
+      s_(gettext_translation_for_attribute_name(attribute))
+    end
+
+    def gettext_translation_for_attribute_name(attribute)
+      attribute = attribute.to_s
+      if attribute.ends_with?('_id')
+        humanize_class_name(attribute)
+      else
+        "#{self}|#{attribute.split('.').map! {|a| a.humanize }.join('|')}"
+      end
+    end
+
+    def humanize_class_name(name=nil)
+      name ||= self.to_s
+      name.underscore.humanize
+    end
+  end
 end

data/lib/gettext_i18n_rails/active_record.rb

@@ -1,25 +1,8 @@
 module GettextI18nRails::ActiveRecord
-  # CarDealer.sales_count -> s_('CarDealer|Sales count') -> 'Sales count' if no translation was found
-  def human_attribute_name(attribute, *args)
-    s_(gettext_translation_for_attribute_name(attribute))
-  end
+  include ActiveModel::Translation
 
   # method deprecated in Rails 3.1
   def human_name(*args)
     _(self.humanize_class_name)
   end
-
-  def humanize_class_name(name=nil)
-    name ||= self.to_s
-    name.underscore.humanize
-  end
-
-  def gettext_translation_for_attribute_name(attribute)
-    attribute = attribute.to_s
-    if attribute.ends_with?('_id')
-      humanize_class_name(attribute)
-    else
-      "#{self}|#{attribute.split('.').map! {|a| a.humanize }.join('|')}"
-    end
-  end
 end

data/lib/gettext_i18n_rails/railtie.rb

@@ -13,7 +13,6 @@ if defined?(Rails::Railtie)
       config.after_initialize do |app|
         if app.config.gettext_i18n_rails.use_for_active_record_attributes
           ActiveSupport.on_load :active_record do
-            extend GettextI18nRails::ActiveRecord
             require 'gettext_i18n_rails/active_model.rb'
           end
         end

data/lib/gettext_i18n_rails/version.rb

@@ -1,3 +1,3 @@
 module GettextI18nRails
-  Version = VERSION = '0.5.3'
+  Version = VERSION = '0.5.4'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gettext_i18n_rails
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 5
-  - 3
-  version: 0.5.3
+  - 4
+  version: 0.5.4
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-22 00:00:00 Z
+date: 2012-05-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: fast_gettext