r18n-rails-api 0.4 → 0.4.1

data/lib/r18n-rails-api/loader.rb

@@ -33,8 +33,8 @@ module R18n
     #   R18n::I18n.new('en',
     #                  R18n::Loader::Rails.new(I18n::Backend::ActiveRecord.new))
     class Rails
-      PLURALIZATIONS = { :zero  => 0, :one => 1, :few => 2, :many => 'n',
-                         :other => 'other' }
+      PLURAL_KEYS = { :zero  => 0, :one => 1, :few => 2, :many => 'n',
+                      :other => 'other' }
       
       # Create new loader for some +backend+ from Rails I18n. Backend must have
       # +reload!+, +init_translations+ and +translations+ methods.
@@ -76,18 +76,21 @@ module R18n
       protected
       
       # Change pluralization and keys to R18n format.
-      def transform(hash)
-        if hash.empty?
-          hash
-        elsif hash.keys.inject(true) { |a, i| a and PLURALIZATIONS.include? i }
-          R18n::Typed.new('pl', Hash[hash.map { |key, value|
-            [PLURALIZATIONS[key],
-            (value.is_a?(Hash) ? transform(value) : value)]
-          }])
+      def transform(value)
+        if value.is_a? Hash
+          if value.empty?
+            value
+          elsif value.keys.inject(true) { |a, i| a and PLURAL_KEYS.include? i }
+            R18n::Typed.new('pl', Hash[value.map { |k, v|
+              [PLURAL_KEYS[k], transform(v)]
+            }])
+          else
+            Hash[value.map { |k, v| [k.to_s, transform(v)] }]
+          end
+        elsif value.is_a? ::YAML::PrivateType
+          Typed.new(value.type_id, value.value)
         else
-          Hash[hash.map { |key, value|
-            [key.to_s, (value.is_a?(Hash) ? transform(value) : value)]
-          }]
+          value
         end
       end
     end

data/spec/data/simple/en.yml

@@ -5,3 +5,4 @@ en:
     few: Few
     many: Many
     other: Other
+  typed: !!type value

data/spec/loader_spec.rb

@@ -16,9 +16,12 @@ describe R18n::Loader::Rails do
   end
   
   it "should change pluralization" do
-    @loader.load(EN).should == {'users' => R18n::Typed.new('pl', {
-      0 => 'Zero', 1 => 'One', 2 => 'Few', 'n' => 'Many', 'other' => 'Other'
-    })}
+    @loader.load(EN).should == {
+      'users' => R18n::Typed.new('pl', {
+        0 => 'Zero', 1 => 'One', 2 => 'Few', 'n' => 'Many', 'other' => 'Other'
+       }),
+       'typed' => R18n::Typed.new('type', 'value')
+    }
   end
   
   it "should reload translations on load_path changes" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: r18n-rails-api
 version: !ruby/object:Gem::Version 
-  version: "0.4"
+  version: 0.4.1
 platform: ruby
 authors: 
 - Andrey "A.I." Sitnik
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-03 00:00:00 +03:00
+date: 2010-01-11 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: "0.4"
+        version: 0.4.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: i18n