muck-engine 0.1.8 → 0.1.9

data/VERSION

@@ -1 +1 @@
-0.1.8
+0.1.9

data/lib/action_controller/muck_application.rb

@@ -13,7 +13,7 @@ module ActionController
       # http://guides.rubyonrails.org/i18n.html
       # http://zargony.com/2009/01/09/selecting-the-locale-for-a-request
       def discover_locale
-        I18n.locale = extract_locale_from_user_selection || extract_locale_from_tld || extract_locale_from_subdomain || extract_locale_from_headers || extract_locale_from_browser || I18n.default_locale
+        I18n.locale = extract_locale_from_user_selection || extract_locale_from_tld || extract_locale_from_subdomain || extract_locale_from_headers || I18n.default_locale
       end
       
       def extract_locale_from_browser
@@ -35,7 +35,8 @@ module ActionController
       
       def extract_locale_from_headers
         preferred_locales = request.headers['HTTP_ACCEPT_LANGUAGE'].split(',').map { |l| l.split(';').first }
-        preferred_locales.select { |l| I18n.available_locales.include?(l.to_sym) } || nil
+        accepted_locales = preferred_locales.select { |l| I18n.available_locales.include?(l.to_sym) }
+        accepted_locales.empty? ? nil : accepted_locales.first
       end
       
       # Get locale from top-level domain or return nil if such locale is not available 
@@ -44,7 +45,7 @@ module ActionController
       # in your /etc/hosts file to try this out locally 
       def extract_locale_from_tld 
         parsed_locale = request.host.split('.').last 
-        (I18n.available_locales.include? parsed_locale) ? parsed_locale : nil 
+        (I18n.available_locales.include? parsed_locale) ? parsed_locale.to_sym : nil 
       end 
 
       # Get locale code from request subdomain (like http://it.application.local:3000) 
@@ -53,7 +54,7 @@ module ActionController
       # in your /etc/hosts file to try this out locally 
       def extract_locale_from_subdomain 
         parsed_locale = request.subdomains.first 
-        (I18n.available_locales.include? parsed_locale) ? parsed_locale : nil 
+        (I18n.available_locales.include? parsed_locale.to_sym) ? parsed_locale.to_sym : nil 
       end 
       
       def setup_paging

data/muck-engine.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-engine}
-  s.version = "0.1.8"
+  s.version = "0.1.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball"]
-  s.date = %q{2009-06-24}
+  s.date = %q{2009-06-25}
   s.description = %q{The base engine for the muck system.  Contains common tables, custom for, css and javascript.}
   s.email = %q{justinball@gmail.com}
   s.extra_rdoc_files = [
@@ -147,7 +147,6 @@ Gem::Specification.new do |s|
      "locales/zh.yml",
      "locales/zh.yml",
      "muck-engine.gemspec",
-     "pkg/muck-engine-0.1.7.gem",
      "public/images/arrow_down.gif",
      "public/images/arrow_left.gif",
      "public/images/arrow_right.gif",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muck-engine
 version: !ruby/object:Gem::Version 
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors: 
 - Justin Ball
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-24 00:00:00 -06:00
+date: 2009-06-25 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -101,7 +101,6 @@ files:
 - locales/zh-TW.yml
 - locales/zh.yml
 - muck-engine.gemspec
-- pkg/muck-engine-0.1.7.gem
 - public/images/arrow_down.gif
 - public/images/arrow_left.gif
 - public/images/arrow_right.gif