genki-merb_babel 0.1.0.1 → 0.1.0.2

data/Rakefile

@@ -5,7 +5,7 @@ require 'merb-core'
 require 'merb-core/tasks/merb'
 
 GEM_NAME = "merb_babel"
-GEM_VERSION = "0.1.0.1"
+GEM_VERSION = "0.1.0.2"
 AUTHOR = "Matt Aimonetti"
 EMAIL = "mattaimonetti@gmail.com"
 HOMEPAGE = "http://github.com/mattetti/merb_babel/"
@@ -24,6 +24,7 @@ spec = Gem::Specification.new do |s|
   s.email = EMAIL
   s.homepage = HOMEPAGE
   s.add_dependency('merb', '>= 1.0.7.1')
+  s.add_dependency('locale', '>= 0.9.0')
   s.require_path = 'lib'
   s.files = %w(LICENSE README.markdown Rakefile TODO) + Dir.glob("{lib,spec}/**/*")
 end

data/lib/merb_babel/country_guesser.rb

@@ -0,0 +1,80 @@
+module CountryGuesser
+  LANGUAGE_TO_COUNTRY = {
+    "nn"=>["NO"],
+    "uk"=>["UA"],
+    "it"=>["IT", "GI", "CH", "LY", "SM"],
+    "zh_TW"=>["TT", "VN", "HK"],
+    "no"=>["NO"],
+    "st"=>["ZA"],
+    "tk"=>["TM"],
+    "bn"=>["IN"],
+    "mn"=>["MN"],
+    "ja"=>["JP"],
+    "fr"=>["FR", "CD", "GG", "RW", "CG", "LU", "TT", "CH", "CI", "JE", "SC",
+      "VN", "BE", "MU", "DJ", "BI", "CA"],
+    "hi"=>["TT", "AE", "IN"],
+    "de"=>["DE", "LU", "CH", "LI", "AT", "BE", "RO"],
+    "ne"=>["NP"], "jw"=>["ID"],
+    "ta"=>["IN", "SG"],
+    "tl"=>["PH"],
+    "pt_PT"=>["PT", "GI"],
+    "hu"=>["HU", "SK", "RO"],
+    "sk"=>["SK"],
+    "fi"=>["FI"],
+    "sv"=>["SE", "FI"],
+    "iw"=>["IL"],
+    "az"=>["AZ"],
+    "zh"=>["TW"],
+    "ru"=>["RU", "KZ", "KG", "AZ", "LV", "UA", "TM", "AM", "UZ"],
+    "ky"=>["KG"],
+    "es"=>["ES", "HN", "CU", "PR", "TT", "PA", "VE", "DO", "BO", "GI", "PE",
+      "PY", "NI", "CL", "SV", "CO", "UY", "BZ", "CR", "EC", "GT", "AR", "MX"],
+    "ko"=>["KR"],
+    "pt_BR"=>["BR"],
+    "sw"=>["RW", "KE"],
+    "ga"=>["IE"],
+    "id"=>["ID"],
+    "eu"=>["ES"],
+    "gl"=>["ES"],
+    "xh"=>["ZA"],
+    "uz"=>["TM", "UZ"],
+    "mr"=>["IN"],
+    "fa"=>["AE"],
+    "zu"=>["LS", "ZA"],
+    "af"=>["NA", "ZA"],
+    "pl"=>["PL"],
+    "hy"=>["AM"],
+    "pa"=>["PK"],
+    "te"=>["IN"],
+    "ar"=>["AE", "LY", "SA", "DJ"],
+    "ms"=>["MY", "SG"],
+    "el"=>["GR"],
+    "ro"=>["RO"],
+    "mt"=>["MT"],
+    "ur"=>["AE", "PK"],
+    "da"=>["DK", "GL"],
+    "ca"=>["ES"],
+    "tr"=>["TR"],
+    "zh_CN"=>["SG"],
+    "nl"=>["NL", "BE", "ID"],
+    "vi"=>["VN"],
+    "lt"=>["LT", "LV"],
+    "th"=>["TH"],
+    "fo"=>["DK"],
+    "en"=>["US", "AS", "IE", "NP", "MY", "UK", "FM", "VC", "PR", "TT", "AU",
+      "PA", "NA", "GG", "LS", "RW", "VG", "AE", "GI", "VI", "AG", "TH", "CH",
+      "NF", "JE", "AI", "GL", "PH", "CK", "GM", "LY", "IN", "NZ", "NI", "SC",
+      "PK", "VN", "MS", "TO", "MT", "BE", "PN", "MU", "UG", "SG", "ZA", "BZ",
+      "SH", "MW", "FJ", "CR", "HK", "JM", "KE", "CA", "ID"],
+    "lv"=>["LV"]
+  }.freeze
+  
+module_function
+  def countries_from_language(language)
+    LANGUAGE_TO_COUNTRY[language]
+  end
+
+  def country_from_language(language)
+    (countries_from_language(language) || []).first
+  end
+end

