Refactor diary entry tests to use User factory

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

diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb
index ac4ad81d62bce072b94291c2beea0a786c951634..a94618c7e3f374f580edd1cf6eca371bb723f452 100644 (file)
--- a/config/initializers/i18n.rb
+++ b/config/initializers/i18n.rb
@@ -1,27 +1,45 @@
-require 'globalize/i18n/missing_translations_log_handler'
-
-I18n.missing_translations_logger = Logger.new("#{RAILS_ROOT}/log/missing_translations.log")
-I18n.exception_handler = :missing_translations_log_handler
-
 module I18n
   module Backend
+    module PluralizationFallback
+      def pluralize(locale, entry, count)
+        super
+      rescue InvalidPluralizationData => ex
+        raise ex unless ex.entry.key?(:other)
+        ex.entry[:other]
+      end
+    end
+
     class Simple
-      protected
-      alias_method :old_init_translations, :init_translations
-      
-      def init_translations
-        old_init_translations
+      def store_translations_with_normalisation(locale, data, options = {})
+        locale = I18n::Locale::Tag::Rfc4646.tag(locale).to_s
 
-        friendly = translate('en', 'time.formats.friendly')
+        store_translations_without_normalisation(locale, data, options)
+      end
 
-        available_locales.each do |locale|
-          time_formats = I18n.t('time.formats', :locale => locale)
+      alias_method_chain :store_translations, :normalisation
+    end
+  end
 
-          unless time_formats.has_key?(:friendly)
-            store_translations(locale, :time => { :formats => { :friendly => friendly } })
-          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
+
+I18n::Backend::Simple.include(I18n::Backend::PluralizationFallback)
+I18n::Backend::Simple.include(I18n::Backend::Fallbacks)
+
+I18n.fallbacks.map("no" => "nb")
+
+I18n.enforce_available_locales = false
+
+Rails.configuration.after_initialize do
+  I18n.available_locales
+end