Update to iD v1.7.3

[rails.git] / config / initializers / i18n.rb

diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb
index f3da8a1274855d3ebfe1535ff43468f826c58db2..1ee7716e6e45e4839a7477097b837e05de06cc9d 100644 (file)
--- 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,4 +42,8 @@ I18n::Backend::Simple.include(I18n::Backend::Fallbacks)
 
 I18n.fallbacks.map("no" => "nb")
 
-I18n.available_locales
+I18n.enforce_available_locales = false
+
+Rails.configuration.after_initialize do
+  I18n.available_locales
+end