gettext_i18n_rails 0.2.8 → 0.2.9

data/Rakefile

@@ -1,5 +1,5 @@
 require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new {|t| t.spec_opts = ['--color']}
+Spec::Rake::SpecTask.new {|t| t.spec_opts = ['--color', '--backtrace']}
 
 task :default do
   puts `rake spec VERSION=2.3.9 RSPEC_COLOR=1`
@@ -20,4 +20,4 @@ begin
   Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler, or one of its dependencies, is not available. Install it with: sudo gem install jeweler"
-end
+end

data/VERSION

@@ -1 +1 @@
-0.2.8
+0.2.9

data/gettext_i18n_rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gettext_i18n_rails}
-  s.version = "0.2.8"
+  s.version = "0.2.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2010-10-13}
+  s.date = %q{2010-10-20}
   s.email = %q{grosser.michael@gmail.com}
   s.files = [
     ".gitignore",

data/lib/gettext_i18n_rails/backend.rb

@@ -14,21 +14,10 @@ module GettextI18nRails
     end
 
     def translate(locale, key, options)
-      flat_key = flatten_key key, options
-      if FastGettext.key_exist?(flat_key)
-        raise "no yet build..." if options[:locale]
-        _(flat_key)
+      if gettext_key = gettext_key(key, options)
+        translation = FastGettext._(gettext_key)
+        interpolate(translation, options)
       else
-        if self.class.translate_defaults
-          [*options[:default]].each do |default|
-            #try the more specific key first e.g. 'activerecord.errors.my custom message'
-            flat_key = flatten_key default, options
-            return FastGettext._(flat_key) if FastGettext.key_exist?(flat_key)
-
-            #try the short key thereafter e.g. 'my custom message'
-            return FastGettext._(default) if FastGettext.key_exist?(default)
-          end
-        end
         backend.translate locale, key, options
       end
     end
@@ -39,6 +28,27 @@ module GettextI18nRails
 
     protected
 
+    def gettext_key(key, options)
+      flat_key = flatten_key key, options
+      if FastGettext.key_exist?(flat_key)
+        flat_key
+      elsif self.class.translate_defaults
+        [*options[:default]].each do |default|
+          #try the scoped(more specific) key first e.g. 'activerecord.errors.my custom message'
+          flat_key = flatten_key default, options
+          return flat_key if FastGettext.key_exist?(flat_key)
+
+          #try the short key thereafter e.g. 'my custom message'
+          return default if FastGettext.key_exist?(default)
+        end
+        return nil
+      end
+    end
+
+    def interpolate(string, values)
+      string % values.except(*I18n::Backend::Base::RESERVED_KEYS)
+    end
+
     def flatten_key key, options
       scope = [*(options[:scope] || [])]
       scope.empty? ? key.to_s : "#{scope*'.'}.#{key}"

data/lib/gettext_i18n_rails/i18n_hacks.rb

@@ -21,4 +21,18 @@ module I18n
       end
     end
   end
+
+  # backport I18n.with_locale if it does not exist
+  unless respond_to?(:with_locale)
+    # Executes block with given I18n.locale set.
+    def with_locale(tmp_locale = nil)
+      if tmp_locale
+        current_locale = self.locale
+        self.locale = tmp_locale
+      end
+      yield
+    ensure
+      self.locale = current_locale if tmp_locale
+    end
+  end
 end

data/spec/gettext_i18n_rails/backend_spec.rb

@@ -12,29 +12,34 @@ describe GettextI18nRails::Backend do
       subject.available_locales.should == [:xxx]
     end
 
-    it "and_return an epmty array when FastGettext.available_locales is nil" do
-      FastGettext.should_receive(:available_locales)
+    it "and returns an empty array when FastGettext.available_locales is nil" do
+      FastGettext.should_receive(:available_locales).and_return nil
       subject.available_locales.should == []
     end
   end
 
   describe :translate do
-    it "uses gettext when the key is translateable" do
-      FastGettext.should_receive(:current_repository).and_return 'xy.z.u'=>'a'
+    it "uses gettext when the key is translatable" do
+      FastGettext.stub(:current_repository).and_return 'xy.z.u'=>'a'
       subject.translate('xx','u',:scope=>['xy','z']).should == 'a'
     end
 
+    it "interpolates options" do
+      FastGettext.stub(:current_repository).and_return 'ab.c'=>'a%{a}b'
+      subject.translate('xx','c',:scope=>['ab'], :a => 'X').should == 'aXb'
+    end
+
     it "can translate with gettext using symbols" do
-      FastGettext.should_receive(:current_repository).and_return 'xy.z.v'=>'a'
+      FastGettext.stub(:current_repository).and_return 'xy.z.v'=>'a'
       subject.translate('xx',:v ,:scope=>['xy','z']).should == 'a'
     end
 
     it "can translate with gettext using a flat scope" do
-      FastGettext.should_receive(:current_repository).and_return 'xy.z.x'=>'a'
+      FastGettext.stub(:current_repository).and_return 'xy.z.x'=>'a'
       subject.translate('xx',:x ,:scope=>'xy.z').should == 'a'
     end
 
-    it "uses the super when the key is not translateable" do
+    it "uses the super when the key is not translatable" do
       lambda{subject.translate('xx','y',:scope=>['xy','z'])}.should raise_error(I18n::MissingTranslationData)
     end
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 8
-  version: 0.2.8
+  - 9
+  version: 0.2.9
 platform: ruby
 authors: 
 - Michael Grosser
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-13 00:00:00 +02:00
+date: 2010-10-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency