refinerycms-i18n 0.9.9.12 → 0.9.9.13

data/lib/gemspec.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-version = '0.9.9.12'
+version = '0.9.9.13'
 raise "Could not get version so gemspec can not be built" if version.nil?
 files = Dir.glob("**/*").flatten.reject do |file|
   file =~ /\.gem(spec)?$/
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.authors           = %w(Resolve\\ Digital)
   s.require_paths     = %w(lib)
 
-  s.add_dependency    'refinerycms', '>= 0.9.8'
+  s.add_dependency    'refinerycms-core', '>= 0.9.9.8'
   s.add_dependency    'routing-filter', '>= 0.2.3'
 
   s.files             = [

data/lib/refinery/i18n.rb

@@ -27,16 +27,16 @@ module Refinery
 
           def find_or_set_locale
             if ::Refinery::I18n.enabled?
+              ::I18n.locale = ::Refinery::I18n.current_locale
+
               if ::Refinery::I18n.has_locale?(locale = params[:locale].try(:to_sym))
-                ::I18n.locale = locale
+                Thread.current[:globalize_locale] = locale
               elsif locale.present? and locale != ::Refinery::I18n.default_frontend_locale
-                params[:locale] = ::I18n.locale = ::Refinery::I18n.default_frontend_locale
+                params[:locale] = Thread.current[:globalize_locale] = ::Refinery::I18n.default_frontend_locale
                 redirect_to(params, :notice => "The locale '#{locale}' is not supported.") and return
               else
-                ::I18n.locale = ::Refinery::I18n.default_frontend_locale
+                Thread.current[:globalize_locale] = ::Refinery::I18n.default_frontend_locale
               end
-
-              Thread.current[:globalize_locale] = ::I18n.locale
             end
           end
 
@@ -86,8 +86,8 @@ module Refinery
 
     class << self
 
-      attr_accessor :built_in_locales, :current_locale, :default_locale,
-                    :default_frontend_locale, :enabled, :locales
+      attr_accessor :built_in_locales, :current_locale, :current_frontend_locale,
+                    :default_locale, :default_frontend_locale, :enabled, :locales
 
       def enabled?
         RefinerySetting.find_or_set(:i18n_translation_enabled, true, {
@@ -126,6 +126,22 @@ module Refinery
         }).to_sym
       end
 
+      def current_frontend_locale
+        if Thread.current[:globalize_locale].present?
+          if Thread.current[:globalize_locale].to_s != ::Refinery::I18n.default_frontend_locale.to_s
+            Thread.current[:globalize_locale]
+          else
+            ::Refinery::I18n.default_frontend_locale
+          end
+        elsif ::I18n.locale.present? && ::I18n.locale.to_s != ::Refinery::I18n.default_frontend_locale.to_s
+          ::I18n.locale
+        elsif ::Refinery::I18n.default_frontend_locale.present?
+          ::Refinery::I18n.default_frontend_locale
+        else
+          ::I18n.locale
+        end
+      end
+
       def default_frontend_locale
         RefinerySetting.find_or_set(:i18n_translation_default_frontend_locale, :en, {
           :scoping => 'refinery'

metadata

@@ -2,7 +2,7 @@
 name: refinerycms-i18n
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.9.12
+  version: 0.9.9.13
 platform: ruby
 authors: 
 - Resolve Digital
@@ -10,18 +10,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-10 00:00:00 +13:00
+date: 2011-03-11 00:00:00 +13:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: refinerycms
+  name: refinerycms-core
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.8
+        version: 0.9.9.8
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency