Merge branch 'master' into openid

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

diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb
index 54a925e3cd6ee85deab7f85cba7968be03168ce4..b2af5004e463abee8834b404a7864396651de934 100644 (file)
--- a/config/initializers/i18n.rb
+++ b/config/initializers/i18n.rb
@@ -2,3 +2,29 @@ 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
 
 I18n.missing_translations_logger = Logger.new("#{RAILS_ROOT}/log/missing_translations.log")
 I18n.exception_handler = :missing_translations_log_handler

+
+module I18n
+  module Backend
+    class Simple
+      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|
+          time_formats = I18n.t('time.formats', :locale => locale)
+
+          unless time_formats.has_key?(:friendly)
+            store_translations(locale, :time => { :formats => { :friendly => friendly } })
+          end
+        end
+      end
+    end
+  end
+end