Merge lp:~raj-abhilash1/mailman/bugfix into lp:mailman

Proposed by Abhilash Raj
Status: Merged
Approved by: Barry Warsaw
Approved revision: no longer in the source branch.
Merged at revision: 7323
Proposed branch: lp:~raj-abhilash1/mailman/bugfix
Merge into: lp:mailman
Diff against target: 71 lines (+9/-14)
4 files modified
src/mailman/app/docs/chains.rst (+5/-8)
src/mailman/app/tests/test_subscriptions.py (+1/-1)
src/mailman/chains/hold.py (+1/-1)
src/mailman/templates/en/postauth.txt (+2/-4)
To merge this branch: bzr merge lp:~raj-abhilash1/mailman/bugfix
Reviewer Review Type Date Requested Status
Barry Warsaw Pending
Mailman Coders Pending
Review via email: mp+256418@code.launchpad.net

Description of the change

Updated the templates and reason for held message.

To post a comment you must log in.
lp:~raj-abhilash1/mailman/bugfix updated
7321. By Barry Warsaw

Update versions for 3.0rc1, but don't tag yet.

7322. By Barry Warsaw

Move a doctest to the right directory.

7323. By Barry Warsaw

Clean up some templates; given by raj-abhilash1

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/mailman/app/docs/chains.rst'
2--- src/mailman/app/docs/chains.rst 2015-03-26 20:06:23 +0000
3+++ src/mailman/app/docs/chains.rst 2015-04-16 14:06:01 +0000
4@@ -132,13 +132,10 @@
5 List: test@example.com
6 From: aperson@example.com
7 Subject: My first post
8- Reason: XXX
9- <BLANKLINE>
10- At your convenience, visit:
11- <BLANKLINE>
12- http://lists.example.com/admindb/test@example.com
13- <BLANKLINE>
14- to approve or deny the request.
15+ Reason: N/A
16+ <BLANKLINE>
17+ At your convenience, visit your dashboard to approve or deny the
18+ request.
19 <BLANKLINE>
20 ...
21 Content-Type: message/rfc822
22@@ -189,7 +186,7 @@
23 <BLANKLINE>
24 The reason it is being held:
25 <BLANKLINE>
26- XXX
27+ N/A
28 <BLANKLINE>
29 Either the message will get posted to the list, or you will receive
30 notification of the moderator's decision. If you would like to cancel
31
32=== modified file 'src/mailman/app/tests/test_subscriptions.py'
33--- src/mailman/app/tests/test_subscriptions.py 2015-04-16 02:51:39 +0000
34+++ src/mailman/app/tests/test_subscriptions.py 2015-04-16 14:06:01 +0000
35@@ -420,7 +420,7 @@
36 list(workflow)
37 line = mark.readline()
38 self.assertEqual(
39- line[29:-1],
40+ line[28:-1],
41 'test@example.com: held subscription request from anne@example.com'
42 )
43
44
45=== modified file 'src/mailman/chains/hold.py'
46--- src/mailman/chains/hold.py 2015-01-05 01:22:39 +0000
47+++ src/mailman/chains/hold.py 2015-04-16 14:06:01 +0000
48@@ -158,7 +158,7 @@
49 listname = mlist.fqdn_listname,
50 subject = original_subject,
51 sender = msg.sender,
52- reason = 'XXX', #reason,
53+ reason = 'N/A', #reason,
54 confirmurl = '{0}/{1}'.format(mlist.script_url('confirm'), token),
55 admindb_url = mlist.script_url('admindb'),
56 )
57
58=== modified file 'src/mailman/templates/en/postauth.txt'
59--- src/mailman/templates/en/postauth.txt 2008-09-29 06:44:19 +0000
60+++ src/mailman/templates/en/postauth.txt 2015-04-16 14:06:01 +0000
61@@ -6,8 +6,6 @@
62 Subject: $subject
63 Reason: $reason
64
65-At your convenience, visit:
66+At your convenience, visit your dashboard to approve or deny the
67+request.
68
69- $admindb_url
70-
71-to approve or deny the request.