opendev/gerrit
Code Issues Proposed changes

DeleteVote.soy: Make wording consistent with DeleteVoteHtml.soy

Browse Source 
Change-Id: I9bf12cdc2347a1607d783889f710cc836cf77a20
This commit is contained in:
David Pursehouse
2019-06-22 09:37:21 +09:00
parent f7741fabd7
commit 31fbf567d3
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java
View File

@@ -2281,7 +2281,7 @@ public class ChangeIT extends AbstractDaemonTest {
assertThat(messages).hasSize(1); assertThat(messages).hasSize(1);
Message msg = messages.get(0); Message msg = messages.get(0);
assertThat(msg.rcpt()).containsExactly(user.emailAddress); assertThat(msg.rcpt()).containsExactly(user.emailAddress);
assertThat(msg.body()).contains(admin.fullName + " has removed a vote on this change."); assertThat(msg.body()).contains(admin.fullName + " has removed a vote from this change.");
assertThat(msg.body()) assertThat(msg.body())
.contains("Removed Code-Review+1 by " + user.fullName + " <" + user.email + ">\n"); .contains("Removed Code-Review+1 by " + user.fullName + " <" + user.email + ">\n");

2
javatests/com/google/gerrit/acceptance/rest/change/DeleteVoteIT.java
View File

@@ -70,7 +70,7 @@ public class DeleteVoteIT extends AbstractDaemonTest {
assertThat(messages).hasSize(1); assertThat(messages).hasSize(1);
FakeEmailSender.Message msg = messages.get(0); FakeEmailSender.Message msg = messages.get(0);
assertThat(msg.rcpt()).containsExactly(user.emailAddress); assertThat(msg.rcpt()).containsExactly(user.emailAddress);
assertThat(msg.body()).contains(admin.fullName + " has removed a vote on this change."); assertThat(msg.body()).contains(admin.fullName + " has removed a vote from this change.");
assertThat(msg.body()) assertThat(msg.body())
.contains("Removed Code-Review+1 by " + user.fullName + " <" + user.email + ">\n"); .contains("Removed Code-Review+1 by " + user.fullName + " <" + user.email + ">\n");

2
resources/com/google/gerrit/server/mail/DeleteVote.soy
View File

@@ -25,7 +25,7 @@
* @param fromName * @param fromName
*/ */
{template .DeleteVote kind="text"} {template .DeleteVote kind="text"}
{$fromName} has removed a vote on this change.{if $email.changeUrl} ( {$email.changeUrl} ){/if}{\n}{\n} {$fromName} has removed a vote from this change.{if $email.changeUrl} ( {$email.changeUrl} ){/if}{\n}{\n}
{\n} {\n}
Change subject: {$change.subject}{\n} Change subject: {$change.subject}{\n}
......................................................................{\n} ......................................................................{\n}