From: Tom Hughes <tom@compton.nu>
Date: Fri, 1 Jun 2012 14:48:23 +0000 (+0100)
Subject: Don't try and look for variables in non-existent values
X-Git-Tag: live~5566
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/91a9738ee8553aa71610c911e7cb3a829f035087

Don't try and look for variables in non-existent values
---

diff --git a/test/unit/i18n_test.rb b/test/unit/i18n_test.rb
index 73f893455..c1dacbff2 100644
--- a/test/unit/i18n_test.rb
+++ b/test/unit/i18n_test.rb
@@ -30,8 +30,10 @@ class I18nTest < ActiveSupport::TestCase
           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