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

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

diff --git a/test/lib/i18n_test.rb b/test/lib/i18n_test.rb
index e8fcb687e0726919bb4704807e457abd3169afcf..cdfd234af46c284a3e71d727e26bbf110b8365d5 100644 (file)
--- a/test/lib/i18n_test.rb
+++ b/test/lib/i18n_test.rb
@@ -1,55 +1,55 @@
-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
-      # 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
-        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
-                assert variables.include?($1), "#{key}.#{subkey} uses unknown interpolation variable #{$1}"
+                assert variables.include?(Regexp.last_match(1)), "#{key}.#{subkey} uses unknown interpolation variable #{Regexp.last_match(1)}"
               end
             end
-          end
-        else
-          assert value.is_a?(String), "#{key} is not a string"
+          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}"
+            value.scan(/%\{(\w+)\}/) do
+              assert variables.include?(Regexp.last_match(1)), "#{key} uses unknown interpolation variable #{Regexp.last_match(1)}"
+            end
           end
         end
-      end
 
-      assert %w(ltr rtl).include?(I18n.t("html.dir", :locale => locale)), "html.dir must be ltr or rtl"
+        assert %w[ltr rtl].include?(I18n.t("html.dir", :locale => locale)), "html.dir must be ltr or rtl"
+      end
     end
   end