Changeset 1370

Show
Ignore:
Timestamp:
10/23/08 10:24:01
Author:
liebster
Message:

Convert a i18n layout to a locales layout

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • qPloneComments/trunk/HISTORY.txt

    r1305 r1370  
    11Changelog 
    22========= 
     3 
     43.2.1 - October 23, 2008 ( Unreleased ) 
     5------------------ 
     6 
     7- Converted a i18n layout to a locales layout 
    38 
    493.1.2 - Unreleased 
  • qPloneComments/trunk/configure.zcml

    r1286 r1370  
    44    xmlns:gs="http://namespaces.zope.org/genericsetup" 
    55    xmlns:five="http://namespaces.zope.org/five" 
     6    xmlns:i18n="http://namespaces.zope.org/i18n" 
    67    i18n_domain="plonecomments"> 
    78 
    89  <include package="plone.browserlayer" /> 
     10  <i18n:registerTranslations directory="locales" /> 
    911 
    1012  <cmf:registerDirectory name="skins" directory="skins" recursive="True" /> 
  • qPloneComments/trunk/skins/qplonecomments/deleteDiscussion.py

    r1130 r1370  
    1111from Products.qPloneComments.utils import manage_mails 
    1212from Products.CMFPlone import MessageFactory 
    13 qpcMF = MessageFactory('plonecomments') 
     13_ = MessageFactory('plonecomments') 
    1414 
    1515 
     
    3131view = redirect_target.getTypeInfo().immediate_view 
    3232 
    33 context.plone_utils.addPortalMessage(qpcMF(u'Reply deleted.')) 
     33context.plone_utils.addPortalMessage(_(u'Reply deleted.')) 
    3434 
    3535context.REQUEST['RESPONSE'].redirect( redirect_target.absolute_url() + '/%s' % view ) 
  • qPloneComments/trunk/skins/qplonecomments/discussion_publish_comment.py

    r1131 r1370  
    1313from Products.qPloneComments.utils import manage_mails 
    1414from Products.CMFPlone import MessageFactory 
    15 qpcMF = MessageFactory('plonecomments') 
     15_ = MessageFactory('plonecomments') 
    1616 
    1717if obj is None: 
     
    3636transaction_note('Published discussion item') 
    3737 
    38 context.plone_utils.addPortalMessage(qpcMF(u'Comment published.')) 
     38context.plone_utils.addPortalMessage(_(u'Comment published.')) 
    3939target = '%s/%s#%s' % (redirect_target.absolute_url(), view, anchor) 
    4040 
  • qPloneComments/trunk/skins/qplonecomments/discussion_reply.cpy

    r1304 r1370  
    1313from Products.qPloneComments.utils import manage_mails 
    1414from Products.CMFPlone import MessageFactory 
    15 qpcMF = MessageFactory('plonecomments') 
     15_ = MessageFactory('plonecomments') 
    1616 
    1717mtool = getToolByName(context, 'portal_membership') 
     
    9191 
    9292# Inform user about awaiting moderation 
    93 portal_status_message='Comment published.' 
     93portal_status_message=u'Comment published.' 
    9494if ifModerate and reply: 
    95     portal_status_message='Currently, all comments require approval before being published. Please check back later.' 
     95    portal_status_message=u'Currently, all comments require approval before being published. Please check back later.' 
    9696 
    9797from Products.CMFPlone.utils import transaction_note 
     
    9999                                                reply.absolute_url())) 
    100100 
    101 context.plone_utils.addPortalMessage(qpcMF(portal_status_message)) 
    102 context.plone_utils.addPortalMessage(qpcMF(u'Comment added.')) 
     101context.plone_utils.addPortalMessage(_(portal_status_message)) 
     102context.plone_utils.addPortalMessage(_(u'Comment added.')) 
    103103target = '%s#%s' % (view, anchor) 
    104104return req.RESPONSE.redirect(target) 
  • qPloneComments/trunk/skins/qplonecomments/validate_talkback.vpy

    r1163 r1370  
    1111from Products.CMFPlone import PloneMessageFactory as _ 
    1212from Products.CMFPlone import MessageFactory 
    13 qpcMF = MessageFactory('plonecomments') 
     13_ = MessageFactory('plonecomments') 
    1414 
    1515dtool = context.portal_discussion 
     
    2323 
    2424if not subject: 
    25     state.setError('subject', qpcMF(u'Please submit a subject.'), 'subject_required') 
     25    state.setError('subject', _(u'Please submit a subject.'), 'subject_required') 
    2626 
    2727if not body_text: 
    28     state.setError('body_text', qpcMF(u'Please submit a body.'), 'body_required') 
     28    state.setError('body_text', _(u'Please submit a body.'), 'body_required') 
    2929 
    3030if require_email: 
    3131    if not (email and context.portal_registration.isValidEmail(email)): 
    32         state.setError('email', qpcMF(u'Please submit email.'), 'email_required') 
     32        state.setError('email', _(u'Please submit email.'), 'email_required') 
    3333 
    3434if hasattr(context, 'captcha_validator'): 
     
    4343        req = context.REQUEST 
    4444        if not (req.form.has_key('Creator') and not req.form['Creator'] == ""): 
    45             state.setError('Creator', qpcMF(u'Please enter your name.'), 'name_required') 
     45            state.setError('Creator', _(u'Please enter your name.'), 'name_required') 
    4646 
    4747        try: 
    4848            captcha_view = context.restrictedTraverse('@@captcha') 
    4949            if not captcha_view.verify(captcha): 
    50                 state.setError('captcha', qpcMF(u'You must correctly enter the word.'), 'captcha') 
     50                state.setError('captcha', _(u'You must correctly enter the word.'), 'captcha') 
    5151        except: 
    5252            # no collective.captcha installed