i18n 0.3.3 → 0.3.4

data/lib/i18n/backend/fallbacks.rb

@@ -34,10 +34,12 @@ module I18n
       # locales it will then raise a MissingTranslationData exception as
       # usual.
       #
-      # The default option takes precedence over fallback locales, i.e. it
-      # will first evaluate a given default option before falling back to
-      # another locale.
+      # The default option takes precedence over fallback locales
+      # only when it's not a String. When default contains String it
+      # is evaluated after fallback locales.
       def translate(locale, key, options = {})
+        default = extract_string_default!(options) if options[:default]
+
         I18n.fallbacks[locale].each do |fallback|
           begin
             result = super(fallback, key, options)
@@ -45,8 +47,18 @@ module I18n
           rescue I18n::MissingTranslationData
           end
         end
+
+        return super(locale, nil, options.merge(:default => default)) if default
         raise(I18n::MissingTranslationData.new(locale, key, options))
       end
+
+      def extract_string_default!(options)
+        defaults = Array(options[:default])
+        if index = defaults.index { |default| default.is_a?(::String) }
+          options[:default] = defaults[0, index]
+          defaults[index]
+        end
+      end
     end
   end
 end

data/lib/i18n/backend/fast.rb

@@ -12,7 +12,7 @@
 module I18n
   module Backend
     module Fast
-      SEPARATOR_ESCAPE_CHAR = "\001"
+      include Links
 
       def reset_flattened_translations!
         @flattened_translations = nil
@@ -22,7 +22,7 @@ module I18n
         @flattened_translations ||= flatten_translations(translations)
       end
 
-      def merge_translations(locale, data)
+      def merge_translations(locale, data, options = {})
         super
         reset_flattened_translations!
       end
@@ -33,29 +33,30 @@ module I18n
       end
 
       protected
-        # flatten_hash({:a=>'a', :b=>{:c=>'c', :d=>'d', :f=>{:x=>'x'}}})
-        # # => {:a=>'a', :b=>{:c=>'c', :d=>'d', :f=>{:x=>'x'}}, :"b.f" => {:x=>"x"}, :"b.c"=>"c", :"b.f.x"=>"x", :"b.d"=>"d"}
-        def flatten_hash(h, nested_stack = [], flattened_h = {}, orig_h=h)
-          wind_keys(h, nil, true)
-        end
-
         def flatten_translations(translations)
           # don't flatten locale roots
-          translations.inject({}) do |flattened_h, (locale_name, locale_translations)|
-            flattened_h[locale_name] = flatten_hash(locale_translations)
-            flattened_h
+          translations.inject({}) do |result, (locale, translations)|
+            result[locale] = wind_keys(translations, nil, true)
+            result[locale].each do |key, value|
+              store_link(locale, key, value) if value.is_a?(Symbol)
+            end
+            result
           end
         end
 
-        def lookup(locale, key, scope = nil, separator = nil)
+        def lookup(locale, key, scope = nil, options = {})
           return unless key
           init_translations unless initialized?
 
+          return nil unless flattened_translations.has_key?(locale.to_sym)
+
+          separator = options[:separator]
           if separator && I18n.default_separator != separator
             key   = cleanup_non_standard_separator(key, separator)
             scope = Array(scope).map{|k| cleanup_non_standard_separator(k, separator)} if scope
           end
-
+          
+          key = resolve_link(locale, key)
           key = (Array(scope) + [key]).join(I18n.default_separator) if scope
           flattened_translations[locale.to_sym][key.to_sym]
         end

data/lib/i18n/backend/gettext.rb

@@ -1,7 +1,8 @@
 # encoding: utf-8
 
+$:.unshift File.expand_path(File.dirname(__FILE__) + '/../../../vendor/')
 require 'i18n/gettext'
-require File.expand_path(File.dirname(__FILE__) + '/../../../vendor/po_parser.rb')
+require 'po_parser'
 
 # Experimental support for using Gettext po files to store translations.
 #

data/lib/i18n/backend/helpers.rb

@@ -22,16 +22,11 @@ module I18n
           key = escape_default_separator(key, separator)
           curr_key = [prev_key, key].compact.join(separator).to_sym
 
