X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/497009ed2b98dfdeeb349e891c1fbd88d14ff087..76d365ce71b942466d07480ded13098860d4f1b3:/config/initializers/i18n.rb diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb index 2562b67a0..91efa2557 100644 --- a/config/initializers/i18n.rb +++ b/config/initializers/i18n.rb @@ -4,35 +4,21 @@ module I18n def pluralize(locale, entry, count) super rescue InvalidPluralizationData => ex - raise ex unless ex.entry.has_key?(:other) + raise ex unless ex.entry.key?(:other) ex.entry[:other] end end end module JS - class << self - def make_ordered(unordered) - ordered = ActiveSupport::OrderedHash.new - - unordered.keys.sort { |a,b| a.to_s <=> b.to_s }.each do |key| - value = unordered[key] - - if value.is_a?(Hash) - ordered[key] = make_ordered(value) - else - ordered[key] = value - end + class FallbackLocales + def default_fallbacks_with_validation + default_fallbacks_without_validation.select do |locale| + ::I18n.available_locales.include?(locale) end - - ordered - end - - def filtered_translations_with_order - make_ordered(filtered_translations_without_order) end - alias_method_chain :filtered_translations, :order + alias_method_chain :default_fallbacks, :validation end end end