Restore the duplicate search form in the header

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

diff --git a/test/unit/i18n_test.rb b/test/unit/i18n_test.rb
index 73f8934558500fbc0b5af4a028a4fa84d4c93b43..2fb13824ca0904bfecd67964c194003161285331 100644 (file)
--- a/test/unit/i18n_test.rb
+++ b/test/unit/i18n_test.rb
@@ -24,14 +24,20 @@ class I18nTest < ActiveSupport::TestCase
           end
         end
 
           end
         end
 

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

         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"
 
         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"
 

-            subvalue.scan(/%\{(\w+)\}/) do
-              assert variables.include?($1), "#{key}.#{subkey} uses unknown interpolation variable #{$1}"
+            unless subvalue.nil?
+              subvalue.scan(/%\{(\w+)\}/) do
+                assert variables.include?($1), "#{key}.#{subkey} uses unknown interpolation variable #{$1}"
+              end

             end
           end
         else
             end
           end
         else