Change Where am I to Where is this on left sidebar

[rails.git] / config / initializers / i18n.rb

diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb
index aae87bef9be18f8539a3946743d5babc2d72bb87..91efa2557d741185ef43088d91518c90a3f13872 100644 (file)
--- a/config/initializers/i18n.rb
+++ b/config/initializers/i18n.rb
@@ -1,38 +1,35 @@
 module I18n
   module Backend
 module I18n
   module Backend

-    module Base
-      protected
-      alias_method :old_init_translations, :init_translations
-      
-      def init_translations
-        old_init_translations
-
-        merge_translations(:nb, translations[:no])
-        translations[:no] = translations[:nb]
-
-        friendly = translate('en', 'time.formats.friendly')
-
-        available_locales.each do |locale|
-          unless lookup(locale, 'time.formats.friendly')
-            store_translations(locale, :time => { :formats => { :friendly => friendly } })
-          end
-        end
-      end
-    end
-

     module PluralizationFallback
       def pluralize(locale, entry, count)
         super
       rescue InvalidPluralizationData => ex
     module PluralizationFallback
       def pluralize(locale, entry, count)
         super
       rescue InvalidPluralizationData => ex

-        raise ex unless ex.entry.has_key?(:other)
+        raise ex unless ex.entry.key?(:other)

         ex.entry[:other]
       end
     end
   end
         ex.entry[:other]
       end
     end
   end

+
+  module JS
+    class FallbackLocales
+      def default_fallbacks_with_validation
+        default_fallbacks_without_validation.select do |locale|
+          ::I18n.available_locales.include?(locale)
+        end
+      end
+
+      alias_method_chain :default_fallbacks, :validation
+    end
+  end

 end
 
 end
 

-I18n::Backend::Simple.send(:include, I18n::Backend::Pluralization)
-I18n::Backend::Simple.send(:include, I18n::Backend::PluralizationFallback)
-I18n.load_path << RAILS_ROOT + "/config/pluralizers.rb"
+I18n::Backend::Simple.include(I18n::Backend::PluralizationFallback)
+I18n::Backend::Simple.include(I18n::Backend::Fallbacks)
+
+I18n.fallbacks.map("no" => "nb")

 
 

-I18n::Backend::Simple.send(:include, I18n::Backend::Fallbacks)
+I18n.enforce_available_locales = false
+
+Rails.configuration.after_initialize do
+  I18n.available_locales
+end