Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix typo and comma splice error #1555

Merged
merged 2 commits into from
May 5, 2016
Merged

fix typo and comma splice error #1555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
479c347
fix typo and comma splice error
tkimnguyen Apr 28, 2016
52bce2c
update for small typo change in HTML control panel
tkimnguyen May 5, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ Fixes:

- Do not hard-code baseUrl in bundle to avoid bad URL when switching domains.
[ebrehault]

- fix typo and comma splice error in HTML filtering control panel [tkimnguyen]


5.1a1 (2016-03-31)
Expand Down
4 changes: 2 additions & 2 deletions Products/CMFPlone/interfaces/controlpanel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,14 +337,14 @@ class IFilterSchema(Interface):

disable_filtering = schema.Bool(
title=_(u'Disable html filtering'),
description=_(u'Warning, disabling can be potentially dangereous. '
description=_(u'Warning: disabling this can be dangerous. '
u'Only disable if you know what you are doing.'),
default=False,
required=False)

nasty_tags = schema.List(
title=_(u'Nasty tags'),
description=_(u"These tags, and their content are completely blocked "
description=_(u"These tags and their content are completely blocked "
"when a page is saved or rendered."),
default=[u'style', u'object', u'embed', u'applet', u'script', u'meta'],
value_type=schema.TextLine(),
Expand Down