i18n-inflector 2.3.1 → 2.4.0

data/ChangeLog

@@ -1,3 +1,15 @@
+commit 6d343ad3137735492e130b7abdd8f86bf23a4a06
+Author: Paweł Wilk <siefca@gnu.org>
+Date:   Wed Feb 23 02:20:18 2011 +0100
+
+    Release 2.4.0
+
+commit d8a8354dfa428d649c89157bbcf4f2a4aa2fa74f
+Author: Paweł Wilk <siefca@gnu.org>
+Date:   Wed Feb 23 02:19:29 2011 +0100
+
+    Added collections support
+
 commit ed4cea2f3b809028b02fa19c089fecc7cf56713b
 Author: Paweł Wilk <siefca@gnu.org>
 Date:   Tue Feb 15 02:39:26 2011 +0100

data/docs/HISTORY

@@ -1,3 +1,9 @@
+=== 2.4.0 / 2011-02-23
+
+* major enhancements
+
+  * Added nested translations (collections) support
+
 === 2.3.1 / 2011-02-14
 
 * major enhancements

data/lib/i18n-inflector/backend.rb

@@ -78,19 +78,6 @@ module I18n
           translated_string = @inflector.key_to_pattern(translated_string)
         end
 
-        # return immediatelly if something is wrong with locale (preventive)
-        # return if locale is not inflected - return string cleaned from pattern
-        if (locale.nil? || !@inflector.inflected_locale?(locale))
-          return translated_string.gsub(InflectorCfg::PATTERN_REGEXP) do
-            InflectorCfg::Escapes::PATTERN[$1] ? $& : ''
-          end
-        end
-
-        # no pattern in a string - return string as is
-        unless translated_string.include?(InflectorCfg::Markers::PATTERN)
-          return translated_string
-        end
-
         # interpolate string
         begin
 

data/lib/i18n-inflector/interpolate.rb

@@ -38,8 +38,30 @@ module I18n
       #   that overrides global setting (see: {I18n::Inflector::InflectionOptions#aliased_patterns})
       # @option options [Boolean] :inflector_cache_aware (false) local switch
       #   that overrides global setting (see: {I18n::Inflector::InflectionOptions#cache_aware})
+      # @option options [Boolean] :inflector_traverses (true) local switch
+      #   that overrides global setting (see: {I18n::Inflector::InflectionOptions#traverses})
       # @return [String] the string with interpolated patterns
       def interpolate(string, locale, options = {})
+
+        # traverse tree and call interpolate for each value
+        if string.is_a?(Hash)
+          return string unless options[:inflector_traverses]
+          return string.merge(string) do |k, v|
+            interpolate(v, locale, options)
+          end
+        end
+
+        # return immediatelly if something is wrong with locale (preventive)
+        # return if locale is not inflected - return string cleaned from pattern
+        if (locale.nil? || !inflected_locale?(locale))
+          return string.to_s.gsub(PATTERN_REGEXP) do
+            Escapes::PATTERN[$1] ? $& : ''
+          end
+        end
+
+        # no pattern in a string - return string as is
+        return string unless string.to_s.include?(Markers::PATTERN)
+
         interpolate_core(string, locale, options)
       end
 

data/lib/i18n-inflector/options.rb

@@ -105,6 +105,22 @@ module I18n
       # @param [Boolean] state +true+ enables, +false+ disables this switch
       attr_accessor :aliased_patterns
 
+      # This is a switch that enables you to interpolate patterns contained
+      # in resulting nested Hashes. It is used when the original translation
+      # method returns a subtree of translation data because the given key
+      # is not pointing to a leaf of the data but to some collection.
+      # 
+      # This switch is by default set to +true+. When you turn it off then
+      # the Inflector won't touch nested results and will return them as they are.
+      # 
+      # @note Local option +:inflector_traverses+ passed to the
+      #   {I18n::Backend::Inflector#translate} overrides this setting.
+      # 
+      # @api public
+      # @return [Boolean] state of the switch
+      # @param [Boolean] state +true+ enables, +false+ disables this switch
+      attr_accessor :traverses
+
       # When this switch is set to +true+ then inflector falls back to the default
       # token for a kind if an inflection option passed to the
       # {I18n::Backend::Inflector#translate} is unknown or +nil+.
@@ -247,6 +263,7 @@ module I18n
       # @return [void]
       def reset
         @unknown_defaults   = true
+        @traverses          = true
         @excluded_defaults  = false
         @aliased_patterns   = false
         @cache_aware        = false

data/lib/i18n-inflector/version.rb

@@ -14,7 +14,7 @@ module I18n
     # @private
     EMAIL       = 'pw@gnu.org'
     # @private
-    VERSION     = '2.3.1'
+    VERSION     = '2.4.0'
     # @private
     NAME        = 'i18n-inflector'
     # @private

data/test/inflector_test.rb

@@ -366,6 +366,13 @@ class I18nInflectorTest < Test::Unit::TestCase
     assert_equal 'Dear Someone!', I18n.t('hi', :gender => :m, :locale => :xx)
   end
 
+  test "backend inflector translate: works with collections" do
+    h = Hash.new
+    h[:hi2] = h[:hi] = "Dear Someone!"
+    store_translations(:xx, 'welcomes' => {'hi' => 'Dear @{f,m:Someone|n:You|All}!', 'hi2' => 'Dear @{f,m:Someone|n:You|All}!'})
+    assert_equal h, I18n.t('welcomes', :gender => :m, :foo => 5, :locale => :xx)
+  end
+
   test "backend inflector translate: works with negative tokens" do
     store_translations(:xx, 'hi' => 'Dear @{!m:Lady|m:Sir|n:You|All}!')
     assert_equal 'Dear Lady!',    I18n.t('hi', :gender => :n, :locale => :xx)

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 2
-  - 3
-  - 1
-  version: 2.3.1
+  - 4
+  - 0
+  version: 2.4.0
 platform: ruby
 authors: 
 - "Pawe\xC5\x82 Wilk"
@@ -34,7 +34,7 @@ cert_chain:
   NK3TIZaPCh1S2/ES6wXNvjQ+5EnEEL9j/pSEop9DYEBPaM2WDVR5i0jJTAaRWw==
   -----END CERTIFICATE-----
 
-date: 2011-02-15 00:00:00 +01:00
+date: 2011-02-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -202,7 +202,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -182087839473545551
+      hash: -1561613972170107536
       segments: 
       - 0
       version: "0"