Changeset 890

Timestamp:

06/21/07 10:34:37

Author:

crchemist

Message:

Fix translation problem in plone-2.1.4.

Files:

• qPloneCaptchas/trunk/__init__.py (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)

qPloneCaptchas/trunk/__init__.py

@@ -1 +1 @@
-from Products.CMFCore.DirectoryView import registerDirectory
+from App.version_txt import getZopeVersion
-from Products.CMFCore.utils import ToolInit
-
+
+
-import config
-import CaptchaTool
@@ -15 +17 @@
-             product_name=config.PRODUCT_NAME,
-             icon=config.TOOL_ICON,).initialize(context)
+
+def MessageFactory(projectname):
+    "Get a i18n message factory"
+    vmajor, vminor, vmicro, vstatus, vrelease = getZopeVersion()
+    MessageFactory = lambda : "no message factory found"
+    if (vmajor > 2) or ((vmajor, vminor) == (2,9)):
+        from zope.i18nmessageid import MessageFactory
+    elif (vmajor, vminor) == (2,8):
+        from zope.i18nmessageid import MessageIDFactory as MessageFactory
+    else:
+        try:
+           from Products.PlacelessTranslationService.MessageID import MessageIDFactory as MessageFactory
+        except:
+           logging.info("[qPloneCaptchas] No i18n Message Factory found -> cannot provide translations!")
+    return MessageFactory(projectname.lower())
+
+ProductMessageFactory = MessageFactory('%s' % config.PRODUCT_NAME)
+ModuleSecurityInfo('Products.%s' % config.PRODUCT_NAME).declarePublic("ProductMessageFactory")

qPloneCaptchas/trunk/skins/plone_captchas/dynamic/captcha_validator.vpy

@@ +1 @@
+from Products.qPloneCaptchas import ProductMessageFactory
-from Products.qPloneCaptchas.utils import decrypt, parseKey, \
-     encrypt1, getWord
-from DateTime import DateTime
-from Products.CMFCore.utils import getToolByName
-try:
-    from Products.CMFPlone import MessageFactory
-    _ = MessageFactory('qplonecaptchas')
-except ImportError:
-    from Products.PlacelessTranslationService.MessageID import MassageIDFactory
-    _ = MessageIDFactory('qplonecaptchas')
-
-if state.getStatus()=='failure':
@@ -27 +22 @@
-if (enc != solution) or (captcha_tool.has_key(decrypted_key)) \
-    or (DateTime().timeTime() - float(date)>3600):
-_
-_
+ProductMessageFactory
+ProductMessageFactory
-else:
-    captcha_tool.addExpiredKey(decrypted_key)

qPloneCaptchas/trunk/skins/plone_captchas/static/captcha_validator.vpy

@@ +1 @@
+from Products.qPloneCaptchas import ProductMessageFactory
-from Products.CMFCore.utils import getToolByName
-from Products.qPloneCaptchas.utils import decrypt, parseKey, \
-     encrypt1, getWord
-from DateTime import DateTime
-try:
-    from Products.CMFPlone import MessageFactory
-    _ = MessageFactory('qplonecaptchas')
-except ImportError:
-    from Products.PlacelessTranslationService.MessageID import MessageIDFactory
-    _ = MessageIDFactory('qplonecaptchas')
-
-
-if state.getStatus()=='failure':
@@ -29 +23 @@
-if (enc != solution) or (captcha_tool.has_key(decrypted_key)) \
-    or (DateTime().timeTime() - float(date)>3600):
-_
-_
+ProductMessageFactory
+ProductMessageFactory
-else:
-    captcha_tool.addExpiredKey(decrypted_key)