Changeset 1863 in products for quintagroup.plonecaptchas/trunk/quintagroup

Timestamp:

Mar 9, 2010 6:29:06 PM (14 years ago)

Author:

liebster

Message:

Changed definition plone message factory for using i18ndude rebuild

Location:

quintagroup.plonecaptchas/trunk/quintagroup/plonecaptchas/skins

Files:

• captchas_discussion/discussion_reply.cpy (modified) (2 diffs)
• captchas_join_form/register.cpy (modified) (5 diffs)
• captchas_sendto_form/sendto.cpy (modified) (5 diffs)
• plone_captchas/prefs_captchas_setup.cpy (modified) (2 diffs)

quintagroup.plonecaptchas/trunk/quintagroup/plonecaptchas/skins/captchas_discussion/discussion_reply.cpy

@@ -11 +11 @@
 from Products.PythonScripts.standard import url_quote_plus
 from Products.CMFCore.utils import getToolByName
-from Products.CMFPlone import PloneMessageFactory as _
+from Products.CMFPlone import PloneMessageFactory as pmf
 mtool = getToolByName(context, 'portal_membership')
 dtool = getToolByName(context, 'portal_discussion')
@@ -64 +64 @@
                                                 reply.absolute_url()))
 
-context.plone_utils.addPortalMessage(_(u'Comment added.'))
+context.plone_utils.addPortalMessage(pmf(u'Comment added.'))
 target = '%s#%s' % (view, anchor)
 return req.RESPONSE.redirect(target)

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

@@ -10 +10 @@
 ##
 
-from Products.CMFPlone import PloneMessageFactory as _
+from Products.CMFPlone import PloneMessageFactory as pmf
 from ZODB.POSException import ConflictError
 
@@ -30 +30 @@
     portal_registration.addMember(username, password, properties=REQUEST, REQUEST=context.REQUEST)
 except AttributeError:
-    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')
+    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')
     return state.set(status='failure')
 
@@ -49 +49 @@
         if portal.validate_email:
             context.acl_users.userFolderDelUsers([username,], REQUEST=context.REQUEST)
-            msg = _(u'status_fatal_password_mail',
+            msg = pmf(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 = _(u'status_nonfatal_password_mail',
+            msg = pmf(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(_(u'User added.'))
+    context.plone_utils.addPortalMessage(pmf(u'User added.'))
     state.set(status='prefs')
 

quintagroup.plonecaptchas/trunk/quintagroup/plonecaptchas/skins/captchas_sendto_form/sendto.cpy

@@ -14 +14 @@
 from Products.CMFPlone.PloneTool import AllowSendto
 from Products.CMFCore.utils import getToolByName
-from Products.CMFPlone import PloneMessageFactory as _
+from Products.CMFPlone import PloneMessageFactory as pmf
 from ZODB.POSException import ConflictError
 
@@ -23 +23 @@
 
 if not mtool.checkPermission(AllowSendto, context):
-    context.plone_utils.addPortalMessage(_(u'You are not allowed to send this link.'), 'error')
+    context.plone_utils.addPortalMessage(pmf(u'You are not allowed to send this link.'), 'error')
     return state.set(status='failure')
 
@@ -34 +34 @@
         show = True
 if not show:
-    context.plone_utils.addPortalMessage(_(u'You are not allowed to send this link.'), 'error')
+    context.plone_utils.addPortalMessage(pmf(u'You are not allowed to send this link.'), 'error')
     return state.set(status='failure')
 
@@ -57 +57 @@
 except: # TODO To many things could possibly go wrong. So we catch all.
     exception = context.plone_utils.exceptionString()
-    message = _(u'Unable to send mail: ${exception}',
+    message = pmf(u'Unable to send mail: ${exception}',
                 mapping={u'exception' : exception})
     context.plone_utils.addPortalMessage(message, 'error')
@@ -65 +65 @@
 transaction_note(tmsg)
 
-context.plone_utils.addPortalMessage(_(u'Mail sent.'))
+context.plone_utils.addPortalMessage(pmf(u'Mail sent.'))
 return state

quintagroup.plonecaptchas/trunk/quintagroup/plonecaptchas/skins/plone_captchas/prefs_captchas_setup.cpy

@@ -10 +10 @@
 ##
 from Products.CMFCore.utils import getToolByName
-from Products.CMFPlone import PloneMessageFactory as _
+from Products.CMFPlone import PloneMessageFactory as pmf
 
 import string
@@ -52 +52 @@
 captcha_props.manage_changeProperties(**kw)
 
-context.plone_utils.addPortalMessage(_(u'Changes saved.'))
+context.plone_utils.addPortalMessage(pmf(u'Changes saved.'))
 return state