Changeset 782
- Timestamp:
- 01/30/07 11:43:39
- Files:
-
- qPloneCaptchas/trunk/i18n/qplonecaptchas-uk.po (modified) (2 diffs)
- qPloneCaptchas/trunk/i18n/qplonecaptchas.pot (modified) (2 diffs)
- qPloneCaptchas/trunk/skins/plone_captchas/dynamic/captcha_validator.vpy (modified) (2 diffs)
- qPloneCaptchas/trunk/skins/plone_captchas/static/captcha_validator.vpy (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
qPloneCaptchas/trunk/i18n/qplonecaptchas-uk.po
r781 r782 7 7 "Project-Id-Version: qPloneCaptchas 1.0\n" 8 8 "POT-Creation-Date: 2007-01-11 20:12+0000\n" 9 "PO-Revision-Date: 2007-01- 12 15:38 +0100\n"9 "PO-Revision-Date: 2007-01-30 18:42 +0000\n" 10 10 "Report-Msgid-Bugs-To: Quintagroup Support <support@quintagroup.com>\n" 11 "Last-Translator: Niklas Ekstrand <ne@zoone.se>\n"11 "Last-Translator: Mykola Kharechko <crchemist@gmail.com>\n" 12 12 "MIME-Version: 1.0\n" 13 13 "Content-Type: text/plain; charset=utf-8\n" … … 23 23 msgid "enter_word" 24 24 msgstr "Введіть слово нижче" 25 26 #. Default: "Please re-enter validation code." 27 #: Incorrect validation code 28 msgid "incorrect_validation_code" 29 msgstr "Будь ласка введіть ще раз код перевірки" qPloneCaptchas/trunk/i18n/qplonecaptchas.pot
r781 r782 8 8 "POT-Creation-Date: 2007-01-11 20:12+0000\n" 9 9 "PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\n" 10 "Last-Translator: Niklas Ekstrand <ne@zoone.se>\n"10 "Last-Translator: AUTHOR <EMAIL@ADDRESS>\n" 11 11 "MIME-Version: 1.0\n" 12 12 "Content-Type: text/plain; charset=utf-8\n" … … 23 23 msgid "enter_word" 24 24 msgstr "" 25 26 #. Default: "Please re-enter validation code." 27 #: Incorrect validation code 28 msgid "message_incorrect_validation_code" 29 msgstr "" qPloneCaptchas/trunk/skins/plone_captchas/dynamic/captcha_validator.vpy
r781 r782 3 3 from DateTime import DateTime 4 4 from Products.CMFCore.utils import getToolByName 5 try: 6 from Products.CMFPlone import MessageFactory 7 _ = MessageFactory('qplonecaptchas') 8 incorrect_validation_code = _('incorrect_validation_code') 9 except ImportError: 10 incorrect_validation_code = 'Please re-enter validation code.' 11 12 5 13 if state.getStatus()=='failure': 6 14 return state … … 19 27 captcha_tool = getToolByName(context, 'portal_captchas') 20 28 if (enc != solution) or (captcha_tool.has_key(decrypted_key)) \ 21 or (DateTime().timeTime() - float(date)>3600):22 state.setError('key', 'Please re-enter validation code.', 'key_required')23 return state.set(status="failure", portal_status_message = "Please re-enter validation code.")29 or (DateTime().timeTime() - float(date)>3600): 30 state.setError('key', incorrect_validation_code, 'key_required') 31 return state.set(status="failure", portal_status_message = incorrect_validation_code) 24 32 else: 25 33 captcha_tool.addExpiredKey(decrypted_key) qPloneCaptchas/trunk/skins/plone_captchas/static/captcha_validator.vpy
r781 r782 1 from Products.CMFCore.utils import getToolByName 1 2 from Products.qPloneCaptchas.utils import decrypt, parseKey, \ 2 3 encrypt1, getWord 3 4 from DateTime import DateTime 4 from Products.CMFCore.utils import getToolByName 5 try: 6 from Products.CMFPlone import MessageFactory 7 _ = MessageFactory('qplonecaptchas') 8 incorrect_validation_code = _('incorrect_validation_code') 9 except ImportError: 10 incorrect_validation_code = 'Please re-enter validation code.' 11 5 12 if state.getStatus()=='failure': 6 13 return state … … 20 27 captcha_tool = getToolByName(context, 'portal_captchas') 21 28 if (enc != solution) or (captcha_tool.has_key(decrypted_key)) \ 22 or (DateTime().timeTime() - float(date)>3600):23 state.setError('key', 'Please re-enter validation code.', 'key_required')24 return state.set(status="failure", portal_status_message = "Please re-enter validation code.")29 or (DateTime().timeTime() - float(date)>3600): 30 state.setError('key', incorrect_validation_code, 'key_required') 31 return state.set(status="failure", portal_status_message = incorrect_validation_code) 25 32 else: 26 33 captcha_tool.addExpiredKey(decrypted_key)
