Changeset 1871 in products for quintagroup.plonecaptchas/trunk/quintagroup/plonecaptchas/skins/captchas_sendto_form

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

Location:

quintagroup.plonecaptchas/trunk/quintagroup/plonecaptchas/skins/captchas_sendto_form

Files:

• sendto.cpy (modified) (5 diffs)
• sendto_form.cpt (modified) (1 diff)

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 pmf
+from Products.CMFPlone import PloneMessageFactory as _
 from ZODB.POSException import ConflictError
 
@@ -23 +23 @@
 
 if not mtool.checkPermission(AllowSendto, context):
-    context.plone_utils.addPortalMessage(pmf(u'You are not allowed to send this link.'), 'error')
+    context.plone_utils.addPortalMessage(_(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(pmf(u'You are not allowed to send this link.'), 'error')
+    context.plone_utils.addPortalMessage(_(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 = pmf(u'Unable to send mail: ${exception}',
+    message = _(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(pmf(u'Mail sent.'))
+context.plone_utils.addPortalMessage(_(u'Mail sent.'))
 return state

quintagroup.plonecaptchas/trunk/quintagroup/plonecaptchas/skins/captchas_sendto_form/sendto_form.cpt

@@ -16 +16 @@
 
     <div metal:fill-slot="main"
-         tal:define="template_id template/getId;
-                     errors options/state/getErrors;
-                     member context/@@plone_portal_state/member;
-                     here_url context/@@plone_context_state/object_url;">
+         tal:define="errors options/state/getErrors;">
 
       <h1 class="documentFirstHeading"