genki-merb_babel 0.1.1.0 → 0.1.1.1

data/Rakefile

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

data/lib/merb_babel/m_i18n.rb

@@ -1,30 +1,39 @@
 module MI18n
   
   def self.lookup(options)
-    key = options[:key].to_s
+    keys = [options[:keys].map{|key| key.to_s}].flatten
     language = options[:language]
     country = options[:country]
+
     raise ArgumentError, "You need to pass a language reference" unless language
-    raise ArgumentError, "You need to pass a localization key" unless key
-    raise ArgumentError, "language: #{language} not found" unless ML10n.localizations[language]
+    raise ArgumentError, "You need to pass a localization key" if keys.empty?
+    raise ArgumentError,
+      "language: #{language} not found" unless ML10n.localizations[language]
     
     full_location = nil
-    full_location = lookup_with_full_locale(key, language, country) if country
+    full_location = lookup_with_full_locale(keys, language, country) if country
     
     if full_location
       return full_location
     else
-      return ML10n.localizations[language][key] || key
+      return lookup_with_language(keys, language) || keys.last
     end
   end
+
+  def self.lookup_with_language(keys, language)
+    lookup_with_hash(keys, ML10n.localizations[language])
+  end
   
-  def self.lookup_with_full_locale(key, language, country)
+  def self.lookup_with_full_locale(keys, language, country)
     if ML10n.localizations.has_key?(language)
       ML10n.localizations[language].has_key?(country) ?
-        ML10n.localizations[language][country][key.to_s] : nil 
+        lookup_with_hash(keys, ML10n.localizations[language][country]) : nil 
     else
       nil
     end
   end
   
+  def self.lookup_with_hash(keys, l_hash)
+    keys.inject(l_hash){|h,k| h[k] rescue nil}
+  end
 end

data/lib/merb_babel.rb

@@ -21,11 +21,11 @@ if defined?(Merb::Plugins)
       module GlobalHelpers
 
         # Used to translate words using localizations
-        def babelize(key, *args)
+        def babelize(*args)
           begin
-            options = args.first 
+            options = args.pop if args.last.kind_of?(Hash) 
             options ||= {}
-            options.merge!(:key => key)
+            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)

metadata

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