Fix tests based on template changes required due to the elimination of

SafeDict.

14 files changed, 60 insertions, 60 deletions

diff --git a/mailman/messages/fr/LC_MESSAGES/mailman.po b/mailman/messages/fr/LC_MESSAGES/mailman.po
index 6bccf8d9c..05cd532a4 100644
--- a/mailman/messages/fr/LC_MESSAGES/mailman.po
+++ b/mailman/messages/fr/LC_MESSAGES/mailman.po
@@ -13850,35 +13850,35 @@ msgstr ""
 
 #: templates/en/masthead.txt:1
 msgid ""
-"Send %(real_name)s mailing list submissions to\n"
-"\t%(got_list_email)s\n"
+"Send $real_name mailing list submissions to\n"
+"\t$got_list_email\n"
 "\n"
 "To subscribe or unsubscribe via the World Wide Web, visit\n"
-"\t%(got_listinfo_url)s\n"
+"\t$got_listinfo_url\n"
 "or, via email, send a message with subject or body 'help' to\n"
-"\t%(got_request_email)s\n"
+"\t$got_request_email\n"
 "\n"
 "You can reach the person managing the list at\n"
-"\t%(got_owner_email)s\n"
+"\t$got_owner_email\n"
 "\n"
 "When replying, please edit your Subject line so it is more specific than\n"
-"\"Re: Contents of %(real_name)s digest...\""
+"\"Re: Contents of $real_name digest...\""
 msgstr ""
-"Envoyez vos messages pour la liste %(real_name)s à\n"
-"\t%(got_list_email)s\n"
+"Envoyez vos messages pour la liste $real_name à\n"
+"\t$got_list_email\n"
 "\n"
 "Pour vous (dés)abonner par le web, consultez\n"
-"\t%(got_listinfo_url)s\n"
+"\t$got_listinfo_url\n"
 "\n"
 "ou, par courriel, envoyez un message avec « help » dans le corps\n"
 "ou dans le sujet à\n"
-"\t%(got_request_email)s\n"
+"\t$got_request_email\n"
 "\n"
 "Vous pouvez contacter l'administrateur de la liste à l'adresse\n"
-"\t%(got_owner_email)s\n"
+"\t$got_owner_email\n"
 "\n"
 "Si vous répondez, n'oubliez pas de changer l'objet du message afin\n"
-"qu'il soit plus spécifique que « Re: Contenu du groupe de %(real_name)s... »"
+"qu'il soit plus spécifique que « Re: Contenu du groupe de $real_name... »"
 
 #: templates/en/newlist.txt:1
 msgid ""
diff --git a/mailman/templates/en/adminaddrchgack.txt b/mailman/templates/en/adminaddrchgack.txt
index a24dd3d91..1b66a2fcf 100644
--- a/mailman/templates/en/adminaddrchgack.txt
+++ b/mailman/templates/en/adminaddrchgack.txt
@@ -1,4 +1,4 @@
-Address for member %(name)s has been successfully changed
-from %(oldaddr)s to %(newaddr)s for list %(listname)s.
+Address for member $name has been successfully changed
+from $oldaddr to $newaddr for list $listname.
 
 
diff --git a/mailman/templates/en/adminsubscribeack.txt b/mailman/templates/en/adminsubscribeack.txt
index 5e8ee6cf8..5d5f36417 100644
--- a/mailman/templates/en/adminsubscribeack.txt
+++ b/mailman/templates/en/adminsubscribeack.txt
@@ -1 +1 @@
-%(member)s has been successfully subscribed to %(listname)s.
+$member has been successfully subscribed to $listname.
diff --git a/mailman/templates/en/adminunsubscribeack.txt b/mailman/templates/en/adminunsubscribeack.txt
index fb87ac87d..a6ed99f59 100644
--- a/mailman/templates/en/adminunsubscribeack.txt
+++ b/mailman/templates/en/adminunsubscribeack.txt
@@ -1 +1 @@
-%(member)s has been removed from %(listname)s.
+$member has been removed from $listname.
diff --git a/mailman/templates/en/approve.txt b/mailman/templates/en/approve.txt
index dfb0dfb1e..10ab69356 100644
--- a/mailman/templates/en/approve.txt
+++ b/mailman/templates/en/approve.txt
@@ -1,6 +1,6 @@
-Your request to %(requestaddr)s:
+Your request to $requestaddr:
 
