Merged [6696] from tterriberry@mozilla.com:

Improve e-mails from replaced-by updates.

Fix an incorrectly-expanded file tag in the subject.
Fixes #1178.
Use a slightly more natural grammatical construct in the message body.
Fixes #1179.
 - Legacy-Id: 6699
Note: SVN reference [6696] has been migrated to Git commit 03896647cc
This commit is contained in:
Henrik Levkowetz 2013-11-08 18:56:24 +00:00
commit ba70c3067a

View file

@ -375,15 +375,7 @@ def replaces(request, name):
old_replaces_names = ", ".join([d.name for d in old_replaces])
if not old_replaces_names:
old_replaces_names = "None"
e.desc = dedent(u"""
The set of documents which are replaced by %s has been updated:
Old:
%s
New:
%s
""" % (doc.name, old_replaces_names, new_replaces_names))
e.desc = u"This document now replaces <b>%s</b> instead of %s"% (new_replaces_names, old_replaces_names)
e.save()
email_desc = e.desc.replace(", ", "\n ")
if comment: