kaptcha 0.0.3.8 → 0.0.5.1

data/config/locales/kaptcha.en.yml

@@ -0,0 +1,11 @@
+en:
+  view:
+    captcha:
+      human_line: "Please tell us: %{num_a} %{operation} %{num_b} ?"
+      error_code: "Please check antispam code."
+      operations:
+        plus: "plus"
+        minus: "minus"
+        multiply_by: "multiply by"
+
+

data/lib/core/kaptcha.rb

@@ -10,13 +10,13 @@ module Captcha
 
     def has_captcha
       send(:include, InstanceMethods)
+      send(:after_find, :initialize_kaptcha)
     end
 
   end
 
   module InstanceMethods
 
-
     # @comment.human_captcha_desc
     # %input{:type => 'text', :name => 'comment[captcha_form_result]', :autocomplete => :off, :style => 'width: 50px; display: inline;'}
     # = f.hidden_field :captcha_code, :value => @comment.captcha_desc
@@ -32,7 +32,7 @@ module Captcha
     OPERATIONS      = ['+', '-', '*']
 
     def captcha_code
-      @@captcha_code.to_s ||= raise 'Undefined error.'
+      @@captcha_code.to_s ||= raise 'Captcha undefined error.'
     end
 
     def initialize(params={}, &block)
@@ -40,24 +40,20 @@ module Captcha
       super(params, &block)
     end
 
-    def after_initialize
-      initialize_kaptcha unless captcha_desc || human_captcha_desc
-    end
-
     def validate
       unless captcha_form_result == captcha_code
         initialize_kaptcha
-        return errors.add(:captcha_code, 'Пожалуйста, проверьте контрольный вопрос.') 
+        errors.add(:captcha_code, I18n.t('view.captcha.error_code')) 
       end
       true
     end
 
     def captcha_desc
-      @@captcha_desc rescue nil
+      @@captcha_desc
     end
 
     def human_captcha_desc
-      @@human_captcha_desc rescue nil
+      @@human_captcha_desc
     end
 
   private
@@ -83,15 +79,15 @@ module Captcha
 
       case captcha_operation.to_s
       when '-'
-        @@human_captcha_operation = 'минус'
+        human_captcha_operation = I18n.t('view.captcha.operations.minus')
       when '+'
-        @@human_captcha_operation = 'плюс'
+        human_captcha_operation = I18n.t('view.captcha.operations.plus')
       when '*'
-        @@human_captcha_operation = 'умножить на'
+        human_captcha_operation = I18n.t('view.captcha.operations.multiply_by')
       end
 
       @@captcha_desc = "#{captcha_a} #{captcha_operation} #{captcha_b}"
-      @@human_captcha_desc = "Скажите, сколько будет #{captcha_a} #{@@human_captcha_operation} #{captcha_b} ?"
+      @@human_captcha_desc = I18n.t('view.captcha.human_line', :num_a => captcha_a, :operation => human_captcha_operation, :num_b => captcha_b)
 
       @@captcha_code = captcha_a.send(captcha_operation, captcha_b)
     end

data/lib/kaptcha.rb

@@ -5,3 +5,8 @@ require File.join(File.dirname(__FILE__), 'core/kaptcha')
 if defined?(ActiveRecord::Base)
   ActiveRecord::Base.send :include, Captcha
 end
+
+if defined? I18n
+  I18n.load_path += Dir.glob(File.expand_path('../../config/locales/kaptcha.en.yml', __FILE__))
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kaptcha
 version: !ruby/object:Gem::Version
-  version: 0.0.3.8
+  version: 0.0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-14 00:00:00.000000000 Z
+date: 2012-01-15 00:00:00.000000000 Z
 dependencies: []
 description: Form protection with simple captcha calculations.
 email: 
@@ -19,6 +19,7 @@ extra_rdoc_files: []
 files:
 - lib/core/kaptcha.rb
 - lib/kaptcha.rb
+- config/locales/kaptcha.en.yml
 - Rakefile
 - Gemfile
 - README.rdoc