Adding rudimentary I18n support

naryasece · May 4, 2011 · 9ad1954 · 9ad1954
1 parent 969387d
commit 9ad1954
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 3 deletions.
diff --git a/lib/recaptcha/verify.rb b/lib/recaptcha/verify.rb
@@ -29,7 +29,9 @@ def verify_recaptcha(options = {})
           flash[:recaptcha_error] = error
           if model
             model.valid?
-            model.errors.add attribute, options[:message] || "Word verification response is incorrect, please try again."
+						message = "Word verification response is incorrect, please try again."
+						message = I18n.translate(:'recaptcha.errors.verification_failed', {:default => message}) if defined?(I18n)
+            model.errors.add attribute, options[:message] || message
           end
           return false
         else
@@ -40,8 +42,10 @@ def verify_recaptcha(options = {})
         flash[:recaptcha_error] = "recaptcha-not-reachable"
         if model
           model.valid?
-          model.errors.add attribute, options[:message] || "Oops, we failed to validate your word verification response. Please try again."
-        end
+					message = "Oops, we failed to validate your word verification response. Please try again."
+					message = I18n.translate(:'recaptcha.errors.recaptcha_unreachable', :default => message) if defined?(I18n)
+          model.errors.add attribute, options[:message] || message
+				end
         return false
       rescue Exception => e
         raise RecaptchaError, e.message, e.backtrace

diff --git a/test/verify_recaptcha_test.rb b/test/verify_recaptcha_test.rb
@@ -2,6 +2,7 @@
 require 'rubygems'
 require 'active_support/core_ext/string'
 require 'mocha'
+require 'i18n'
 require 'net/http'
 require File.dirname(File.expand_path(__FILE__)) + '/../lib/recaptcha'
 
@@ -70,6 +71,28 @@ def test_timeout
     assert_equal "recaptcha-not-reachable", @controller.flash[:recaptcha_error]
   end
 
+	def test_message_should_use_i18n
+		I18n.locale = :de
+		verification_failed_translated   = "Sicherheitscode konnte nicht verifiziert werden."
+		verification_failed_default      = "Word verification response is incorrect, please try again."
+		recaptcha_unreachable_translated = "Netzwerkfehler, bitte versuchen Sie es später erneut."
+		recaptcha_unreachable_default    = "Oops, we failed to validate your word verification response. Please try again."
+		I18n.expects(:translate).with(:'recaptcha.errors.verification_failed', :default => verification_failed_default).returns(verification_failed_translated)
+		I18n.expects(:translate).with(:'recaptcha.errors.recaptcha_unreachable', :default => recaptcha_unreachable_default).returns(recaptcha_unreachable_translated)
+
+		errors = mock
+		errors.expects(:add).with(:base, verification_failed_translated)
+		errors.expects(:add).with(:base, recaptcha_unreachable_translated)
+		model  = mock; model.stubs(:valid? => false, :errors => errors)
+
+		expect_http_post(response_with_body("false\nbad-news"))
+		@controller.verify_recaptcha(:model => model)
+
+    expect_http_post(Timeout::Error, :exception => true)
+		@controller.verify_recaptcha(:model => model)
+
+	end
+
   private
 
   class TestController