refinerycms-i18n 0.9.9.13 → 0.9.9.14

data/config/locales/{ja.yml → jp.yml}

@@ -4,7 +4,7 @@
 # contributors:
 #  - Tsutomu Kuroda (t-kuroda@oiax.jp)
 
-ja:
+jp:
   date:
     formats:
       default: "%Y/%m/%d"

data/lib/gemspec.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-version = '0.9.9.13'
+version = '0.9.9.14'
 raise "Could not get version so gemspec can not be built" if version.nil?
 files = Dir.glob("**/*").flatten.reject do |file|
   file =~ /\.gem(spec)?$/

data/lib/refinery/i18n.rb

@@ -30,12 +30,12 @@ module Refinery
               ::I18n.locale = ::Refinery::I18n.current_locale
 
               if ::Refinery::I18n.has_locale?(locale = params[:locale].try(:to_sym))
-                Thread.current[:globalize_locale] = locale
+                ::I18n.locale = locale
               elsif locale.present? and locale != ::Refinery::I18n.default_frontend_locale
-                params[:locale] = Thread.current[:globalize_locale] = ::Refinery::I18n.default_frontend_locale
+                params[:locale] = ::I18n.locale = ::Refinery::I18n.default_frontend_locale
                 redirect_to(params, :notice => "The locale '#{locale}' is not supported.") and return
               else
-                Thread.current[:globalize_locale] = ::Refinery::I18n.default_frontend_locale
+                ::I18n.locale = ::Refinery::I18n.default_frontend_locale
               end
             end
           end
@@ -127,14 +127,8 @@ module Refinery
       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
+        if Globalize.locale.present? && Globalize.locale.to_s != ::Refinery::I18n.default_frontend_locale.to_s
+          Globalize.locale
         elsif ::Refinery::I18n.default_frontend_locale.present?
           ::Refinery::I18n.default_frontend_locale
         else
@@ -208,7 +202,8 @@ module Refinery
       :el => 'Ελληνικά',
       :rs => 'Srpski',
       :cs => 'Česky',
-      :sk => 'Slovenský'
+      :sk => 'Slovenský',
+      :jp => '日本語'
     }
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: refinerycms-i18n
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.9.13
+  version: 0.9.9.14
 platform: ruby
 authors: 
 - Resolve Digital
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-11 00:00:00 +13:00
+date: 2011-03-15 00:00:00 +13:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -87,7 +87,7 @@ files:
 - config/locales/id.yml
 - config/locales/is.yml
 - config/locales/it.yml
-- config/locales/ja.yml
+- config/locales/jp.yml
 - config/locales/ko.yml
 - config/locales/lo.yml
 - config/locales/lt.yml