-          if value.is_a?(Symbol)
-            value = hash_lookup(orig_hash, value, separator) ||
-                    hash_lookup(hash, value, separator) || value
-          end
-
           if value.is_a?(Hash)
             result[curr_key] = value if subtree
             wind_keys(value, separator, subtree, curr_key, result, orig_hash)
           else
-            result[curr_key] = value
+            result[unescape_default_separator(curr_key)] = value
           end
         end
 
@@ -41,16 +36,9 @@ module I18n
       def escape_default_separator(key, separator=nil)
         key.to_s.tr(separator || I18n.default_separator, SEPARATOR_ESCAPE_CHAR)
       end
-
-      def hash_lookup(hash, keys, separator = ".")
-        keys.to_s.split(separator).inject(hash) do |result, key|
-          key = key.to_sym
-          if result.respond_to?(:has_key?) and result.has_key?(key)
-            result[key]
-          else
-            return nil
-          end
-        end
+      
+      def unescape_default_separator(key, separator=nil)
+        key.to_s.tr(SEPARATOR_ESCAPE_CHAR, separator || I18n.default_separator)
       end
 
       # Expand keys chained by the the given separator through nested Hashes

data/lib/i18n/backend/interpolation_compiler.rb

@@ -33,7 +33,7 @@ module I18n
         end
 
         def interpolated_str?(str)
-          str.kind_of?(String) && str =~ INTERPOLATION_SYNTAX_PATTERN
+          str.kind_of?(::String) && str =~ INTERPOLATION_SYNTAX_PATTERN
         end
 
         protected
@@ -102,7 +102,7 @@ module I18n
         end
       end
 
-      def merge_translations(locale, data)
+      def merge_translations(locale, data, options = {})
         compile_all_strings_in(data)
         super
       end

data/lib/i18n/backend/links.rb

@@ -0,0 +1,34 @@
+module I18n
+  module Backend
+    module Links
+      protected
+        def links(locale)
+          @links ||= {}
+          @links[locale.to_sym] ||= {}
+        end
+
+        def store_link(locale, key, link)
+          links(locale)[key.to_s] = link.to_s
+        end
+
+        def resolve_link(locale, key)
+          key   = key.to_s
+          links = self.links(locale)
+
+          if links.key?(key)
+            links[key]
+          elsif link = find_link(locale, key)
+            store_link(locale, key, key.gsub(*link))
+          else
+            key
+          end
+        end
+
+        def find_link(locale, key)
+          links(locale).each do |from, to|
+            return [from, to] if key[0, from.length] == from
+          end && nil
+        end
+    end
+  end
+end

data/lib/i18n/backend/pluralization.rb

@@ -50,7 +50,7 @@ module I18n
         end
 
         def pluralizer(locale)
-          pluralizers[locale] ||= lookup(locale, :'i18n.plural.rule')
+          pluralizers[locale] ||= I18n.t(:'i18n.plural.rule', :locale => locale, :resolve => false)
         end
     end
   end

data/lib/i18n/core_ext/hash/except.rb

@@ -0,0 +1,8 @@
+# from facets (http://facets.rubyforge.org)
+require 'i18n/core_ext/hash/slice'
+
+class Hash
+  def except(*less_keys)
+    slice(*keys - less_keys)
+  end
+end unless Hash.method_defined?(:except)

data/lib/i18n/core_ext/hash/slice.rb

@@ -0,0 +1,8 @@
+# from facets (http://facets.rubyforge.org)
+class Hash
+  def slice(*keep_keys)
+    h = {}
+    keep_keys.each { |key| h[key] = fetch(key) }
+    h
+  end
+end unless Hash.new.respond_to?(:slice)

data/lib/i18n/core_ext/string/interpolate.rb

@@ -31,11 +31,15 @@ if RUBY_VERSION < '1.9'
     alias :interpolate_without_ruby_19_syntax :% # :nodoc:
 
     INTERPOLATION_PATTERN = Regexp.union(
-      /%%/,
       /%\{(\w+)\}/,                               # matches placeholders like "%{foo}"
       /%<(\w+)>(.*?\d*\.?\d*[bBdiouxXeEfgGcps])/  # matches placeholders like "%<foo>.d"
     )
 
