gettext_i18n_rails 0.2.19 → 0.2.20

data/Readme.md

@@ -209,6 +209,7 @@ lib/tasks/gettext.rake:
  - [Anh Hai Trinh](http://blog.onideas.ws)
  - [ed0h](http://github.com/ed0h)
  - [Nikos Dimitrakopoulos](http://blog.nikosd.com)
+ - [Ben Tucker](http://btucker.net/)
 
 [Michael Grosser](http://grosser.it)<br/>
 grosser.michael@gmail.com<br/>

data/VERSION

@@ -1 +1 @@
-0.2.19
+0.2.20

data/gettext_i18n_rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gettext_i18n_rails}
-  s.version = "0.2.19"
+  s.version = "0.2.20"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2011-03-29}
+  s.date = %q{2011-06-01}
   s.email = %q{grosser.michael@gmail.com}
   s.files = [
     "Gemfile",
@@ -42,7 +42,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/grosser/gettext_i18n_rails}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.4.2}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Simple FastGettext Rails integration.}
   s.test_files = [
     "spec/gettext_i18n_rails/action_controller_spec.rb",

data/lib/gettext_i18n_rails/backend.rb

@@ -46,13 +46,17 @@ module GettextI18nRails
     end
 
     def interpolate(string, values)
-      reserved_keys = if defined?(I18n::RESERVED_KEYS) # rails 3+
-        I18n::RESERVED_KEYS
+      if string.respond_to?(:%)
+        reserved_keys = if defined?(I18n::RESERVED_KEYS) # rails 3+
+          I18n::RESERVED_KEYS
+        else
+          I18n::Backend::Base::RESERVED_KEYS
+        end
+
+        string % values.except(*reserved_keys)
       else
-        I18n::Backend::Base::RESERVED_KEYS
+        string
       end
-
-      string % values.except(*reserved_keys)
     end
 
     def flatten_key key, options
@@ -60,4 +64,4 @@ module GettextI18nRails
       scope.empty? ? key.to_s : "#{scope*'.'}.#{key}"
     end
   end
-end
+end

data/spec/gettext_i18n_rails/backend_spec.rb

@@ -43,4 +43,11 @@ describe GettextI18nRails::Backend do
       lambda{subject.translate('xx','y',:scope=>['xy','z'])}.should raise_error(I18n::MissingTranslationData)
     end
   end
-end
+
+  describe :interpolate do
+    it "act as an identity function for an array" do
+      translation = [:month, :day, :year]
+      subject.send(:interpolate, translation, {}).should == translation
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gettext_i18n_rails
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 63
   prerelease: 
   segments: 
   - 0
   - 2
-  - 19
-  version: 0.2.19
+  - 20
+  version: 0.2.20
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-29 00:00:00 +02:00
+date: 2011-06-01 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,10 +28,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
   requirement: *id001
-  name: fast_gettext
   prerelease: false
+  type: :runtime
+  name: fast_gettext
 description: 
 email: grosser.michael@gmail.com
 executables: []
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Simple FastGettext Rails integration.