gettext_i18n_rails 0.9.1 → 0.9.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gettext_i18n_rails (0.9.1)
+    gettext_i18n_rails (0.9.2)
       fast_gettext (>= 0.4.8)
 
 GEM

data/Readme.md

@@ -231,6 +231,8 @@ If want to use your .PO files on client side javascript you should have a look a
  - [Ramón Cahenzli](https://github.com/psy-q)
  - [rustygeldmacher](https://github.com/rustygeldmacher)
  - [Jeroen Knoops](https://github.com/JeroenKnoops)
+ - [Ivan Necas](https://github.com/iNecas)
+ - [Andrey Chernih](https://github.com/AndreyChernyh)
 
 [Michael Grosser](http://grosser.it)<br/>
 grosser.michael@gmail.com<br/>

data/gemfiles/rails.2.3.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mgrosser/code/tools/gettext_i18n_rails
   specs:
-    gettext_i18n_rails (0.9.0)
+    gettext_i18n_rails (0.9.1)
       fast_gettext (>= 0.4.8)
 
 GEM

data/gemfiles/rails.3.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mgrosser/code/tools/gettext_i18n_rails
   specs:
-    gettext_i18n_rails (0.9.0)
+    gettext_i18n_rails (0.9.1)
       fast_gettext (>= 0.4.8)
 
 GEM

data/gemfiles/rails.3.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mgrosser/code/tools/gettext_i18n_rails
   specs:
-    gettext_i18n_rails (0.9.0)
+    gettext_i18n_rails (0.9.1)
       fast_gettext (>= 0.4.8)
 
 GEM

data/gemfiles/rails.3.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mgrosser/code/tools/gettext_i18n_rails
   specs:
-    gettext_i18n_rails (0.9.0)
+    gettext_i18n_rails (0.9.1)
       fast_gettext (>= 0.4.8)
 
 GEM

data/lib/gettext_i18n_rails/active_model.rb

@@ -1,28 +1,2 @@
-module ActiveModel
-  class Name < String
-    def human(options={})
-      _(@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
+require 'gettext_i18n_rails/active_model/name'
+require 'gettext_i18n_rails/active_model/translation'

data/lib/gettext_i18n_rails/active_model/name.rb

@@ -0,0 +1,7 @@
+module ActiveModel
+  Name.class_eval do
+    def human(options={})
+      _(@klass.humanize_class_name)
+    end
+  end
+end

data/lib/gettext_i18n_rails/active_model/translation.rb

@@ -0,0 +1,22 @@
+module ActiveModel
+  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,4 +1,4 @@
-require 'gettext_i18n_rails/active_model'
+require 'gettext_i18n_rails/active_model/translation'
 
 class ActiveRecord::Base
   extend ActiveModel::Translation

data/lib/gettext_i18n_rails/version.rb

@@ -1,3 +1,3 @@
 module GettextI18nRails
-  Version = VERSION = '0.9.1'
+  Version = VERSION = '0.9.2'
 end

data/spec/gettext_i18n_rails/active_model/name_spec.rb

@@ -0,0 +1,20 @@
+# encoding: utf-8
+require "spec_helper"
+
+if ActiveRecord::VERSION::MAJOR >= 3
+  require "gettext_i18n_rails/active_model/name"
+
+  describe ActiveModel::Name do
+    before do
+      FastGettext.current_cache = {}
+    end
+
+    describe 'human' do
+      it "is translated through FastGettext" do
+        name = ActiveModel::Name.new(CarSeat)
+        name.should_receive(:_).with('Car seat').and_return('Autositz')
+        name.human.should == 'Autositz'
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gettext_i18n_rails
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-24 00:00:00.000000000 Z
+date: 2013-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fast_gettext
@@ -61,6 +61,8 @@ files:
 - lib/gettext_i18n_rails.rb
 - lib/gettext_i18n_rails/action_controller.rb
 - lib/gettext_i18n_rails/active_model.rb
+- lib/gettext_i18n_rails/active_model/name.rb
+- lib/gettext_i18n_rails/active_model/translation.rb
 - lib/gettext_i18n_rails/active_record.rb
 - lib/gettext_i18n_rails/backend.rb
 - lib/gettext_i18n_rails/base_parser.rb
@@ -77,7 +79,7 @@ files:
 - lib/gettext_i18n_rails/version.rb
 - lib/tasks/gettext_rails_i18n.rake
 - spec/gettext_i18n_rails/action_controller_spec.rb
-- spec/gettext_i18n_rails/active_model_spec.rb
+- spec/gettext_i18n_rails/active_model/name_spec.rb
 - spec/gettext_i18n_rails/active_record_spec.rb
 - spec/gettext_i18n_rails/backend_spec.rb
 - spec/gettext_i18n_rails/haml_parser_spec.rb
@@ -101,7 +103,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3856174768908956080
+      hash: -3384457185642040654
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -110,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3856174768908956080
+      hash: -3384457185642040654
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/spec/gettext_i18n_rails/active_model_spec.rb

@@ -1,16 +0,0 @@
-# encoding: utf-8
-require "spec_helper"
-
-describe ActiveModel::Name do
-  before do
-    FastGettext.current_cache = {}
-  end
-
-  describe 'human' do
-    it "is translated through FastGettext" do
-      name = ActiveModel::Name.new(CarSeat)
-      name.should_receive(:_).with('Car seat').and_return('Autositz')
-      name.human.should == 'Autositz'
-    end
-  end
-end if ActiveRecord::VERSION::MAJOR >= 3