Update paperclip

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

diff --git a/test/lib/i18n_test.rb b/test/lib/i18n_test.rb
index ea67e084eeab12223e3540468feccdac1b38145e..3aa528ceb819db6244b9e54b7b971d005657cb23 100644 (file)
--- a/test/lib/i18n_test.rb
+++ b/test/lib/i18n_test.rb
@@ -1,9 +1,9 @@
-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)
+      # plural_keys = plural_keys(locale)

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


@@ -13,67 +13,67 @@ class I18nTest < ActiveSupport::TestCase
         if default_value.is_a?(Hash)
           variables.push("count")
 
         if default_value.is_a?(Hash)
           variables.push("count")
 

-          default_value.each do |subkey,subvalue|
+          default_value.each_value do |subvalue|

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

-              variables.push($1)
+              variables.push(Regexp.last_match(1))

             end
           end
         else
           default_value.scan(/%\{(\w+)\}/) do
             end
           end
         else
           default_value.scan(/%\{(\w+)\}/) do

-            variables.push($1)
+            variables.push(Regexp.last_match(1))

           end
         end
 
           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)
 
         if value.is_a?(Hash)
 
         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.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}"
-              end
+            subvalue.scan(/%\{(\w+)\}/) do
+              assert variables.include?(Regexp.last_match(1)), "#{key}.#{subkey} uses unknown interpolation variable #{Regexp.last_match(1)}"

             end
           end
         else
           assert value.is_a?(String), "#{key} is not a string"
 
           value.scan(/%\{(\w+)\}/) do
             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 variables.include?(Regexp.last_match(1)), "#{key} uses unknown interpolation variable #{Regexp.last_match(1)}"

           end
         end
       end
 
           end
         end
       end
 

-      assert ["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
   end

-private
+
+  private
+

   def translation_keys(scope = nil)
     plural_keys = plural_keys(I18n.default_locale)
 
   def translation_keys(scope = nil)
     plural_keys = plural_keys(I18n.default_locale)
 

-    I18n.t(scope || ".", :locale => I18n.default_locale).map do |key,value|
+    I18n.t(scope || ".", :locale => I18n.default_locale).map do |key, value|

       scoped_key = scope ? "#{scope}.#{key}" : key
 
       scoped_key = scope ? "#{scope}.#{key}" : key
 

-      if value.kind_of?(Hash)
+      if value.is_a?(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.kind_of?(String)
+      elsif value.is_a?(String)

         scoped_key
       end
     end.flatten
   end
 
   def plural_keys(locale)
         scoped_key
       end
     end.flatten
   end
 
   def plural_keys(locale)

-    I18n.t("i18n.plural.keys", :locale => locale, :raise => true) + [ :zero ]
+    I18n.t("i18n.plural.keys", :locale => locale, :raise => true) + [:zero]

   rescue I18n::MissingTranslationData
   rescue I18n::MissingTranslationData

-    [ :zero, :one, :other ]
+    [:zero, :one, :other]

   end
 end
   end
 end