lastobelus-merb_global 0.0.9 → 0.0.10

data/Rakefile

@@ -4,7 +4,7 @@ require 'rake/rdoctask'
 
 PLUGIN = "merb_global"
 NAME = "merb_global"
-GEM_VERSION = "0.0.9"
+GEM_VERSION = "0.0.10"
 AUTHORS = ["Alex Coles", "Maciej Piechotka"]
 EMAIL = "merb_global@googlegroups.com"
 HOMEPAGE = "http://trac.ikonoklastik.com/merb_global/"

data/lib/merb_global/controller.rb

@@ -9,12 +9,20 @@ module Merb
     before do
       # Set up the language
       accept_language = self.request.env['HTTP_ACCEPT_LANGUAGE']
+      if Merb::Global.config(:locale_in_session)
+        if params[:locale]
+          session[:locale] = params[:locale]
+        elsif session[:locale]
+          params[:locale] = session[:locale]
+        end
+      end
       Merb::Global::Locale.current =
         Merb::Global::Locale.new(params[:locale]) ||
         (self._mg_locale &&
          Merb::Global::Locale.new(self.instance_eval(&self._mg_locale))) ||
          Merb::Global::Locale.from_accept_language(accept_language) || 
          Merb::Global::Locale.new('en')
+      params[:locale] ||= Merb::Global::Locale.current.to_s
     end
 
     # Sets the language of block.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: lastobelus-merb_global
 version: !ruby/object:Gem::Version 
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors: 
 - Alex Coles