Merge remote-tracking branch 'upstream/pull/4077'

diff --combined test/lib/i18n_test.rb
index ab7cc4dc2b84c9124994037f1e07162ed4999aad,def2442bf3120023fcba78ccefe9000147f7e6cf..a25e4887c9bd00a11f51d178d7a8f859b35baee1
--- 1/test/lib/i18n_test.rb
--- 2/test/lib/i18n_test.rb
+++ b/test/lib/i18n_test.rb
@@@ -55,13 -55,10 +55,13 @@@ class I18nTest < ActiveSupport::TestCas
      end
    end
  
 -  def test_en_for_raw_html
 -    en = YAML.load_file(Rails.root.join("config/locales/en.yml"))
 -    assert_nothing_raised do
 -      check_values_for_raw_html(en)
 +  Rails.root.glob("config/locales/*.yml").each do |filename|
 +    lang = File.basename(filename, ".yml")
 +    define_method("test_#{lang}_for_raw_html".to_sym) do
 +      yml = YAML.load_file(filename)
 +      assert_nothing_raised do
 +        check_values_for_raw_html(yml)
 +      end
      end
    end
  
@@@ -72,6 -69,15 +72,15 @@@
      end
    end
  
+   # We should avoid using the key `zero:` in English, since that key
+   # is used for "numbers ending in zero" in other languages.
+   def test_en_for_zero_key
+     en = YAML.load_file(Rails.root.join("config/locales/en.yml"))
+     assert_nothing_raised do
+       check_keys_for_zero(en)
+     end
+   end
+ 
    private
  
    def translation_keys(scope = nil)
@@@ -104,7 -110,7 +113,7 @@@
        if v.is_a? Hash
          check_values_for_raw_html(v)
        else
 -        next unless k.end_with?("_html")
 +        next unless k.to_s.end_with?("_html")
          raise "Avoid using raw html in '#{k}: #{v}'" if v.include? "<"
        end
      end
@@@ -119,4 -125,14 +128,14 @@@
        end
      end
    end
+ 
+   def check_keys_for_zero(hash)
+     hash.each_pair do |k, v|
+       if v.is_a? Hash
+         check_keys_for_zero(v)
+       else
+         raise "Avoid using 'zero' key in '#{k}: #{v}'" if k.to_s == "zero"
+       end
+     end
+   end
  end