Changeset 1871 in products for quintagroup.plonecaptchas/trunk/quintagroup/plonecaptchas/skins/captchas_join_form/register.cpy

Timestamp:

Mar 10, 2010 1:50:35 PM (14 years ago)

Author:

liebster

Message:

Revert 2726 to 2589 commits for tagging plone-3 compatible version

File:

• quintagroup.plonecaptchas/trunk/quintagroup/plonecaptchas/skins/captchas_join_form/register.cpy (modified) (5 diffs)

quintagroup.plonecaptchas/trunk/quintagroup/plonecaptchas/skins/captchas_join_form/register.cpy

@@ -10 +10 @@
 ##
 
-from Products.CMFPlone import PloneMessageFactory as pmf
+from Products.CMFPlone import PloneMessageFactory as _
 from ZODB.POSException import ConflictError
 
@@ -30 +30 @@
     portal_registration.addMember(username, password, properties=REQUEST, REQUEST=context.REQUEST)
 except AttributeError:
-    state.setError('username', pmf(u'The login name you selected is already in use or is not valid. Please choose another.'))
-    context.plone_utils.addPortalMessage(pmf(u'Please correct the indicated errors.'), 'error')
+    state.setError('username', _(u'The login name you selected is already in use or is not valid. Please choose another.'))
+    context.plone_utils.addPortalMessage(_(u'Please correct the indicated errors.'), 'error')
     return state.set(status='failure')
 
@@ -49 +49 @@
         if portal.validate_email:
             context.acl_users.userFolderDelUsers([username,], REQUEST=context.REQUEST)
-            msg = pmf(u'status_fatal_password_mail',
+            msg = _(u'status_fatal_password_mail',
                     default=u'Failed to create your account: we were unable to send your password to your email address: ${address}',
                     mapping={u'address' : str(err)})
@@ -55 +55 @@
             return state.set(status='failure')
         else:
-            msg = pmf(u'status_nonfatal_password_mail',
+            msg = _(u'status_nonfatal_password_mail',
                     default=u'You account has been created, but we were unable to send your password to your email address: ${address}',
                     mapping={u'address' : str(err)})
@@ -63 +63 @@
 
 if came_from_prefs:
-    context.plone_utils.addPortalMessage(pmf(u'User added.'))
+    context.plone_utils.addPortalMessage(_(u'User added.'))
     state.set(status='prefs')