X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/037585db3933a2954b43bd4b30ea5e30ade00be2..19c2f6d485baf6ae5986a9eeaed412cb2e2039a1:/config/initializers/i18n.rb?ds=sidebyside

diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb
index 91efa2557..b4399a9f8 100644
--- a/config/initializers/i18n.rb
+++ b/config/initializers/i18n.rb
@@ -5,24 +5,36 @@ module I18n
         super
       rescue InvalidPluralizationData => ex
         raise ex unless ex.entry.key?(:other)
+
         ex.entry[:other]
       end
     end
   end
+end
+
+module OpenStreetMap
+  module I18n
+    module NormaliseLocales
+      def store_translations(locale, data, options = {})
+        locale = ::I18n::Locale::Tag::Rfc4646.tag(locale).to_s
+
+        super(locale, data, options)
+      end
+    end
 
-  module JS
-    class FallbackLocales
-      def default_fallbacks_with_validation
-        default_fallbacks_without_validation.select do |locale|
+    module ValidateLocales
+      def default_fallbacks
+        super.select do |locale|
           ::I18n.available_locales.include?(locale)
         end
       end
-
-      alias_method_chain :default_fallbacks, :validation
     end
   end
 end
 
+I18n::Backend::Simple.prepend(OpenStreetMap::I18n::NormaliseLocales)
+I18n::JS::FallbackLocales.prepend(OpenStreetMap::I18n::ValidateLocales)
+
 I18n::Backend::Simple.include(I18n::Backend::PluralizationFallback)
 I18n::Backend::Simple.include(I18n::Backend::Fallbacks)