Merge branch 'introkun/master'

Conflicts:
	lib/recaptcha.rb

README.rdoc

@@ -32,8 +32,13 @@ isn't this a model validation? Because that violates MVC. Use can use it like th
 like. Passing in the ActiveRecord object is optional, if you do--and the captcha fails to verify--an
 error will be added to the object for you to use.
 
+Some of the options available:
+
+<tt>:model</tt>::      Model to set errors
+<tt>:message</tt>::    Custom error message
+
   respond_to do |format|
-    if verify_recaptcha(:model => @post) && @post.save
+    if verify_recaptcha(:model => @post, :message => 'Oh! It's error with ReCaptcha!') && @post.save
       # ...
     else
       # ...

lib/recaptcha.rb

@@ -68,9 +68,9 @@ def verify_recaptcha(options = {})
             if model
               model.valid?
               if Rails::VERSION::MAJOR == 2 and Rails::VERSION::MINOR >= 2
-                model.errors.add :base, I18n.translate("#{model.class.name.underscore}.captcha", :scope => %w(errors models), :default => "Captcha response is incorrect, please try again.")
+                model.errors.add :base, I18n.translate("#{model.class.name.underscore}.captcha", :scope => %w(errors models), :default => (options[:message] || "Captcha response is incorrect, please try again."))
               else
-                model.errors.add :base, "Captcha response is incorrect, please try again."
+                model.errors.add :base, options[:message] || "Captcha response is incorrect, please try again."
               end
             end
             return false