r18n-rails-api 1.1.0 → 1.1.1

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

@@ -37,14 +37,14 @@ module R18n
       scope, default, separator = options.values_at(*RESERVED_KEYS)
       params = options.reject { |name, value| RESERVED_KEYS.include?(name) }
 
-      result = lookup(scope, key, separator, params)
+      result = lookup(locale, scope, key, separator, params)
 
       if result.is_a? Untranslated
         options = options.reject { |key, value| key == :default }
 
         Array(default).each do |entry|
           if entry.is_a? Symbol
-            value = lookup(scope, entry, separator, params)
+            value = lookup(locale, scope, entry, separator, params)
             return value unless value.is_a? Untranslated
           else
             return entry
@@ -65,12 +65,13 @@ module R18n
     # +:only_day+ and +:only_second+) and R18n (+:full+, +:human+, +:standard+
     # and +:month+) time formatters.
     def localize(locale, object, format = :default, options = {})
+      i18n = get_i18n(locale)
       if format.is_a? Symbol
-        key = format
+        key  = format
         type = object.respond_to?(:sec) ? 'time' : 'date'
-        format = R18n.get[type].formats[key] | format
+        format = i18n[type].formats[key] | format
       end
-      R18n.get.localize(object, format)
+      i18n.localize(object, format)
     end
 
     # Return array of available locales codes.
@@ -85,6 +86,12 @@ module R18n
 
     protected
 
+    def get_i18n(locale)
+      i18n = R18n.get
+      i18n = R18n.change(locale.to_s) if i18n.locale.code != locale.to_s
+      i18n
+    end
+
     def format_value(result)
       if result.is_a? TranslatedString
         result.to_s
@@ -112,12 +119,12 @@ module R18n
 
     # Find translation by <tt>scope.key(params)</tt> in current R18n I18n
     # object.
-    def lookup(scope, key, separator, params)
+    def lookup(locale, scope, key, separator, params)
       keys = (Array(scope) + Array(key)).map { |k|
         k.to_s.split(separator || ::I18n.default_separator) }.flatten
       last = keys.pop.to_sym
 
-      result = keys.inject(R18n.get.t) do |node, key|
+      result = keys.inject(get_i18n(locale).t) do |node, key|
         if node.is_a? TranslatedString
           node.get_untranslated(key)
         else

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

@@ -33,15 +33,13 @@ module R18n
     #   R18n::I18n.new('en',
     #                  R18n::Loader::Rails.new(I18n::Backend::ActiveRecord.new))
     class Rails
+      include ::R18n::YamlMethods
+
       # Create new loader for some +backend+ from Rails I18n. Backend must have
       # +reload!+, +init_translations+ and +translations+ methods.
       def initialize(backend = ::I18n::Backend::Simple.new)
         @backend = backend
-        if ('1.8.' == RUBY_VERSION[0..3] || RUBY_PLATFORM == 'java')
-          @private_type_class = ::YAML::PrivateType
-        else
-          @private_type_class = ::Syck::PrivateType
-        end
+        detect_yaml_private_type
       end
 
       # Array of locales, which has translations in +I18n.load_path+.
@@ -52,6 +50,7 @@ module R18n
 
       # Return Hash with translations for +locale+.
       def load(locale)
+        initialize_types
         reload!
         @translations[locale.code.downcase]
       end
@@ -89,7 +88,7 @@ module R18n
           else
             Utils.hash_map(value) { |k, v| [k.to_s, transform(v)] }
           end
-        elsif value.is_a? @private_type_class
+        elsif @private_type_class and value.is_a? @private_type_class
           Typed.new(value.type_id, value.value)
         else
           value

data/spec/backend_spec.rb

@@ -9,7 +9,7 @@ describe R18n::Backend do
   end
 
   it "should return available locales" do
-    I18n.available_locales.should =~ [:en]
+    I18n.available_locales.should =~ [:en, :ru]
   end
 
   it "should localize objects" do
@@ -108,4 +108,12 @@ describe R18n::Backend do
     }
   end
 
+  it "should change locale in place" do
+    I18n.load_path << PL
+    I18n.t('users', :count => 5).should == '5 users'
+    I18n.t('users', :count => 5, :locale => :ru).should == 'Много'
+
+    I18n.l(Date.parse('1970-01-01'), :locale => :ru).should == '01.01.1970'
+  end
+
 end

data/spec/data/general/ru.yml

@@ -0,0 +1,4 @@
+ru:
+  date:
+    formats:
+      default: "%d.%m.%Y"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: r18n-rails-api
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-15 00:00:00.000000000 Z
+date: 2012-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: r18n-core
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -186,6 +186,7 @@ files:
 - r18n-rails-api.gemspec
 - spec/backend_spec.rb
 - spec/data/general/en.yml
+- spec/data/general/ru.yml
 - spec/data/other/en.yml
 - spec/data/other/ru.yml
 - spec/data/pl/ru.yml
@@ -209,7 +210,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3135207149384542194
+      hash: -1841956301363324580
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -218,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3135207149384542194
+      hash: -1841956301363324580
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23