X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/52e5fa6ad78f375cec5a207a123a4aa3939c8ddf..83043d6f1cd85729a3f91e5c73d78a39b8ae7d04:/config/initializers/i18n.rb?ds=inline diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb index 3c3ba872c..8f74c3cd3 100644 --- a/config/initializers/i18n.rb +++ b/config/initializers/i18n.rb @@ -1,31 +1,53 @@ module I18n module Backend - module Fallbacks - def find_first_string_or_lambda_default(defaults) - defaults.each_with_index { |default, ix| return ix if default && !default.is_a?(Symbol) } - nil + module PluralizationFallback + def pluralize(locale, entry, count) + super + rescue InvalidPluralizationData => e + raise e unless e.entry.key?(:other) + + e.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 - module PluralizationFallback - def pluralize(locale, entry, count) super - rescue InvalidPluralizationData => ex - raise ex unless ex.entry.has_key?(:other) - ex.entry[:other] + end + end + + module ValidateLocales + def default_fallbacks + super.select do |locale| + ::I18n.available_locales.include?(locale) + end end end end end -I18n::Backend::Simple.include(I18n::Backend::Pluralization) -I18n::Backend::Simple.include(I18n::Backend::PluralizationFallback) -I18n.load_path << "#{Rails.root}/config/pluralizers.rb" +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) I18n.fallbacks.map("no" => "nb") +I18n.enforce_available_locales = false + +if Rails.env.test? + I18n.exception_handler = proc do |exception| + raise exception.to_exception + end +end + Rails.configuration.after_initialize do - I18n.reload! + I18n.available_locales end