sourceforge patch id=1107169, re-use member_moderation_notice ...

  Instead of re-use, a new variable 'nonmember_rejection_notice' was
introduced. For compatibility with my patch for subject numbering,
'data_version' was raised by 3. Sorry for the leap but I want MY user
to get smooth update. (TK)

4 files changed, 13 insertions, 2 deletions

diff --git a/Mailman/Gui/Privacy.py b/Mailman/Gui/Privacy.py
index 2668140b..cb10c0c3 100644
--- a/Mailman/Gui/Privacy.py
+++ b/Mailman/Gui/Privacy.py
@@ -306,6 +306,12 @@ class Privacy(GUIBase):
              _("""Should messages from non-members, which are automatically
              discarded, be forwarded to the list moderator?""")),
 
+            ('nonmember_rejection_notice', mm_cfg.Text, (10, WIDTH), 1,
+             _("""Text to include in any rejection notice to be sent to
+             non-members who post to this list. This notice can include
+             the list's owner address by %%(listowner)s and replaces the
+             internally crafted default message.""")),
+
             ]
 
         recip_rtn = [
diff --git a/Mailman/Handlers/Moderate.py b/Mailman/Handlers/Moderate.py
index 61e6cafc..e8669c83 100644
--- a/Mailman/Handlers/Moderate.py
+++ b/Mailman/Handlers/Moderate.py
@@ -135,7 +135,11 @@ def matches_p(sender, nonmembers):
 
 def do_reject(mlist):
     listowner = mlist.GetOwnerEmail()
-    raise Errors.RejectMessage, Utils.wrap(_("""\
+    if mlist.nonmember_rejection_notice:
+        raise Errors.RejectMessage, \
+              Utils.wrap(_(mlist.nonmember_rejection_notice))
+    else:
+        raise Errors.RejectMessage, Utils.wrap(_("""\
 You are not allowed to post to this mailing list, and your message has been
 automatically rejected.  If you think that your messages are being rejected in
 error, contact the mailing list owner at %(listowner)s."""))
diff --git a/Mailman/Version.py b/Mailman/Version.py
index 4b00bd1a..3954b6aa 100644
--- a/Mailman/Version.py
+++ b/Mailman/Version.py
@@ -36,7 +36,7 @@ HEX_VERSION = ((MAJOR_REV << 24) | (MINOR_REV << 16) | (MICRO_REV << 8) |
                (REL_LEVEL << 4)  | (REL_SERIAL << 0))
 
 # config.pck schema version number
-DATA_FILE_VERSION = 92
+DATA_FILE_VERSION = 95
 
 # qfile/*.db schema version number
 QFILE_SCHEMA_VERSION = 3
diff --git a/Mailman/versions.py b/Mailman/versions.py
index 2faee667..c7710b18 100644
--- a/Mailman/versions.py
+++ b/Mailman/versions.py
@@ -402,6 +402,7 @@ def NewVars(l):
     add_only_if_missing('pass_filename_extensions', [])
     # automatic discard
     add_only_if_missing('max_days_to_hold', 0)
+    add_only_if_missing('nonmember_rejection_notice', '')