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

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

diff --git a/test/lib/i18n_test.rb b/test/lib/i18n_test.rb
index 700966928a7c3f1eef5375d044417fec890d34b7..ab7cc4dc2b84c9124994037f1e07162ed4999aad 100644 (file)
--- a/test/lib/i18n_test.rb
+++ b/test/lib/i18n_test.rb
@@ -1,55 +1,74 @@
-require 'test_helper'
+require "test_helper"

 
 class I18nTest < ActiveSupport::TestCase
   I18n.available_locales.each do |locale|
     define_method("test_#{locale.to_s.underscore}".to_sym) do
 
 class I18nTest < ActiveSupport::TestCase
   I18n.available_locales.each do |locale|
     define_method("test_#{locale.to_s.underscore}".to_sym) do

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

 
 

-      translation_keys.each do |key|
-        variables = []
+        translation_keys.each do |key|
+          variables = []

 
 

-        default_value = I18n.t(key, :locale => I18n.default_locale)
+          default_value = I18n.t(key, :locale => I18n.default_locale)

 
 

-        if default_value.is_a?(Hash)
-          variables.push("count")
+          if default_value.is_a?(Hash)
+            variables.push("count")

 
 

-          default_value.each do |_subkey, subvalue|
-            subvalue.scan(/%\{(\w+)\}/) do
-              variables.push($1)
+            default_value.each_value do |subvalue|
+              subvalue.scan(/%\{(\w+)\}/) do
+                variables.push(Regexp.last_match(1))
+              end
+            end
+          else
+            default_value.scan(/%\{(\w+)\}/) do
+              variables.push(Regexp.last_match(1))

             end
           end
             end
           end

-        else
-          default_value.scan(/%\{(\w+)\}/) do
-            variables.push($1)
-          end
-        end

 
 

-        if key =~ /^(active(model|record)\.)?errors\./
-          variables.push("attribute")
-        end
+          variables.push("attribute") if key =~ /^(active(model|record)\.)?errors\./

 
 

-        value = I18n.t(key, :locale => locale, :fallback => true)
+          value = I18n.t(key, :locale => locale, :fallback => true)

 
 

-        if value.is_a?(Hash)
-          value.each do |subkey, subvalue|
-            #            assert plural_keys.include?(subkey), "#{key}.#{subkey} is not a valid plural key"
+          if value.is_a?(Hash)
+            value.each do |subkey, subvalue|
+              # assert plural_keys.include?(subkey), "#{key}.#{subkey} is not a valid plural key"
+
+              next if subvalue.nil?

 
 

-            unless subvalue.nil?

               subvalue.scan(/%\{(\w+)\}/) do
               subvalue.scan(/%\{(\w+)\}/) do

-                assert variables.include?($1), "#{key}.#{subkey} uses unknown interpolation variable #{$1}"
+                assert_includes variables, Regexp.last_match(1), "#{key}.#{subkey} uses unknown interpolation variable #{Regexp.last_match(1)}"

               end
             end
               end
             end

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

 
 

-          value.scan(/%\{(\w+)\}/) do
-            assert variables.include?($1), "#{key} uses unknown interpolation variable #{$1}"
+            assert_includes value, :other, "#{key}.other plural key missing"
+          else
+            assert value.is_a?(String), "#{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)}"
+            end

           end
         end
           end
         end

+
+        assert_includes %w[ltr rtl], I18n.t("html.dir", :locale => locale), "html.dir must be ltr or rtl"

       end
       end

+    end
+  end

 
 

-      assert %w(ltr rtl).include?(I18n.t("html.dir", :locale => locale)), "html.dir must be ltr or rtl"
+  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
+
+  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
 
     end
   end
 


@@ -61,13 +80,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 +98,25 @@ 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

 end
 end