Ignore:
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
Files:
9 edited

Legend:

Unmodified
Added
Removed

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

    r1863 r1871  
    1111from Products.PythonScripts.standard import url_quote_plus 
    1212from Products.CMFCore.utils import getToolByName 
    13 from Products.CMFPlone import PloneMessageFactory as pmf 
     13from Products.CMFPlone import PloneMessageFactory as _ 
    1414mtool = getToolByName(context, 'portal_membership') 
    1515dtool = getToolByName(context, 'portal_discussion') 
    … …  
    6464                                                reply.absolute_url())) 
    6565 
    66 context.plone_utils.addPortalMessage(pmf(u'Comment added.')) 
     66context.plone_utils.addPortalMessage(_(u'Comment added.')) 
    6767target = '%s#%s' % (view, anchor) 
    6868return req.RESPONSE.redirect(target) 

  • quintagroup.plonecaptchas/trunk/quintagroup/plonecaptchas/skins/captchas_discussion/discussion_reply_form.cpt

    r1691 r1871  
    1313 
    1414<div metal:fill-slot="main" 
    15      tal:define="template_id template/getId; 
    16                  errors options/state/getErrors; 
    17                  putils context/plone_utils; 
     15     tal:define="errors options/state/getErrors; 
    1816                 thread python:putils.getDiscussionThread(here); 
    1917                 discussable python:thread[0]; 
    20                  here_url context/@@plone_context_state/object_url; 
    21                  member context/@@plone_portal_state/member; 
    22                  isAnon context/@@plone_portal_state/anonymous; 
    23                  toLocalizedTime nocall:context/@@plone/toLocalizedTime; 
    2418                 replies python:thread[1:]"> 
    2519 

  • quintagroup.plonecaptchas/trunk/quintagroup/plonecaptchas/skins/captchas_join_form/join_form.cpt

    r1691 r1871  
    1717 
    1818<div metal:fill-slot="main" 
    19      tal:define="template_id template/getId; 
    20                  errors options/state/getErrors; 
     19     tal:define="errors options/state/getErrors; 
    2120                 mailhost context/MailHost/smtp_host|nothing; 
    2221                 mailfrom context/email_from_address|nothing; 

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

    r1863 r1871  
    1010## 
    1111 
    12 from Products.CMFPlone import PloneMessageFactory as pmf 
     12from Products.CMFPlone import PloneMessageFactory as _ 
    1313from ZODB.POSException import ConflictError 
    1414 
    … …  
    3030    portal_registration.addMember(username, password, properties=REQUEST, REQUEST=context.REQUEST) 
    3131except AttributeError: 
    32     state.setError('username', pmf(u'The login name you selected is already in use or is not valid. Please choose another.')) 
    33     context.plone_utils.addPortalMessage(pmf(u'Please correct the indicated errors.'), 'error') 
     32    state.setError('username', _(u'The login name you selected is already in use or is not valid. Please choose another.')) 
     33    context.plone_utils.addPortalMessage(_(u'Please correct the indicated errors.'), 'error') 
    3434    return state.set(status='failure') 
    3535 
    … …  
    4949        if portal.validate_email: 
    5050            context.acl_users.userFolderDelUsers([username,], REQUEST=context.REQUEST) 
    51             msg = pmf(u'status_fatal_password_mail', 
     51            msg = _(u'status_fatal_password_mail', 
    5252                    default=u'Failed to create your account: we were unable to send your password to your email address: ${address}', 
    5353                    mapping={u'address' : str(err)}) 
    … …  
    5555            return state.set(status='failure') 
    5656        else: 
    57             msg = pmf(u'status_nonfatal_password_mail', 
     57            msg = _(u'status_nonfatal_password_mail', 
    5858                    default=u'You account has been created, but we were unable to send your password to your email address: ${address}', 
    5959                    mapping={u'address' : str(err)}) 
    … …  
    6363 
    6464if came_from_prefs: 
    65     context.plone_utils.addPortalMessage(pmf(u'User added.')) 
     65    context.plone_utils.addPortalMessage(_(u'User added.')) 
    6666    state.set(status='prefs') 
    6767 

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

    r1863 r1871  
    1414from Products.CMFPlone.PloneTool import AllowSendto 
    1515from Products.CMFCore.utils import getToolByName 
    16 from Products.CMFPlone import PloneMessageFactory as pmf 
     16from Products.CMFPlone import PloneMessageFactory as _ 
    1717from ZODB.POSException import ConflictError 
    1818 
    … …  
    2323 
    2424if not mtool.checkPermission(AllowSendto, context): 
    25     context.plone_utils.addPortalMessage(pmf(u'You are not allowed to send this link.'), 'error') 
     25    context.plone_utils.addPortalMessage(_(u'You are not allowed to send this link.'), 'error') 
    2626    return state.set(status='failure') 
    2727 
    … …  
    3434        show = True 
    3535if not show: 
    36     context.plone_utils.addPortalMessage(pmf(u'You are not allowed to send this link.'), 'error') 
     36    context.plone_utils.addPortalMessage(_(u'You are not allowed to send this link.'), 'error') 
    3737    return state.set(status='failure') 
    3838 
    … …  
    5757except: # TODO To many things could possibly go wrong. So we catch all. 
    5858    exception = context.plone_utils.exceptionString() 
    59     message = pmf(u'Unable to send mail: ${exception}', 
     59    message = _(u'Unable to send mail: ${exception}', 
    6060                mapping={u'exception' : exception}) 
    6161    context.plone_utils.addPortalMessage(message, 'error') 
    … …  
    6565transaction_note(tmsg) 
    6666 
    67 context.plone_utils.addPortalMessage(pmf(u'Mail sent.')) 
     67context.plone_utils.addPortalMessage(_(u'Mail sent.')) 
    6868return state 

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

    r1691 r1871  
    1616 
    1717    <div metal:fill-slot="main" 
    18          tal:define="template_id template/getId; 
    19                      errors options/state/getErrors; 
    20                      member context/@@plone_portal_state/member; 
    21                      here_url context/@@plone_context_state/object_url;"> 
     18         tal:define="errors options/state/getErrors;"> 
    2219 
    2320      <h1 class="documentFirstHeading" 

  • quintagroup.plonecaptchas/trunk/quintagroup/plonecaptchas/skins/plone_captchas/captcha_widget.pt

    r1862 r1871  
    44  <div class="field" 
    55       tal:define="hk here/getCaptcha; 
    6                    error errors/key|nothing; 
    7                    Iterator python:modules['Products.CMFPlone'].IndexIterator; 
    8                    tabindex python:Iterator(mainSlot=False)" 
    9  
     6                   error errors/key|nothing" 
    107       tal:attributes="class python:test(error, 'field error', 'field')"> 
    118     <input type="hidden" 
    … …  
    1613           i18n:domain="plone" i18n:attributes="title title_required;" 
    1714           i18n:translate="label_required">(Required)</span> 
    18      <div class="formHelp" i18n:translate="label_help_captchas">Enter the word below for registration.</div> 
     15     <div class="formHelp"></div> 
    1916     <div tal:content="error">Validation error output</div> 
    2017     <input type="text" 

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

    r1863 r1871  
    1010## 
    1111from Products.CMFCore.utils import getToolByName 
    12 from Products.CMFPlone import PloneMessageFactory as pmf 
     12from Products.CMFPlone import PloneMessageFactory as _ 
    1313 
    1414import string 
    … …  
    5252captcha_props.manage_changeProperties(**kw) 
    5353 
    54 context.plone_utils.addPortalMessage(pmf(u'Changes saved.')) 
     54context.plone_utils.addPortalMessage(_(u'Changes saved.')) 
    5555return state 

  • quintagroup.plonecaptchas/trunk/quintagroup/plonecaptchas/skins/plone_captchas/prefs_captchas_setup_form.cpt

    r1859 r1871  
    1212 
    1313<div metal:fill-slot="prefs_configlet_main" 
    14      tal:define="errors python:request.get('controller_state', None).getErrors(); 
    15                  Iterator python:modules['Products.CMFPlone'].IndexIterator; 
    16                  tabindex python:Iterator(mainSlot=False)"> 
     14     tal:define="errors python:request.get('controller_state', None).getErrors();"> 
    1715 
    1816    <div metal:define-macro="main"> 
Note: See TracChangeset for help on using the changeset viewer.