X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/30f8e412bc0b43e62b46b99f2cbe3d0c7ac13d51..d6bbcae9dbd51414fd5b0d22129df9bd81650e62:/config/initializers/i18n.rb diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb index c8bbdcce0..1ee7716e6 100644 --- a/config/initializers/i18n.rb +++ b/config/initializers/i18n.rb @@ -4,7 +4,7 @@ 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 @@ -15,7 +15,7 @@ module I18n def make_ordered(unordered) ordered = ActiveSupport::OrderedHash.new - unordered.keys.sort { |a,b| a.to_s <=> b.to_s }.each do |key| + unordered.keys.sort { |a, b| a.to_s <=> b.to_s }.each do |key| value = unordered[key] if value.is_a?(Hash) @@ -42,6 +42,8 @@ I18n::Backend::Simple.include(I18n::Backend::Fallbacks) I18n.fallbacks.map("no" => "nb") -Rails.configuration.after_initialize do |app| +I18n.enforce_available_locales = false + +Rails.configuration.after_initialize do I18n.available_locales end