genki-merb_babel 0.1.2.1 → 0.1.2.2

data/Rakefile

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

data/lib/merb_babel.rb

@@ -37,8 +37,8 @@ if defined?(Merb::Plugins)
             else
               MI18n.lookup(options.merge(:keys => args))
             end
-          rescue
-            key.to_s
+          #rescue
+          #  key.to_s
           end
         end
         alias :translate :babelize

data/lib/merb_babel/m_i18n.rb

@@ -7,6 +7,9 @@ module MI18n
 
     raise ArgumentError, "You need to pass a language reference" unless language
     raise ArgumentError, "You need to pass a localization key" if keys.empty?
+    unless ML10n.localizations[language]
+      language = Merb::Plugins.config[:merb_babel][:default_language]
+    end
     raise ArgumentError,
       "language: #{language} not found" unless ML10n.localizations[language]
     

data/lib/merb_babel/m_l10n.rb

@@ -106,7 +106,10 @@ module ML10n
       table_for = proc do |table_name, key, default|
         keys = ["DateFormat", table_name]
         table = MI18n.lookup(options.merge(:keys => keys)) || {}
-        table[key] || default
+        case table
+        when Hash, Array; table[key] || default
+        else default
+        end
       end
       format = format.to_s.dup
       format.gsub!(/%a/) do
@@ -146,7 +149,5 @@ module ML10n
         end
       end
     end
-    
   end
-  
 end

data/spec/m_i18n_spec.rb

@@ -53,6 +53,7 @@ describe '#babelize' do
   it "should translate with domain" do
     @c.t(:night, :greetings, :language => 'en').should == 'Good evening'
     @c.t(:night, :greetings, :language => 'ja').should == 'こんばんわ'
+    @c.t(:night, :greetings, :language => 'tlh').should == 'Good evening'
   end
 
   it "should localize date" do
@@ -72,8 +73,15 @@ describe '#babelize' do
     time = Time.now
     if time.hour < 12
       @c.t("%p", time, :language => "ja").should == "午前"
+      @c.t("%p", time, :language => "en").should == "AM"
     else
       @c.t("%p", time, :language => "ja").should == "午後"
+      @c.t("%p", time, :language => "en").should == "PM"
     end
   end
+
+  it "should localize time by using default yml if correct one is lacking" do
+    date = Date.new(2009,1,1)
+    @c.t("%B", date, :language => 'tlh').should == "January"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: genki-merb_babel
 version: !ruby/object:Gem::Version 
-  version: 0.1.2.1
+  version: 0.1.2.2
 platform: ruby
 authors: 
 - Matt Aimonetti