genki-merb_babel 0.1.1.1 → 0.1.1.2

data/Rakefile

@@ -5,7 +5,7 @@ require 'merb-core'
 require 'merb-core/tasks/merb'
 
 GEM_NAME = "merb_babel"
-GEM_VERSION = "0.1.1.1"
+GEM_VERSION = "0.1.1.2"
 AUTHOR = "Matt Aimonetti"
 EMAIL = "mattaimonetti@gmail.com"
 HOMEPAGE = "http://github.com/mattetti/merb_babel/"

data/lib/merb_babel.rb

@@ -25,18 +25,22 @@ if defined?(Merb::Plugins)
           begin
             options = args.pop if args.last.kind_of?(Hash) 
             options ||= {}
-            options.merge!(:keys => args)
-            options.merge!(:language => language) unless options.has_key?(:language)
-            options.merge!(:country => country) unless options.has_key?(:country)
-            MI18n.lookup(options)
-          #rescue
-          #  key.to_s
+            options[:language] ||= language
+            options[:country] ||= country
+            case key = args.last
+            when Date, Time
+              format = MI18n.lookup(options.merge(:keys => args[0..-2]))
+              ML10n.localize_time(key, format, options)
+            else
+              MI18n.lookup(options.merge(:keys => args))
+            end
+          rescue
+            key.to_s
           end
         end
         alias :translate :babelize
         alias :t :babelize
         alias :_ :babelize
-
       end
     end
     

data/lib/merb_babel/m_l10n.rb

@@ -101,6 +101,31 @@ module ML10n
     def localize(key, *options)
       MI18n.localize(options.merge({:locale => locale}))
     end
+
+    def localize_time(object, format, options)
+      table_for = proc do |table_name, key, default|
+        keys = ["DateFormat", table_name]
+        table = MI18n.lookup(options.merge(:keys => keys)) || {}
+        table[key] || default
+      end
+      format = format.to_s.dup
+      format.gsub!(/%a/) do
+        table_for["AbbrDayNames", object.wday, "%a"]
+      end
+      format.gsub!(/%A/) do
+        table_for["AbbrMonthNames", object.mon - 1, "%A"]
+      end
+      format.gsub!(/%B/) do
+        table_for["MonthNames", object.mon - 1, "%B"]
+      end
+      format.gsub!(/%p/) do
+        table_for["AmPm", object.hour < 12 ? 0 : 1, "%p"]
+      end if object.respond_to?(:hour)
+      format.gsub!(/%\{([a-zA-Z]\w*)\}/) do
+        object.send($1) rescue $1
+      end
+      object.strftime(format)
+    end
   
     protected
   

data/spec/lang/en.yml

@@ -13,4 +13,10 @@ mloc_language_name: English
 
 right: right
 left: left
-greetings: Hello
+greetings: Hello
+
+night:
+  greetings: Good evening
+
+DateFormat:
+  AbbrDayNames: ["S", "M", "T", "W", "T", "F", "S"]

data/spec/lang/ja.yml

@@ -0,0 +1,23 @@
+#################################################
+# Japanese localization
+#
+# localization specific must go in their own file
+# see ja-JP.yml for instance
+#################################################
+mloc_language_code: ja
+# Optional, the following key has the name of the localized language in its ow language.
+mloc_language_name: Japanese
+# mloc_country:
+#################################################
+
+
+right: 右
+left: 左
+greetings: こんにちわ
+
+night:
+  greetings: こんばんわ
+
+DateFormat:
+  AbbrDayNames: ["日", "月", "火", "水", "木", "金", "土"]
+  AmPm: ["午前", "午後"]

data/spec/locale_detector_spec.rb

@@ -0,0 +1,42 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe 'country detector' do
+  it "should detect country from request" do
+    c = dispatch_to(TestController, :index, {},
+      'HTTP_ACCEPT_LANGUAGE' => 'en-UK')
+    c.country.should == 'UK'
+  end
+
+  it "should detect language from request" do
+    c = dispatch_to(TestController, :index, {},
+      'HTTP_ACCEPT_LANGUAGE' => 'fr-FR')
+    c.language.should == 'fr'
+  end
+
+  it "should detect full locale from request" do
+    c = dispatch_to(TestController, :index, {},
+      'HTTP_ACCEPT_LANGUAGE' => 'en-UK')
+    c.locale.should == 'en-UK'
+  end
+
+  it "should detect full locale from request 2" do
+    c = dispatch_to(TestController, :index, {},
+      'HTTP_ACCEPT_LANGUAGE' => 'en_UK')
+    c.language.should == 'en'
+    c.country.should == 'UK'
+    c.locale.should == 'en-UK'
+  end
+
+  it "should guess country from language" do
+    c = dispatch_to(TestController, :index, {},
+      'HTTP_ACCEPT_LANGUAGE' => 'ja')
+    c.country.should == 'JP'
+    c.locale.should == 'ja-JP'
+  end
+
+  it "should detect language from request including candidates" do
+    c = dispatch_to(TestController, :index, {},
+      'HTTP_ACCEPT_LANGUAGE' => 'ja,en;q=0.9,fr;q=0.8,de;q=0.7,es;q=0.6')
+    c.locale.should == 'ja-JP'
+  end
+end

data/spec/m_i18n_spec.rb

@@ -50,4 +50,26 @@ describe '#babelize' do
     @c.t(:greetings, :language => 'fr').should == 'Salut'
   end
   
+  it "should translate with domain" do
+    @c.t(:night, :greetings, :language => 'en').should == 'Good evening'
+    @c.t(:night, :greetings, :language => 'ja').should == 'こんばんわ'
+  end
+
+  it "should localize date" do
+    date = Date.new(2009,1,1)
+    @c.t("%Y/%m/%d", date, :language => 'en').should == "2009/01/01"
+    @c.t("%Y/%{mon}/%{day}", date, :language => 'en').should == "2009/1/1"
+    @c.t("%a/%d", date, :language => 'en').should == "T/01"
+    @c.t("%a/%d", date, :language => 'en', :country => 'UK').should == "T/01"
+    @c.t("%a/%d", date, :language => 'ja').should == "木/01"
+  end
+
+  it "should localize time" do
+    time = Time.now
+    if time.hour < 12
+      @c.t("%p", time, :language => "ja").should == "午前"
+    else
+      @c.t("%p", time, :language => "ja").should == "午後"
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: genki-merb_babel
 version: !ruby/object:Gem::Version 
-  version: 0.1.1.1
+  version: 0.1.1.2
 platform: ruby
 authors: 
 - Matt Aimonetti
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-13 00:00:00 -08:00
+date: 2009-01-17 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -56,6 +56,8 @@ files:
 - spec/lang/en-UK.yml
 - spec/lang/en-US.yml
 - spec/lang/en.yml
+- spec/lang/ja.yml
+- spec/locale_detector_spec.rb
 - spec/m_i18n_spec.rb
 - spec/m_l10n_spec.rb
 - spec/merb_babel_spec.rb