+    INTERPOLATION_PATTERN_WITH_ESCAPE = Regexp.union(
+      /%%/,
+      INTERPOLATION_PATTERN
+    )
+
     # % uses self (i.e. the String) as a format specification and returns the
     # result of applying it to the given arguments. In other words it interpolates
     # the given arguments to the string according to the formats the string
@@ -75,7 +79,7 @@ if RUBY_VERSION < '1.9'
     #     # => "10, 43.3"
     def %(args)
       if args.kind_of?(Hash)
-        dup.gsub(INTERPOLATION_PATTERN) do |match|
+        dup.gsub(INTERPOLATION_PATTERN_WITH_ESCAPE) do |match|
           if match == '%%'
             '%'
           else

data/lib/i18n/exceptions.rb

@@ -21,7 +21,7 @@ module I18n
     attr_reader :locale, :key, :options
     def initialize(locale, key, opts = nil)
       @key, @locale, @options = key, locale, opts || {}
-      keys = I18n.send(:normalize_translation_keys, locale, key, options[:scope])
+      keys = I18n.normalize_keys(locale, key, options[:scope])
       keys << 'no key' if keys.size < 2
       super "translation missing: #{keys.join(', ')}"
     end

data/lib/i18n/helpers/gettext.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+require 'i18n/gettext'
 
 module I18n
   module Helpers
@@ -14,7 +15,7 @@ module I18n
 
       def sgettext(msgid, separator = '|')
         scope, msgid = I18n::Gettext.extract_scope(msgid, separator)
-        I18n.t(msgid, :scope => scope, :default => msgid)
+        I18n.t(msgid, :scope => scope, :default => msgid, :separator => separator)
       end
       alias s_ sgettext
 
@@ -35,7 +36,7 @@ module I18n
       def nsgettext(msgid, msgid_plural, n = 1, separator = '|')
         if msgid.is_a?(Array)
           msgid, msgid_plural, n, separator = msgid[0], msgid[1], msgid_plural, n
-          separator = '|' unless separator.is_a?(String)
+          separator = '|' unless separator.is_a?(::String)
         end
 
         scope, msgid = I18n::Gettext.extract_scope(msgid, separator)

data/lib/i18n/version.rb

@@ -1,3 +1,3 @@
 module I18n
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/test/api.rb

@@ -0,0 +1,18 @@
+module Tests
+  module Api
+    autoload :Basics,        'api/tests/basics'
+    autoload :Defaults,      'api/tests/defaults'
+    autoload :Interpolation, 'api/tests/interpolation'
+    autoload :Link,          'api/tests/link'
+    autoload :Lookup,        'api/tests/lookup'
+    autoload :Pluralization, 'api/tests/pluralization'
+    autoload :Procs,         'api/tests/procs'
+
+    module Localization
+      autoload :Date,        'api/tests/localization/date'
+      autoload :DateTime,    'api/tests/localization/date_time'
+      autoload :Procs,       'api/tests/localization/procs'
+      autoload :Time,        'api/tests/localization/time'
+    end
+  end
+end

data/test/{cases/api → api}/active_record_test.rb

@@ -1,8 +1,9 @@
 # encoding: utf-8
-require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
-
-setup_active_record
+$:.unshift(File.expand_path(File.dirname(__FILE__) + '/../')); $:.uniq!
+require 'test_helper'
+require 'api'
 
+require_active_record!
 
 class I18nActiveRecordApiTest < Test::Unit::TestCase
   def setup
@@ -17,13 +18,13 @@ class I18nActiveRecordApiTest < Test::Unit::TestCase
   include Tests::Api::Lookup
   include Tests::Api::Pluralization
   include Tests::Api::Procs unless RUBY_VERSION >= '1.9.1'
-
+          
   include Tests::Api::Localization::Date
   include Tests::Api::Localization::DateTime
   include Tests::Api::Localization::Time
   include Tests::Api::Localization::Procs unless RUBY_VERSION >= '1.9.1'
 
