Changeset 1370
- Timestamp:
- 10/23/08 10:24:01
- Files:
-
- qPloneComments/trunk/HISTORY.txt (modified) (1 diff)
- qPloneComments/trunk/configure.zcml (modified) (1 diff)
- qPloneComments/trunk/i18n (deleted)
- qPloneComments/trunk/locales (added)
- qPloneComments/trunk/locales/de (added)
- qPloneComments/trunk/locales/de/LC_MESSAGES (added)
- qPloneComments/trunk/locales/de/LC_MESSAGES/plonecomments.po (added)
- qPloneComments/trunk/locales/es (added)
- qPloneComments/trunk/locales/es/LC_MESSAGES (added)
- qPloneComments/trunk/locales/es/LC_MESSAGES/plonecomments.po (added)
- qPloneComments/trunk/locales/fr (added)
- qPloneComments/trunk/locales/fr/LC_MESSAGES (added)
- qPloneComments/trunk/locales/fr/LC_MESSAGES/plonecomments.po (added)
- qPloneComments/trunk/locales/plonecomments.pot (added)
- qPloneComments/trunk/locales/pt-br (added)
- qPloneComments/trunk/locales/pt-br/LC_MESSAGES (added)
- qPloneComments/trunk/locales/pt-br/LC_MESSAGES/plonecomments.po (added)
- qPloneComments/trunk/locales/uk (added)
- qPloneComments/trunk/locales/uk/LC_MESSAGES (added)
- qPloneComments/trunk/locales/uk/LC_MESSAGES/plonecomments.po (added)
- qPloneComments/trunk/skins/qplonecomments/deleteDiscussion.py (modified) (2 diffs)
- qPloneComments/trunk/skins/qplonecomments/discussion_publish_comment.py (modified) (2 diffs)
- qPloneComments/trunk/skins/qplonecomments/discussion_reply.cpy (modified) (3 diffs)
- qPloneComments/trunk/skins/qplonecomments/validate_talkback.vpy (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
qPloneComments/trunk/HISTORY.txt
r1305 r1370 1 1 Changelog 2 2 ========= 3 4 3.2.1 - October 23, 2008 ( Unreleased ) 5 ------------------ 6 7 - Converted a i18n layout to a locales layout 3 8 4 9 3.1.2 - Unreleased qPloneComments/trunk/configure.zcml
r1286 r1370 4 4 xmlns:gs="http://namespaces.zope.org/genericsetup" 5 5 xmlns:five="http://namespaces.zope.org/five" 6 xmlns:i18n="http://namespaces.zope.org/i18n" 6 7 i18n_domain="plonecomments"> 7 8 8 9 <include package="plone.browserlayer" /> 10 <i18n:registerTranslations directory="locales" /> 9 11 10 12 <cmf:registerDirectory name="skins" directory="skins" recursive="True" /> qPloneComments/trunk/skins/qplonecomments/deleteDiscussion.py
r1130 r1370 11 11 from Products.qPloneComments.utils import manage_mails 12 12 from Products.CMFPlone import MessageFactory 13 qpcMF= MessageFactory('plonecomments')13 _ = MessageFactory('plonecomments') 14 14 15 15 … … 31 31 view = redirect_target.getTypeInfo().immediate_view 32 32 33 context.plone_utils.addPortalMessage( qpcMF(u'Reply deleted.'))33 context.plone_utils.addPortalMessage(_(u'Reply deleted.')) 34 34 35 35 context.REQUEST['RESPONSE'].redirect( redirect_target.absolute_url() + '/%s' % view ) qPloneComments/trunk/skins/qplonecomments/discussion_publish_comment.py
r1131 r1370 13 13 from Products.qPloneComments.utils import manage_mails 14 14 from Products.CMFPlone import MessageFactory 15 qpcMF= MessageFactory('plonecomments')15 _ = MessageFactory('plonecomments') 16 16 17 17 if obj is None: … … 36 36 transaction_note('Published discussion item') 37 37 38 context.plone_utils.addPortalMessage( qpcMF(u'Comment published.'))38 context.plone_utils.addPortalMessage(_(u'Comment published.')) 39 39 target = '%s/%s#%s' % (redirect_target.absolute_url(), view, anchor) 40 40 qPloneComments/trunk/skins/qplonecomments/discussion_reply.cpy
r1304 r1370 13 13 from Products.qPloneComments.utils import manage_mails 14 14 from Products.CMFPlone import MessageFactory 15 qpcMF= MessageFactory('plonecomments')15 _ = MessageFactory('plonecomments') 16 16 17 17 mtool = getToolByName(context, 'portal_membership') … … 91 91 92 92 # Inform user about awaiting moderation 93 portal_status_message= 'Comment published.'93 portal_status_message=u'Comment published.' 94 94 if 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.' 96 96 97 97 from Products.CMFPlone.utils import transaction_note … … 99 99 reply.absolute_url())) 100 100 101 context.plone_utils.addPortalMessage( qpcMF(portal_status_message))102 context.plone_utils.addPortalMessage( qpcMF(u'Comment added.'))101 context.plone_utils.addPortalMessage(_(portal_status_message)) 102 context.plone_utils.addPortalMessage(_(u'Comment added.')) 103 103 target = '%s#%s' % (view, anchor) 104 104 return req.RESPONSE.redirect(target) qPloneComments/trunk/skins/qplonecomments/validate_talkback.vpy
r1163 r1370 11 11 from Products.CMFPlone import PloneMessageFactory as _ 12 12 from Products.CMFPlone import MessageFactory 13 qpcMF= MessageFactory('plonecomments')13 _ = MessageFactory('plonecomments') 14 14 15 15 dtool = context.portal_discussion … … 23 23 24 24 if 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') 26 26 27 27 if 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') 29 29 30 30 if require_email: 31 31 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') 33 33 34 34 if hasattr(context, 'captcha_validator'): … … 43 43 req = context.REQUEST 44 44 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') 46 46 47 47 try: 48 48 captcha_view = context.restrictedTraverse('@@captcha') 49 49 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') 51 51 except: 52 52 # no collective.captcha installed
