Merge pull request #117 from plone/djowett-patch-1

Improve English on a couple of field descriptions

CHANGES.rst

@@ -25,6 +25,12 @@ Bug fixes:
 - Make comment on private content not publicly available in search results.
   Part of PloneHotfix20161129.  [vangheem, maurits]
 
+- Improve English on a couple of field descriptions
+  [djowett]
+
+- Fix some easy pep8 issues
+  [djowett]
+
 
 2.4.19 (2017-01-02)
 -------------------

plone/app/discussion/browser/captcha.py

@@ -65,3 +65,5 @@ class CaptchaExtender(extensible.FormExtender):
                 self.form.fields['captcha'].widgetFactory = NorobotsFieldWidget
             else:
                 self.form.fields['captcha'].mode = interfaces.HIDDEN_MODE
+
+

plone/app/discussion/browser/controlpanel.py

@@ -125,7 +125,8 @@ class DiscussionSettingsControlPanel(controlpanel.ControlPanelFormWrapper):
             output.append('globally_enabled')
 
         # Comment moderation
-        one_state_worklow_disabled = 'comment_one_state_workflow' not in workflow_chain
+        one_state_worklow_disabled = \
+            'comment_one_state_workflow' not in workflow_chain
         comment_review_workflow_disabled = \
             'comment_review_workflow' not in workflow_chain
         if one_state_worklow_disabled and comment_review_workflow_disabled:
@@ -174,7 +175,8 @@ class DiscussionSettingsControlPanel(controlpanel.ControlPanelFormWrapper):
         """
         wftool = getToolByName(self.context, 'portal_workflow', None)
         workflow_chain = wftool.getChainForPortalType('Discussion Item')
-        one_state_workflow_enabled = 'comment_one_state_workflow' in workflow_chain
+        one_state_workflow_enabled = \
+            'comment_one_state_workflow' in workflow_chain
         comment_review_workflow_enabled = \
             'comment_review_workflow' in workflow_chain
         if one_state_workflow_enabled or comment_review_workflow_enabled:

plone/app/discussion/comment.py

@@ -207,6 +207,7 @@ class Comment(CatalogAware, WorkflowAware, DynamicType, Traversable,
     def opaqueValues(self):  # pragma: no cover
         return []
 
+
 CommentFactory = Factory(Comment)
 
 

plone/app/discussion/interfaces.py

@@ -199,9 +199,9 @@ class IDiscussionSettings(Interface):
         description=_(
             u'help_globally_enabled',
             default=u'If selected, users are able to post comments on the '
-                    u'site. Though, you have to enable comments for '
+                    u'site. However, you will still need to enable comments '
-                    u'specific content types, folders or content objects '
+                    u'for specific content types, folders or content '
-                    u'before users will be able to post comments.'
+                    u'objects before users will be able to post comments.'
         ),
         required=False,
         default=False,
@@ -213,7 +213,7 @@ class IDiscussionSettings(Interface):
         description=_(
             u'help_anonymous_comments',
             default=u'If selected, anonymous users are able to post '
-                    u'comments without loggin in. It is highly '
+                    u'comments without logging in. It is highly '
                     u'recommended to use a captcha solution to prevent '
                     u'spam if this setting is enabled.'
         ),

plone/app/discussion/tests/test_controlpanel.py

@@ -163,7 +163,8 @@ class ConfigurationChangedSubscriberTest(unittest.TestCase):
            the 'comment_moderation' setting in the discussion control panel
            changes.
         """
-        # By default the comment_one_state_workflow without moderation is enabled
+        # By default the comment_one_state_workflow without moderation is 
+        # enabled
         self.assertEqual(
             ('comment_one_state_workflow',),
             self.portal.portal_workflow.getChainForPortalType(