-  define_method "test: make sure we use an ActiveRecord backend" do
+  test "make sure we use an ActiveRecord backend" do
     assert_equal I18n::Backend::ActiveRecord, I18n.backend.class
   end
 end if defined?(ActiveRecord)

data/test/{cases/api → api}/all_features_test.rb

@@ -1,6 +1,14 @@
 # encoding: utf-8
+$:.unshift(File.expand_path(File.dirname(__FILE__) + '/../')); $:.uniq!
+begin
+  require 'rubygems'
+  require 'active_support'
+rescue LoadError
+  puts "not testing with Cache enabled because active_support can not be found"
+end
 
-require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
+require 'test_helper'
+require 'api'
 
 class I18nAllFeaturesApiTest < Test::Unit::TestCase
   class Backend
@@ -16,9 +24,20 @@ class I18nAllFeaturesApiTest < Test::Unit::TestCase
 
   def setup
     I18n.backend = I18n::Backend::Chain.new(Backend.new, I18n::Backend::Simple.new)
+    I18n.cache_store = cache_store
     super
   end
 
+  def teardown
+    I18n.cache_store.clear
+    I18n.cache_store = nil
+    super
+  end
+
+  def cache_store
+    ActiveSupport::Cache.lookup_store(:memory_store) if defined?(ActiveSupport) && defined?(ActiveSupport::Cache)
+  end
+
   include Tests::Api::Basics
   include Tests::Api::Defaults
   include Tests::Api::Interpolation
@@ -31,10 +50,10 @@ class I18nAllFeaturesApiTest < Test::Unit::TestCase
   include Tests::Api::Localization::Time
   include Tests::Api::Localization::Procs
 
-  define_method "test: make sure we use a Chain backend with an all features backend" do
+  test "make sure we use a Chain backend with an all features backend" do
     assert_equal I18n::Backend::Chain, I18n.backend.class
     assert_equal Backend, I18n.backend.backends.first.class
   end
-  
+
   # links: test that keys stored on one backend can link to keys stored on another backend
 end

data/test/{cases/api → api}/cascade_test.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
-
-require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
+$:.unshift(File.expand_path(File.dirname(__FILE__) + '/../')); $:.uniq!
+require 'test_helper'
+require 'api'
 
 class I18nCascadeApiTest < Test::Unit::TestCase
   class Backend
@@ -25,7 +26,7 @@ class I18nCascadeApiTest < Test::Unit::TestCase
   include Tests::Api::Localization::Time
   include Tests::Api::Localization::Procs
 
-  define_method "test: make sure we use a backend with Cascade included" do
+  test "make sure we use a backend with Cascade included" do
     assert_equal Backend, I18n.backend.class
   end
 end

data/test/{cases/api → api}/chain_test.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
-
-require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
+$:.unshift(File.expand_path(File.dirname(__FILE__) + '/../')); $:.uniq!
+require 'test_helper'
+require 'api'
 
 class I18nApiChainTest < Test::Unit::TestCase
   def setup
@@ -20,7 +21,7 @@ class I18nApiChainTest < Test::Unit::TestCase
   include Tests::Api::Localization::Time
   include Tests::Api::Localization::Procs
 
-  define_method "test: make sure we use the Chain backend" do
+  test "make sure we use the Chain backend" do
     assert_equal I18n::Backend::Chain, I18n.backend.class
   end
 end

data/test/{cases/api → api}/fallbacks_test.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
-
-require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
+$:.unshift(File.expand_path(File.dirname(__FILE__) + '/../')); $:.uniq!
+require 'test_helper'
+require 'api'
 
 class I18nFallbacksApiTest < Test::Unit::TestCase
   class Backend
@@ -25,7 +26,7 @@ class I18nFallbacksApiTest < Test::Unit::TestCase
   include Tests::Api::Localization::Time
   include Tests::Api::Localization::Procs
 
-  define_method "test: make sure we use a backend with Fallbacks included" do
+  test "make sure we use a backend with Fallbacks included" do
     assert_equal Backend, I18n.backend.class
   end