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

[rails.git] / test / lib / i18n_test.rb

diff --git a/test/lib/i18n_test.rb b/test/lib/i18n_test.rb
index ab7cc4dc2b84c9124994037f1e07162ed4999aad..fe94cbdd3604e1de39d2b8505891d7fcd51a3cdb 100644 (file)
--- a/test/lib/i18n_test.rb
+++ b/test/lib/i18n_test.rb
@@ -2,7 +2,7 @@ require "test_helper"
 
 class I18nTest < ActiveSupport::TestCase
   I18n.available_locales.each do |locale|
 
 class I18nTest < ActiveSupport::TestCase
   I18n.available_locales.each do |locale|

-    define_method("test_#{locale.to_s.underscore}".to_sym) do
+    test locale.to_s do

       without_i18n_exceptions do
         # plural_keys = plural_keys(locale)
 
       without_i18n_exceptions do
         # plural_keys = plural_keys(locale)
 


@@ -42,7 +42,7 @@ class I18nTest < ActiveSupport::TestCase
 
             assert_includes value, :other, "#{key}.other plural key missing"
           else
 
             assert_includes value, :other, "#{key}.other plural key missing"
           else

-            assert value.is_a?(String), "#{key} is not a string"
+            assert_kind_of String, value, "#{key} is not a string"

 
             value.scan(/%\{(\w+)\}/) do
               assert_includes variables, Regexp.last_match(1), "#{key} uses unknown interpolation variable #{Regexp.last_match(1)}"
 
             value.scan(/%\{(\w+)\}/) do
               assert_includes variables, Regexp.last_match(1), "#{key} uses unknown interpolation variable #{Regexp.last_match(1)}"


@@ -57,7 +57,7 @@ class I18nTest < ActiveSupport::TestCase
 
   Rails.root.glob("config/locales/*.yml").each do |filename|
     lang = File.basename(filename, ".yml")
 
   Rails.root.glob("config/locales/*.yml").each do |filename|
     lang = File.basename(filename, ".yml")

-    define_method("test_#{lang}_for_raw_html".to_sym) do
+    test "#{lang} for raw html" do

       yml = YAML.load_file(filename)
       assert_nothing_raised do
         check_values_for_raw_html(yml)
       yml = YAML.load_file(filename)
       assert_nothing_raised do
         check_values_for_raw_html(yml)


@@ -72,6 +72,15 @@ class I18nTest < ActiveSupport::TestCase
     end
   end
 
     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)
   private
 
   def translation_keys(scope = nil)


@@ -119,4 +128,14 @@ class I18nTest < ActiveSupport::TestCase
       end
     end
   end
       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
 end