Merge branch 'master' into openid

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

diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb
index ac4ad81d62bce072b94291c2beea0a786c951634..b2af5004e463abee8834b404a7864396651de934 100644 (file)
--- a/config/initializers/i18n.rb
+++ b/config/initializers/i18n.rb
@@ -12,6 +12,9 @@ module I18n
       def init_translations
         old_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|
         friendly = translate('en', 'time.formats.friendly')
 
         available_locales.each do |locale|