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

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

diff --git a/test/lib/i18n_test.rb b/test/lib/i18n_test.rb
index 8145c3613db0812a9d4e427bc8006dee1049e3ac..8d597fc6592ecb373e8179c4c302bbe7a839c405 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
+    define_method(:"test_#{locale.to_s.underscore}") do

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


@@ -39,6 +39,8 @@ class I18nTest < ActiveSupport::TestCase
                 assert_includes variables, Regexp.last_match(1), "#{key}.#{subkey} uses unknown interpolation variable #{Regexp.last_match(1)}"
               end
             end
                 assert_includes variables, Regexp.last_match(1), "#{key}.#{subkey} uses unknown interpolation variable #{Regexp.last_match(1)}"
               end
             end

+
+            assert_includes value, :other, "#{key}.other plural key missing"

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


@@ -53,6 +55,32 @@ class I18nTest < ActiveSupport::TestCase
     end
   end
 
     end
   end
 

+  Rails.root.glob("config/locales/*.yml").each do |filename|
+    lang = File.basename(filename, ".yml")
+    define_method(:"test_#{lang}_for_raw_html") do
+      yml = YAML.load_file(filename)
+      assert_nothing_raised do
+        check_values_for_raw_html(yml)
+      end
+    end
+  end
+
+  def test_en_for_nil_values
+    en = YAML.load_file(Rails.root.join("config/locales/en.yml"))
+    assert_nothing_raised do
+      check_values_for_nil(en)
+    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)


@@ -61,13 +89,14 @@ class I18nTest < ActiveSupport::TestCase
     I18n.t(scope || ".", :locale => I18n.default_locale).map do |key, value|
       scoped_key = scope ? "#{scope}.#{key}" : key
 
     I18n.t(scope || ".", :locale => I18n.default_locale).map do |key, value|
       scoped_key = scope ? "#{scope}.#{key}" : key
 

-      if value.is_a?(Hash)
+      case value
+      when Hash

         if value.keys - plural_keys == []
           scoped_key
         else
           translation_keys(scoped_key)
         end
         if value.keys - plural_keys == []
           scoped_key
         else
           translation_keys(scoped_key)
         end

-      elsif value.is_a?(String)
+      when String

         scoped_key
       end
     end.flatten
         scoped_key
       end
     end.flatten


@@ -78,4 +107,35 @@ class I18nTest < ActiveSupport::TestCase
   rescue I18n::MissingTranslationData
     [:zero, :one, :other]
   end
   rescue I18n::MissingTranslationData
     [:zero, :one, :other]
   end

+
+  def check_values_for_raw_html(hash)
+    hash.each_pair do |k, v|
+      if v.is_a? Hash
+        check_values_for_raw_html(v)
+      else
+        next unless k.to_s.end_with?("_html")
+        raise "Avoid using raw html in '#{k}: #{v}'" if v.include? "<"
+      end
+    end
+  end
+
+  def check_values_for_nil(hash)
+    hash.each_pair do |k, v|
+      if v.is_a? Hash
+        check_values_for_nil(v)
+      else
+        raise "Avoid nil values in '#{k}: nil'" if v.nil?
+      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