opendev/gerrit
Code Issues Proposed changes

Make wording of "Merged" html and text templates consistent

Browse Source 
The wording "has submitted this change and it was merged" in the plain
text version of the template is a legacy of when there was a submit
queue and pressing "submit" on a change didn't guarantee that it would
actually get submitted.

Change it to "has submitted this change".

Also change the html template, which had already had the "and it was
merged" part removed, to say "submitted" instead of "merged".

Change-Id: I5bfa5914abdc9f12e328306215b40ed669289392
This commit is contained in:
David Pursehouse
2019-07-10 18:12:37 +09:00
parent bd06cac77f
commit 8109e14607
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gerrit-server/src/main/resources/com/google/gerrit/server/mail/Merged.soy
View File

@@ -25,7 +25,7 @@
* @param fromName
*/
{template .Merged autoescape="strict" kind="text"}
{$fromName} has submitted this change and it was merged.
{$fromName} has submitted this change.
{if $email.changeUrl} ( {$email.changeUrl} ){/if}{\n}
{\n}
Change subject: {$change.subject}{\n}
@@ -39,4 +39,4 @@
{$email.unifiedDiff}
{\n}
{/if}
{/template}
{/template}

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

@@ -23,7 +23,7 @@
*/
{template .MergedHtml autoescape="strict" kind="html"}
<p>
{$fromName} <strong>merged</strong> this change.
{$fromName} <strong>submitted</strong> this change.
</p>
{if $email.changeUrl}