changeset 5891:16f3285443ca

rename require_comment option to comment_required Also improve the wording of the option help text.
author Matthijs Kooijman <matthijs@stdin.nl>
date Thu, 20 Sep 2012 19:00:05 +0200
parents 6d5105a45257
children dc34616009fe
files MoinMoin/action/edit.py MoinMoin/config/multiconfig.py
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/action/edit.py	Thu Sep 20 17:47:04 2012 +0200
+++ b/MoinMoin/action/edit.py	Thu Sep 20 19:00:05 2012 +0200
@@ -161,7 +161,7 @@
             from MoinMoin.security.textcha import TextCha
             if not TextCha(request).check_answer_from_form():
                 raise pg.SaveError(_('TextCha: Wrong answer! Try again below...'))
-            if request.cfg.require_comment and not comment:
+            if request.cfg.comment_required and not comment:
                 raise pg.SaveError(_('Supplying a comment is mandatory.  Write a comment below and try again...'))
             savemsg = pg.saveText(savetext, rev, trivial=trivial, comment=comment)
         except pg.EditConflict, e:
--- a/MoinMoin/config/multiconfig.py	Thu Sep 20 17:47:04 2012 +0200
+++ b/MoinMoin/config/multiconfig.py	Thu Sep 20 19:00:05 2012 +0200
@@ -952,7 +952,7 @@
     ('edit_locking', 'warn 10', "Editor locking policy: `None`, `'warn <timeout in minutes>'`, or `'lock <timeout in minutes>'`"),
     ('edit_ticketing', True, None),
     ('edit_rows', 20, "Default height of the edit box"),
-    ('require_comment', False, "if True, only allow saving when a comment is filled in"),
+    ('comment_required', False, "if True, only allow saving if a comment is filled in"),
 
   )),
   # ==========================================================================