This commit is contained in:
tisto 2012-01-14 07:30:43 +01:00
parent 0558a9b739
commit 2d4f7fd665
3 changed files with 14 additions and 13 deletions

View File

@ -1,4 +1,4 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from zope.i18nmessageid import MessageFactory from zope.i18nmessageid import MessageFactory
PloneAppDiscussionMessageFactory = MessageFactory('plone.app.discussion') PloneAppDiscussionMessageFactory = MessageFactory('plone.app.discussion')

View File

@ -36,6 +36,7 @@ try:
except ImportError: except ImportError:
pass pass
class CaptchaValidator(validator.SimpleFieldValidator): class CaptchaValidator(validator.SimpleFieldValidator):
implements(IValidator) implements(IValidator)
adapts(Interface, IDiscussionLayer, Interface, IField, Interface) adapts(Interface, IDiscussionLayer, Interface, IField, Interface)
@ -63,4 +64,3 @@ class CaptchaValidator(validator.SimpleFieldValidator):
# Register Captcha validator for the Captcha field in the ICaptcha Form # Register Captcha validator for the Captcha field in the ICaptcha Form
validator.WidgetValidatorDiscriminators(CaptchaValidator, validator.WidgetValidatorDiscriminators(CaptchaValidator,
field=ICaptcha['captcha']) field=ICaptcha['captcha'])

View File

@ -50,16 +50,15 @@ class IDiscussionSettings(Interface):
description=_(u"help_moderation_enabled", description=_(u"help_moderation_enabled",
default=u"If selected, comments will enter a 'Pending' state " default=u"If selected, comments will enter a 'Pending' state "
"in which they are invisible to the public. A user " "in which they are invisible to the public. A user "
"with the 'Review comments' permission ('Reviewer' or " "with the 'Review comments' permission ('Reviewer' "
"'Manager') can approve comments to make them visible " "or 'Manager') can approve comments to make them "
"to the public. If you want to enable a custom " "visible to the public. If you want to enable a "
"comment workflow, you have to go to the types " "custom comment workflow, you have to go to the "
"control panel."), "types control panel."),
required=False, required=False,
default=False, default=False,
) )
text_transform = schema.Choice( text_transform = schema.Choice(
title=_(u"label_text_transform", title=_(u"label_text_transform",
default="Comment text transform"), default="Comment text transform"),
@ -114,11 +113,12 @@ class IDiscussionSettings(Interface):
) )
moderator_email = schema.ASCIILine( moderator_email = schema.ASCIILine(
title = _(u'label_moderator_email', default=u'Moderator Email Address'), title=_(u'label_moderator_email',
description = _(u'help_moderator_email', default=u'Moderator Email Address'),
default=u"Address to which moderator notifications " description=_(u'help_moderator_email',
u"will be sent."), default=u"Address to which moderator notifications "
required = False, u"will be sent."),
required=False,
) )
user_notification_enabled = schema.Bool( user_notification_enabled = schema.Bool(
@ -322,6 +322,7 @@ class ICommentingTool(Interface):
"""Perform a search over all indexed comments. """Perform a search over all indexed comments.
""" """
class IDiscussionLayer(Interface): class IDiscussionLayer(Interface):
"""Request marker installed via browserlayer.xml. """Request marker installed via browserlayer.xml.
""" """