kriss-gettext_i18n 0.2.0 → 0.2.1

data/README.rdoc

@@ -2,37 +2,37 @@ Extended Globalize2 which is acting like gettext translations.
 
 == Installation
 
-  sudo gem install kriss-gettext_like_i18n --source=http://gems.github.com/
+  sudo gem install kriss-gettext_i18n --source=http://gems.github.com/
   
 == Usage
 
 in controllers...
 
-   class FooController < ApplicationController
-     def bar
-       render :text => _('Wonderfull i18n notice!')
-     end
-   end
+  class FooController < ApplicationController
+    def bar
+      render :text => _('Wonderfull i18n notice!')
+    end
+  end
 
 in models...
 
-   class Bar < ActiveRecord::Base
-     def foo(condition)
-       if condition
-         return "Some translated string".t
-       else
-       	 return :"some.key.for.translation".t
-       end
-     end
-   end
+  class Bar < ActiveRecord::Base
+    def foo(condition)
+      if condition
+        return "Some translated string".t
+      else
+        return :"some.key.for.translation".t
+      end
+    end
+  end
 
 in views...
 
-   <div id="foo">
-     <%=_ 'Translated message' %> or <%= 'Other translated message'.t %><br />
-     <%=_ 'Great translated string with {{parameter}}, :parameter => 'gettext like i18n' %><br />
-     <%= link_to _('Get it now!'), 'http://github.com/kriss/gettext_like_i18n/' %>
-   </div>
+  <div id="foo">
+    <%=_ 'Translated message' %> or <%= 'Other translated message'.t %><br />
+    <%=_ 'Great translated string with {{parameter}}, :parameter => 'gettext like i18n' %><br />
+    <%= link_to _('Get it now!'), 'http://github.com/kriss/gettext_like_i18n/' %>
+  </div>
 
 == Translations
 

data/TODO.rdoc

@@ -0,0 +1,6 @@
+== TODO
+* Tests for Rails controllers and views
+
+== PLANS FOR FUTURE
+* Database integrated backend
+* Interface for translators

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 2
-:patch: 0
+:patch: 1
 :major: 0

data/gettext_i18n.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name    = 'gettext_i18n'
-  s.version = '0.2.0'
+  s.version = '0.2.1'
   s.date    = '2009-09-25'
 
   s.summary = "Extended Globalize2 which is acting like gettext translations"
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
 		'MIT-LICENSE',
 		'README.rdoc',
 		'CHANGELOG.rdoc',
+		'TODO.rdoc',
 		'VERSION.yml',
 		'gettext_i18n.gemspec',
 		'init.rb',

data/lib/globalize/backend/gettext.rb

@@ -15,7 +15,7 @@ module Globalize
           begin
             translate locale, key.to_sym, options
           rescue I18n::MissingTranslationData
-            return key
+            interpolate locale, key, options
           end
         else
           translate locale, key, options

data/lib/rails/extend.rb

@@ -3,5 +3,30 @@ class ActiveRecord::Base
   include I18n::Gettext::Singleton
 end
 
-ActionController::Translation.send(:extend, I18n::Gettext)
-ActionView::Helpers::TranslationHelper.send(:extend, I18n::Gettext)
+ActionController::Translation.module_eval do 
+  extend I18n::Gettext
+end
+
+# Extending with I18n::Gettext is not working for translation helper
+# so we have to declare gettext methods here. Methods overwritten by
+# Globalize2 also have to be restored.
+ActionView::Helpers::TranslationHelper.module_eval do
+  def gettext(key, options={})
+    I18n.gettext(key, options)
+  end
+  alias :_ :gettext 
+  
+  def translate(key, options = {})
+    options[:raise] = true
+    I18n.translate(scope_key_by_partial(key), options)
+  rescue I18n::MissingTranslationData => e
+    keys = I18n.send(:normalize_translation_keys, e.locale, e.key, e.options[:scope])
+    content_tag('span', keys.join(', '), :class => 'translation_missing')
+  end
+  alias :t :translate
+  
+  def localize(*args)
+    I18n.localize *args
+  end
+  alias :l :localize
+end

data/test/gettext_i18n_test.rb

@@ -31,7 +31,19 @@ class GettextI18nTest < Test::Unit::TestCase
     
     should "fallback translation to :root language" do
       I18n.locale = :en
-      #assert_equal "It's work!", I18n.gettext("Translation fallback")
+      assert_equal "It's work!", I18n.gettext("Translation fallback")
+    end
+  end
+  
+  context "Translate with options" do 
+    should "display specified parameter in result" do
+      I18n.locale = :pl
+      assert_equal "Witaj John!", I18n.gettext("Hello {{who}}!", :who => "John")
+    end
+    
+    should "display specified parameter when translation was not found" do
+      I18n.locale = :en
+      assert_equal "Hello Bill!", I18n.gettext("Hello {{who}}!", :who => "Bill")
     end
   end
   
@@ -43,19 +55,25 @@ class GettextI18nTest < Test::Unit::TestCase
         def self.test
           gettext('Test translation')
         end
+        
+        def self.test2
+          gettext("Hello {{who}}!", :who => "John")
+        end
       end
       
-      result = nil
+      results = []
       I18n.locale = :pl
       
       assert begin
-        result = SampleFoo.test
+        results << SampleFoo.test
+        results << SampleFoo.test2
         true
       rescue
         false
       end
       
-      assert_equal "Testowa translacja", result
+      assert_equal "Testowa translacja", results.first
+      assert_equal "Witaj John!", results.last
     end
     
     should "allow to use gettext methods in extended class and it singleton" do 

data/test/locales/pl.yml

@@ -1,6 +1,7 @@
 pl:
   "Translation with mistake": "Poprawne tlumaczenie"
   "Test translation": "Testowa translacja"
+  "Hello {{who}}!": Witaj {{who}}!
   key_to_translate: "Sukces!"
   nested:
     translation: "Sukces!"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kriss-gettext_i18n
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Kriss Kowalik
@@ -27,6 +27,7 @@ files:
 - MIT-LICENSE
 - README.rdoc
 - CHANGELOG.rdoc
+- TODO.rdoc
 - VERSION.yml
 - gettext_i18n.gemspec
 - init.rb