genki-merb_babel 0.1.0.2 → 0.1.0.7

data/Rakefile

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

data/lib/merb_babel/{country_guesser.rb → locale_detector.rb}

@@ -1,4 +1,4 @@
-module CountryGuesser
+module LocaleDetector
   LANGUAGE_TO_COUNTRY = {
     "nn"=>["NO"],
     "uk"=>["UA"],

data/lib/merb_babel/m_i18n.rb

@@ -1,7 +1,7 @@
 module MI18n
   
   def self.lookup(options)
-    key = options[:key]
+    key = options[:key].to_s.intern
     language = options[:language]
     country = options[:country]
     raise ArgumentError, "You need to pass a language reference" unless language
@@ -14,16 +14,17 @@ module MI18n
     if full_location
       return full_location
     else
-      return ML10n.localizations[language][key]
+      return ML10n.localizations[language][key] || key
     end
   end
   
   def self.lookup_with_full_locale(key, language, country)
+    country = country.to_s.intern
     if ML10n.localizations.has_key?(language)
-      ML10n.localizations[language].has_key?(country) ? ML10n.localizations[language][country][key] : nil 
+      ML10n.localizations[language].has_key?(country) ? ML10n.localizations[language][country][key.to_s] : nil 
     else
       nil
     end
   end
   
-end
+end

data/lib/merb_babel/m_l10n.rb

@@ -60,7 +60,7 @@ module ML10n
     def find_localization_files
       l_files = []
       ML10n.localization_dirs.map do |l_dir|
-        Dir["#{l_dir}/*", '*.{yml,yaml}'].each do |file|
+        Dir["#{l_dir}/*"].each do |file|
           l_files << file unless l_files.include?(file)
         end
       end
@@ -115,4 +115,4 @@ module ML10n
     
   end
   
-end
+end

data/lib/merb_babel/m_locale.rb

@@ -1,4 +1,4 @@
-require 'merb_babel/country_guesser'
+require 'merb_babel/locale_detector'
 require 'locale'
 
 # The MLocale module helps you set up a locale, language, country
@@ -20,7 +20,7 @@ module MLocale
         return nil if result.nil?
         language = result.language
         country = result.country ||
-          CountryGuesser.country_from_language(language)
+          LocaleDetector.country_from_language(language)
         request.env[:locale] = "#{language}-#{country}"
       end
     end
@@ -37,7 +37,7 @@ module MLocale
     
     # The country is used when localizing currency or time
     def country
-      request.env[:country] || params[:country] || country_from_locale || (session ? session[:country] : nil) || CountryGuesser.country_from_language(language) || default_country
+      request.env[:country] || params[:country] || country_from_locale || (session ? session[:country] : nil) || LocaleDetector.country_from_language(language) || default_country
     end
     
     # Extract the language from the locale

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: genki-merb_babel
 version: !ruby/object:Gem::Version 
-  version: 0.1.0.2
+  version: 0.1.0.7
 platform: ruby
 authors: 
 - Matt Aimonetti
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-04 00:00:00 -08:00
+date: 2009-01-12 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,7 +47,7 @@ files:
 - TODO
 - lib/merb_babel
 - lib/merb_babel/core_ext.rb
-- lib/merb_babel/country_guesser.rb
+- lib/merb_babel/locale_detector.rb
 - lib/merb_babel/m_i18n.rb
 - lib/merb_babel/m_l10n.rb
 - lib/merb_babel/m_locale.rb