data/lib/merb_babel/m_locale.rb

@@ -1,10 +1,33 @@
+require 'merb_babel/country_guesser'
+require 'locale'
+
 # The MLocale module helps you set up a locale, language, country
 # You don't have to use a locale, in some cases you might just want to use the language
 module MLocale
-      
+
+    def locale_from_request
+      if hal = request.env["HTTP_ACCEPT_LANGUAGE"]
+        hal.gsub!(/\s/, "")
+        result = hal.split(/,/).map do |v|
+          v.split(";q=")
+        end.map do |j|
+          [j[0], j[1] ? j[1].to_f : 1.0]
+        end.sort do |a,b|
+          -(a[1] <=> b[1])
+        end.map do |v|
+          Locale::Tag.parse(v[0])
+        end.first
+        return nil if result.nil?
+        language = result.language
+        country = result.country ||
+          CountryGuesser.country_from_language(language)
+        request.env[:locale] = "#{language}-#{country}"
+      end
+    end
+
     # A locale is made of a language + country code, such as en-UK or en-US 
     def locale 
-      request.env[:locale] || params[:locale] || (session ? session[:locale] : nil) || default_locale
+      request.env[:locale] || params[:locale] || (session ? session[:locale] : nil) || locale_from_request || default_locale
     end
     
     # Many people don't care about locales, they might just want to use languages instead
@@ -14,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) || default_country
+      request.env[:country] || params[:country] || country_from_locale || (session ? session[:country] : nil) || CountryGuesser.country_from_language(language) || default_country
     end
     
     # Extract the language from the locale
@@ -58,7 +81,6 @@ module MLocale
       
       # takes a locale as in fr-FR or en-US
       def set_locale
-        
         if locale =~ locale_regexp
           language, country = locale.match(locale_regexp).captures
           # Set the locale, language and country
@@ -73,4 +95,4 @@ module MLocale
         request.env[:language] = language.downcase
       end
   
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: genki-merb_babel
 version: !ruby/object:Gem::Version 
-  version: 0.1.0.1
+  version: 0.1.0.2
 platform: ruby
 authors: 
 - Matt Aimonetti
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-02 00:00:00 -08:00
+date: 2009-01-04 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,6 +21,15 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.0.7.1
     version: 
+- !ruby/object:Gem::Dependency 
+  name: locale
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.9.0
+    version: 
 description: Merb plugin that provides simple localization/internationalisation
 email: mattaimonetti@gmail.com
 executables: []
@@ -38,6 +47,7 @@ files:
 - TODO
 - lib/merb_babel
 - lib/merb_babel/core_ext.rb
+- lib/merb_babel/country_guesser.rb
 - lib/merb_babel/m_i18n.rb
 - lib/merb_babel/m_l10n.rb
 - lib/merb_babel/m_locale.rb