refinerycms-i18n 0.9.8.11 → 0.9.8.12

data/config/locales/{sv-SE.yml → sv.yml}

@@ -4,7 +4,7 @@
 #   * Sven Dahlstrand (sven.dahlstrand@gmail.com)
 #   * Henrik Nyh (henrik@nyh.se)
 
-"sv-SE":
+"sv":
   number:
     # Used in number_with_delimiter()
     # These are also the defaults for 'currency', 'percentage', 'precision', and 'human'

data/lib/gemspec.rb

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

@@ -12,7 +12,7 @@ module Refinery
       end
 
       config.to_prepare do
-        ::ApplicationController.class_eval %{
+        ::ApplicationController.class_eval do
           def default_url_options(options={})
             ::Refinery::I18n.enabled? ? { :locale => ::I18n.locale } : {}
           end
@@ -25,7 +25,7 @@ module Refinery
                 ::I18n.locale = locale
               elsif locale.present? and locale != ::Refinery::I18n.default_frontend_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.to_s}' is not supported.") and return
               else
                 ::I18n.locale = ::Refinery::I18n.default_frontend_locale
               end
@@ -33,9 +33,11 @@ module Refinery
           end
 
           protected :default_url_options, :find_or_set_locale
-        }
+        end
+
+        ::Admin::BaseController.class_eval do
+          prepend_before_filter :find_or_set_locale
 
-        ::Refinery::AdminBaseController.class_eval %{
           def find_or_set_locale
             if (params[:set_locale].present? and ::Refinery::I18n.locales.include?(params[:set_locale].to_sym))
               ::Refinery::I18n.current_locale = params[:set_locale].to_sym
@@ -46,7 +48,7 @@ module Refinery
           end
 
           protected :find_or_set_locale
-        }
+        end
       end
 
       config.after_initialize do
@@ -57,7 +59,7 @@ module Refinery
 
     class << self
 
-      attr_accessor :enabled, :current_locale, :locales, :default_locale, :default_frontend_locale
+      attr_accessor :enabled, :current_locale, :locales, :default_locale, :default_frontend_locale, :built_in_locales
 
       def enabled?
         # cache this lookup as it gets very expensive.
@@ -117,22 +119,7 @@ module Refinery
       end
 
       def locales
-        @locales ||= RefinerySetting.find_or_set(:i18n_translation_locales, {
-            :en => 'English',
-            :fr => 'Français',
-            :nl => 'Nederlands',
-            :'pt-BR' => 'Português',
-            :da => 'Dansk',
-            :nb => 'Norsk Bokmål',
-            :sl => 'Slovenian',
-            :es => 'Español',
-            :it => 'Italiano',
-            :'zh-CN' => 'Simple Chinese',
-            :de => 'Deutsch',
-            :lv => 'Latviski',
-            :ru => 'Русский',
-            :sv => 'Svenska'
-          },
+        @locales ||= RefinerySetting.find_or_set(:i18n_translation_locales, self.built_in_locales,
           {
             :scoping => 'refinery',
             :callback_proc_as_string => %q{::Refinery::I18n.setup!}
@@ -167,7 +154,7 @@ module Refinery
           RefinerySetting.find_by_name_and_scoping('i18n_translation_locales', 'refinery').try(:value)
         end
 
-        if locales.present? and locales.is_a?(Hash) and locales.keys.exclude?(:sv)
+        if locales.present? and locales.is_a?(Hash) and locales.keys.exclude?(self.built_in_locales.keys.last)
           value = {:value => nil, :scoping => 'refinery'}
           if RefinerySetting.respond_to?(:set)
             RefinerySetting.set(:i18n_translation_locales, value)
@@ -202,5 +189,23 @@ module Refinery
       end
 
     end
+
+    @built_in_locales = {
+      :en => 'English',
+      :fr => 'Français',
+      :nl => 'Nederlands',
+      :'pt-BR' => 'Português',
+      :da => 'Dansk',
+      :nb => 'Norsk Bokmål',
+      :sl => 'Slovenian',
+      :es => 'Español',
+      :it => 'Italiano',
+      :'zh-CN' => 'Simple Chinese',
+      :de => 'Deutsch',
+      :lv => 'Latviski',
+      :ru => 'Русский',
+      :sv => 'Svenska',
+      :pl => 'Polski'
+    }
   end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms-i18n
 version: !ruby/object:Gem::Version 
-  hash: 49
   prerelease: false
   segments: 
   - 0
   - 9
   - 8
-  - 11
-  version: 0.9.8.11
+  - 12
+  version: 0.9.8.12
 platform: ruby
 authors: 
 - Resolve Digital
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-15 00:00:00 +13:00
+date: 2010-12-02 00:00:00 +13:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,7 +26,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 43
         segments: 
         - 0
         - 9
@@ -43,7 +41,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 0
         - 1
@@ -110,7 +107,7 @@ files:
 - config/locales/sl.yml
 - config/locales/sr-Latn.yml
 - config/locales/sr.yml
-- config/locales/sv-SE.yml
+- config/locales/sv.yml
 - config/locales/sw.yml
 - config/locales/th.rb
 - config/locales/tr.yml
@@ -161,7 +158,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -170,7 +166,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"