summaryrefslogtreecommitdiff
path: root/src/mailman/runners
diff options
context:
space:
mode:
authorBarry Warsaw2012-03-15 15:48:41 -0700
committerBarry Warsaw2012-03-15 15:48:41 -0700
commitac0f1c3916e797f3a2261e9a2631e496fb90a8f1 (patch)
tree441a8e2b32de59f466a837f072120c36c92f60d4 /src/mailman/runners
parent0589c867988dc70cbe83a53bc9d1e2bbf3108b82 (diff)
downloadmailman-ac0f1c3916e797f3a2261e9a2631e496fb90a8f1.tar.gz
mailman-ac0f1c3916e797f3a2261e9a2631e496fb90a8f1.tar.zst
mailman-ac0f1c3916e797f3a2261e9a2631e496fb90a8f1.zip
Schema change. After discussion at Pycon, we decided to change "real_name" to
"display_name" across the board. * `IMailingList.real_name` -> `IMailingList.display_name` * `IUser.real_name` -> `IUser.display_name` * `IAddress.real_name` -> `IAddress.display_name` * Schema changes: - real_name -> display_name (mailinglist, user, address)
Diffstat (limited to 'src/mailman/runners')
-rw-r--r--src/mailman/runners/digest.py7
-rw-r--r--src/mailman/runners/docs/digester.rst10
2 files changed, 8 insertions, 9 deletions
diff --git a/src/mailman/runners/digest.py b/src/mailman/runners/digest.py
index 2730fc427..b4ae9a442 100644
--- a/src/mailman/runners/digest.py
+++ b/src/mailman/runners/digest.py
@@ -63,9 +63,8 @@ class Digester:
self._mlist = mlist
self._charset = mlist.preferred_language.charset
# This will be used in the Subject, so use $-strings.
- realname = mlist.real_name
- issue = digest_number
- self._digest_id = _('$realname Digest, Vol $volume, Issue $issue')
+ self._digest_id = _(
+ '$mlist.display_name Digest, Vol $volume, Issue $digest_number')
self._subject = Header(self._digest_id,
self._charset,
header_name='Subject')
@@ -83,7 +82,7 @@ class Digester:
# ahead and add it now.
self._masthead = make('masthead.txt',
mailing_list=mlist,
- real_name=mlist.real_name,
+ display_name=mlist.display_name,
got_list_email=mlist.posting_address,
got_listinfo_url=mlist.script_url('listinfo'),
got_request_email=mlist.request_address,
diff --git a/src/mailman/runners/docs/digester.rst b/src/mailman/runners/docs/digester.rst
index 5a20db556..4b9481f3e 100644
--- a/src/mailman/runners/docs/digester.rst
+++ b/src/mailman/runners/docs/digester.rst
@@ -346,7 +346,7 @@ You can see that the digests contain a mix of French and Japanese.
Content-Type: multipart/mixed; boundary="===============...=="
MIME-Version: 1.0
From: test-request@example.com
- Subject: Groupe Test, Vol. 1, Parution 2
+ Subject: Groupe Test, Vol 1, Parution 2
To: test@example.com
Reply-To: test@example.com
Date: ...
@@ -356,7 +356,7 @@ You can see that the digests contain a mix of French and Japanese.
Content-Type: text/plain; charset="iso-8859-1"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
- Content-Description: Groupe Test, Vol. 1, Parution 2
+ Content-Description: Groupe Test, Vol 1, Parution 2
<BLANKLINE>
Envoyez vos messages pour la liste Test =E0
test@example.com
@@ -413,7 +413,7 @@ French and Japanese characters.
>>> print rfc1153.msg.as_string()
From: test-request@example.com
- Subject: Groupe Test, Vol. 1, Parution 2
+ Subject: Groupe Test, Vol 1, Parution 2
To: test@example.com
Reply-To: test@example.com
Date: ...
@@ -471,8 +471,8 @@ The content can be decoded to see the actual digest text.
"'http://lists.example.com/listinfo/test@example.com'",
"''",
"''",
- "'Fin de Groupe Test, Vol. 1, Parution 2'",
- "'**************************************'"]
+ "'Fin de Groupe Test, Vol 1, Parution 2'",
+ "'*************************************'"]
>>> config.pop('french')