refinerycms-i18n 0.9.9.1 → 0.9.9.2

data/lib/gemspec.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-version = '0.9.9.1'
+version = '0.9.9.2'
 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

@@ -11,6 +11,10 @@ module Refinery
         require File.expand_path('../translate', __FILE__)
       end
 
+      initializer "serve static assets" do |app|
+        app.middleware.insert_after ::ActionDispatch::Static, ::ActionDispatch::Static, "#{root}/public"
+      end
+
       config.to_prepare do
         ::ApplicationController.class_eval do
           def default_url_options(options={})
@@ -25,7 +29,7 @@ module Refinery
                 Thread.current[:globalize_locale] = ::I18n.locale = locale
               elsif locale.present? and locale != ::Refinery::I18n.default_frontend_locale
                 Thread.current[:globalize_locale] = params[:locale] = I18n.locale = ::Refinery::I18n.default_frontend_locale
-                redirect_to(params, :notice => "The locale '#{locale.to_s}' is not supported.") and return
+                redirect_to(params, :notice => "The locale '#{locale}' is not supported.") and return
               else
                 Thread.current[:globalize_locale] = ::I18n.locale = ::Refinery::I18n.default_frontend_locale
               end
@@ -61,7 +65,7 @@ module Refinery
 
         Refinery::Plugin.register do |plugin|
           plugin.name = "refinery_i18n"
-          plugin.version = %q{0.9.9.1}
+          plugin.version = %q{0.9.9.2}
           plugin.hide_from_menu = true
           plugin.always_allow_access = true
         end
@@ -176,7 +180,7 @@ module Refinery
         end
 
         if locales.present? and locales.is_a?(Hash) and locales.keys.exclude?(self.built_in_locales.keys.last)
-          value = {:value => nil, :scoping => 'refinery'}
+          value = {:value => locales.dup.deep_merge(self.built_in_locales), :scoping => 'refinery'}
           if RefinerySetting.respond_to?(:set)
             RefinerySetting.set(:i18n_translation_locales, value)
           else
@@ -221,12 +225,13 @@ module Refinery
       :sl => 'Slovenian',
       :es => 'Español',
       :it => 'Italiano',
-      :'zh-CN' => 'Simple Chinese',
       :de => 'Deutsch',
       :lv => 'Latviski',
       :ru => 'Русский',
       :sv => 'Svenska',
-      :pl => 'Polski'
+      :pl => 'Polski',
+      :'zh-CN' => 'Simple Chinese',
+      :'zh-TW' => 'Traditional Chinese'
     }
   end
-end
+end