-    %(cmd)s
+    $cmd
 
 has been forwarded to the person running the list.
 
@@ -12,4 +12,4 @@ your subscription request.
 
 Any questions about the list owner's policy should be directed to:
 
-    %(adminaddr)s
+    $adminaddr
diff --git a/mailman/templates/en/invite.txt b/mailman/templates/en/invite.txt
index 920c84213..337ac2ddc 100644
--- a/mailman/templates/en/invite.txt
+++ b/mailman/templates/en/invite.txt
@@ -1,20 +1,20 @@
-Your address "%(email)s" has been invited to join the %(listname)s
-mailing list at %(hostname)s by the %(listname)s mailing list owner.
+Your address "$email" has been invited to join the $listname
+mailing list at $hostname by the $listname mailing list owner.
 You may accept the invitation by simply replying to this message,
 keeping the Subject: header intact.
 
 You can also visit this web page:
 
-    %(confirmurl)s
+    $confirmurl
 
 Or you should include the following line -- and only the following
-line -- in a message to %(requestaddr)s:
+line -- in a message to $requestaddr:
 
-    confirm %(cookie)s
+    confirm $cookie
 
 Note that simply sending a `reply' to this message should work from
 most mail readers.
 
 If you want to decline this invitation, please simply disregard this
 message.  If you have any questions, please send them to
-%(listowner)s.
+$listowner.
diff --git a/mailman/templates/en/masthead.txt b/mailman/templates/en/masthead.txt
index 30c526ac9..01cd6afec 100644
--- a/mailman/templates/en/masthead.txt
+++ b/mailman/templates/en/masthead.txt
@@ -1,13 +1,13 @@
-Send %(real_name)s mailing list submissions to
-	%(got_list_email)s
+Send $real_name mailing list submissions to
+	$got_list_email
 
 To subscribe or unsubscribe via the World Wide Web, visit
-	%(got_listinfo_url)s
+	$got_listinfo_url
 or, via email, send a message with subject or body 'help' to
-	%(got_request_email)s
+	$got_request_email
 
 You can reach the person managing the list at
-	%(got_owner_email)s
+	$got_owner_email
 
 When replying, please edit your Subject line so it is more specific than
-"Re: Contents of %(real_name)s digest..."
+"Re: Contents of $real_name digest..."
diff --git a/mailman/templates/en/postack.txt b/mailman/templates/en/postack.txt
index 7402e4c2a..a2d6e972b 100644
--- a/mailman/templates/en/postack.txt
+++ b/mailman/templates/en/postack.txt
@@ -1,8 +1,8 @@
 Your message entitled
 
-    %(subject)s
+    $subject
 
-was successfully received by the %(listname)s mailing list.
+was successfully received by the $listname mailing list.
 
-List info page: %(listinfo_url)s
-Your preferences: %(optionsurl)s
+List info page: $listinfo_url
+Your preferences: $optionsurl
diff --git a/mailman/templates/en/postauth.txt b/mailman/templates/en/postauth.txt
index 19f1e384a..fce85f52f 100644
--- a/mailman/templates/en/postauth.txt
+++ b/mailman/templates/en/postauth.txt
@@ -1,13 +1,13 @@
 As list administrator, your authorization is requested for the
 following mailing list posting:
 
-    List:    %(listname)s
-    From:    %(sender)s
-    Subject: %(subject)s
-    Reason:  %(reason)s
+    List:    $listname
+    From:    $sender
+    Subject: $subject
+    Reason:  $reason
 
 At your convenience, visit:
 
-    %(admindb_url)s
+    $admindb_url
         
 to approve or deny the request.
diff --git a/mailman/templates/en/postheld.txt b/mailman/templates/en/postheld.txt
index 877bb4050..b2c938acf 100644
--- a/mailman/templates/en/postheld.txt
+++ b/mailman/templates/en/postheld.txt
@@ -1,15 +1,15 @@
-Your mail to '%(listname)s' with the subject
+Your mail to '$listname' with the subject
 
-    %(subject)s
+    $subject
 
 Is being held until the list moderator can review it for approval.
 
 The reason it is being held:
 
-    %(reason)s
+    $reason
 
 Either the message will get posted to the list, or you will receive
 notification of the moderator's decision.  If you would like to cancel
 this posting, please visit the following URL:
 
-    %(confirmurl)s
+    $confirmurl
diff --git a/mailman/templates/en/refuse.txt b/mailman/templates/en/refuse.txt
index 9b6d9bb9c..ee8eba9b3 100644
--- a/mailman/templates/en/refuse.txt
+++ b/mailman/templates/en/refuse.txt
@@ -1,13 +1,13 @@
-Your request to the %(listname)s mailing list
+Your request to the $listname mailing list
 
-    %(request)s
+    $request
 
 has been rejected by the list moderator.  The moderator gave the
 following reason for rejecting your request:
 
-"%(reason)s"
+"$reason"
 
 Any questions or comments should be directed to the list administrator 
 at:
 
-    %(adminaddr)s
+    $adminaddr
diff --git a/mailman/templates/en/subauth.txt b/mailman/templates/en/subauth.txt
index 869be71c7..1b13ebaeb 100644
--- a/mailman/templates/en/subauth.txt
+++ b/mailman/templates/en/subauth.txt
@@ -1,11 +1,11 @@
 Your authorization is required for a mailing list subscription request
 approval:
 
-    For:  %(username)s
-    List: %(listname)s
+    For:  $username
+    List: $listname
 
 At your convenience, visit:
 
-    %(admindb_url)s
+    $admindb_url
 
 to process the request.
diff --git a/mailman/templates/en/subscribeack.txt b/mailman/templates/en/subscribeack.txt
index 03f56c022..b39783737 100644
--- a/mailman/templates/en/subscribeack.txt
+++ b/mailman/templates/en/subscribeack.txt
@@ -1,22 +1,22 @@
-Welcome to the "%(real_name)s" mailing list!
-%(welcome)s
+Welcome to the "$real_name" mailing list!
+$welcome
 To post to this list, send your email to:
 
-  %(posting_address)s
+  $posting_address
 
 General information about the mailing list is at:
 
-  %(listinfo_url)s
+  $listinfo_url
 
 If you ever want to unsubscribe or change your options (eg, switch to or
 from digest mode, change your password, etc.), visit your subscription
 page at:
 
-  %(optionsurl)s
+  $optionsurl
 
 You can also make such adjustments via email by sending a message to:
 
-  %(request_address)s
+  $request_address
 
 with the word 'help' in the subject or body (don't include the quotes), and
 you will get back a message with instructions.  You will need your password to
diff --git a/mailman/templates/en/unsubauth.txt b/mailman/templates/en/unsubauth.txt
index 40bc3d5e6..5975a2ce8 100644
--- a/mailman/templates/en/unsubauth.txt
+++ b/mailman/templates/en/unsubauth.txt
@@ -1,11 +1,11 @@
 Your authorization is required for a mailing list unsubscription
 request approval:
 
-    By:   %(address)s
-    From: %(listname)s
+    By:   $address
+    From: $listname
 
 At your convenience, visit:
 
-    %(admindb_url)s
+    $admindb_url
 
 to process the request.