Clearer HTML email formatting

In the salutation line of change emails, set the action described in the
message in bold rather than setting the name of the change in bold.

The table below describes use of bold in the salutation of change
emails, with [...] markers to surround the emboldened terms.

 Email Type        | Salutation
 ------------------+----------------------------------------------------
 Abandoned         | $user [abandoned] this change.
 Comment           | $user [posted comments] on this change.
 Delete-Reviewer   | $user [removed $reviewer] from this change.
 Delete-Vote       | $user [removed a vote] from this change.
 Merged            | $user [merged] this change.
 New-Change        | $user would like $reviewer to [review] this change.
 New-change (auto) | $user uploaded this change for [review].
 Replace-Patch-Set | $user [uploaded patch set #$num] to this change.
 Restored          | $user [restored] this change.
 Reverted          | $user [reverted] this change.

Note that the change subject no longer appears in these salutations, as
it is already included in the email subject.

To avoid use of monospace where it is not needed, the approval list in
Merged emails and the cover-letter field for Abandoned and Delete-Vote
emails is set in a proportionate-width font rather than monospaced.
Furthermore, because they are redundant to information already included
in the email, the cover-letter field is removed from Delete-Reviewer and
Restored emails.

Change-Id: Ic96483ebc9eb605d8a330e67952edc69f2b01041

gerrit-server/src/main/resources/com/google/gerrit/server/mail/AbandonedHtml.soy

@@ -17,14 +17,13 @@
 {namespace com.google.gerrit.server.mail.template}
 
 /**
- * @param change
  * @param coverLetter
  * @param email
  * @param fromName
  */
 {template .AbandonedHtml autoescape="strict" kind="html"}
   <p>
-    {$fromName} abandoned <strong>{$change.subject}</strong>.
+    {$fromName} <strong>abandoned</strong> this change.
   </p>
 
   {if $email.changeUrl}
@@ -34,6 +33,6 @@
   {/if}
 
   {if $coverLetter}
-    {call .Pre}{param content: $coverLetter /}{/call}
+    <div style="white-space:pre-wrap">{$coverLetter}</div>
   {/if}
 {/template}

gerrit-server/src/main/resources/com/google/gerrit/server/mail/CommentHtml.soy

@@ -17,7 +17,6 @@
 {namespace com.google.gerrit.server.mail.template}
 
 /**
- * @param change
  * @param commentFiles
  * @param coverLetter
  * @param email
@@ -44,7 +43,7 @@
   {/let}
 
   <p>
-    {$fromName} posted comments on <strong>{$change.subject}</strong>.
+    {$fromName} <strong>posted comments</strong> on this change.
   </p>
 
   {if $email.changeUrl}

gerrit-server/src/main/resources/com/google/gerrit/server/mail/DeleteReviewerHtml.soy

@@ -17,19 +17,22 @@
 {namespace com.google.gerrit.server.mail.template}
 
 /**
- * @param change
- * @param coverLetter
  * @param email
  * @param fromName
  */
 {template .DeleteReviewerHtml autoescape="strict" kind="html"}
   <p>
-    {$fromName} removed{sp}
+    {$fromName}{sp}
+    <strong>
+      removed{sp}
       {foreach $reviewerName in $email.reviewerNames}
-      {if not isFirst($reviewerName)},{sp}{/if}
+        {if not isFirst($reviewerName)}
+          {if isLast($reviewerName)}{sp}and{else},{/if}{sp}
+        {/if}
         {$reviewerName}
-    {/foreach}{sp}
-    from <strong>{$change.subject}</strong>.
+      {/foreach}
+    </strong>{sp}
+    from this change.
   </p>
 
   {if $email.changeUrl}
@@ -37,8 +40,4 @@
       {call .ViewChangeButton data="all" /}
     </p>
   {/if}
-
-  {if $coverLetter}
-    {call .Pre}{param content: $coverLetter /}{/call}
-  {/if}
 {/template}

gerrit-server/src/main/resources/com/google/gerrit/server/mail/DeleteVoteHtml.soy

@@ -17,14 +17,13 @@
 {namespace com.google.gerrit.server.mail.template}
 
 /**
- * @param change
  * @param coverLetter
  * @param email
  * @param fromName
  */
 {template .DeleteVoteHtml autoescape="strict" kind="html"}
   <p>
-    {$fromName} removed a vote from <strong>{$change.subject}</strong>.
+    {$fromName} <strong>removed a vote</strong> from this change.
   </p>
 
   {if $email.changeUrl}
@@ -34,6 +33,6 @@
   {/if}
 
   {if $coverLetter}
-    {call .Pre}{param content: $coverLetter /}{/call}
+    <div style="white-space:pre-wrap">{$coverLetter}</div>
   {/if}
 {/template}

gerrit-server/src/main/resources/com/google/gerrit/server/mail/MergedHtml.soy

@@ -17,13 +17,12 @@
 {namespace com.google.gerrit.server.mail.template}
 
 /**
- * @param change
  * @param email
  * @param fromName
  */
 {template .MergedHtml autoescape="strict" kind="html"}
   <p>
-    {$fromName} merged <strong>{$change.subject}</strong>.
+    {$fromName} <strong>merged</strong> this change.
   </p>
 
   {if $email.changeUrl}
@@ -32,9 +31,9 @@
     </p>
   {/if}
 
-  {call .Pre}{param content: $email.changeDetail /}{/call}
+  <div style="white-space:pre-wrap">{$email.approvals}</div>
 
-  {call .Pre}{param content: $email.approvals /}{/call}
+  {call .Pre}{param content: $email.changeDetail /}{/call}
 
   {if $email.includeDiff}
     {call .Pre}{param content: $email.unifiedDiff /}{/call}

gerrit-server/src/main/resources/com/google/gerrit/server/mail/NewChangeHtml.soy

@@ -17,7 +17,6 @@
 {namespace com.google.gerrit.server.mail.template}
 
 /**
- * @param change
  * @param email
  * @param fromName
  * @param patchSet
@@ -33,9 +32,9 @@
         {/if}
         {$reviewerName}
       {/foreach}{sp}
-      to review <strong>{$change.subject}</strong>.
+      to <strong>review</strong> this change.
     {else}
-      {$fromName} uploaded <strong>{$change.subject}</strong> for review.
+      {$fromName} uploaded this change for <strong>review</strong>.
     {/if}
   </p>
 

gerrit-server/src/main/resources/com/google/gerrit/server/mail/ReplacePatchSetHtml.soy

@@ -17,7 +17,6 @@
 {namespace com.google.gerrit.server.mail.template}
 
 /**
- * @param change
  * @param email
  * @param fromName
  * @param patchSet
@@ -25,8 +24,8 @@
  */
 {template .ReplacePatchSetHtml autoescape="strict" kind="html"}
   <p>
-    {$fromName} uploaded patch set #{$patchSet.patchSetId} to{sp}
-    <strong>{$change.subject}</strong>.
+    {$fromName} <strong>uploaded patch set #{$patchSet.patchSetId}</strong>{sp}
+    to this change.
   </p>
 
   {if $email.changeUrl}

gerrit-server/src/main/resources/com/google/gerrit/server/mail/RestoredHtml.soy

@@ -17,14 +17,12 @@
 {namespace com.google.gerrit.server.mail.template}
 
 /**
- * @param change
- * @param coverLetter
  * @param email
  * @param fromName
  */
 {template .RestoredHtml autoescape="strict" kind="html"}
   <p>
-    {$fromName} restored <strong>{$change.subject}</strong>.
+    {$fromName} <strong>restored</strong> this change.
   </p>
 
   {if $email.changeUrl}
@@ -32,8 +30,4 @@
       {call .ViewChangeButton data="all" /}
     </p>
   {/if}
-
-  {if $coverLetter}
-    {call .Pre}{param content: $coverLetter /}{/call}
-  {/if}
 {/template}

gerrit-server/src/main/resources/com/google/gerrit/server/mail/RevertedHtml.soy

@@ -17,14 +17,12 @@
 {namespace com.google.gerrit.server.mail.template}
 
 /**
- * @param change
- * @param coverLetter
  * @param email
  * @param fromName
  */
 {template .RevertedHtml autoescape="strict" kind="html"}
   <p>
-    {$fromName} reverted the change: <strong>{$change.subject}</strong>.
+    {$fromName} <strong>reverted</strong> this change.
   </p>
 
   {if $email.changeUrl}
@@ -32,8 +30,4 @@
       {call .ViewChangeButton data="all" /}
     </p>
   {/if}
-
-  {if $coverLetter}
-    {call .Pre}{param content: $coverLetter /}{/call}
-  {/if}
 {/template}