muck-engine 0.4.11 → 0.4.12

data/VERSION

@@ -1 +1 @@
-0.4.11
+0.4.12

data/lib/action_controller/muck_application.rb

@@ -43,10 +43,18 @@ module ActionController
       end
 
       def extract_locale_from_user_selection
+        extract_locale_from_url || extract_locale_from_cookie
+      end
+      
+      def extract_locale_from_url
         if !params[:locale].blank? && I18n.available_locales.include?(params[:locale].to_sym)
           cookies['locale'] = { :value => params[:locale], :expires => 1.year.from_now }
           params[:locale].to_sym
-        elsif cookies['locale'] && I18n.available_locales.include?(cookies['locale'].to_sym)
+        end
+      end
+      
+      def extract_locale_from_cookie
+        if cookies['locale'] && I18n.available_locales.include?(cookies['locale'].to_sym)
           cookies['locale'].to_sym
         end
       end

data/muck-engine.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-engine}
-  s.version = "0.4.11"
+  s.version = "0.4.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball", "Joel Duffin"]
-  s.date = %q{2010-02-24}
+  s.date = %q{2010-02-25}
   s.description = %q{The base engine for the muck system.  Contains common tables, custom for, css and javascript.}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 11
-  version: 0.4.11
+  - 12
+  version: 0.4.12
 platform: ruby
 authors: 
 - Justin Ball
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-24 00:00:00 -07:00
+date: 2010-02-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency