Merge branch 'pull/5745'
This commit is contained in:
commit
a0768a4d04
2 changed files with 0 additions and 12 deletions
|
@ -21,7 +21,6 @@
|
|||
|
||||
I18n.default_locale = OSM.DEFAULT_LOCALE;
|
||||
I18n.locale = locale;
|
||||
I18n.fallbacks = true;
|
||||
|
||||
// '-' are replaced with '_' in https://github.com/eemeli/make-plural/tree/main/packages/plurals
|
||||
const pluralizer = plurals[locale.replace(/\W+/g, "_")] || plurals[locale.split("-")[0]];
|
||||
|
|
|
@ -21,25 +21,14 @@ module OpenStreetMap
|
|||
super
|
||||
end
|
||||
end
|
||||
|
||||
module ValidateLocales
|
||||
def default_fallbacks
|
||||
super.select do |locale|
|
||||
::I18n.available_locales.include?(locale)
|
||||
end
|
||||
end
|
||||
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)
|
||||
|
||||
I18n.fallbacks.map("no" => "nb")
|
||||
|
||||
I18n.enforce_available_locales = false
|
||||
|
||||
if Rails.env.test?
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue