From 31fbf567d383445e1f9795d7e4929535421d8364 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Sat, 22 Jun 2019 09:37:21 +0900 Subject: [PATCH] DeleteVote.soy: Make wording consistent with DeleteVoteHtml.soy Change-Id: I9bf12cdc2347a1607d783889f710cc836cf77a20 --- javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java | 2 +- .../com/google/gerrit/acceptance/rest/change/DeleteVoteIT.java | 2 +- resources/com/google/gerrit/server/mail/DeleteVote.soy | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java b/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java index bed75b42c9..27d3d2125e 100644 --- a/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java +++ b/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java @@ -2281,7 +2281,7 @@ public class ChangeIT extends AbstractDaemonTest { assertThat(messages).hasSize(1); Message msg = messages.get(0); 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()) .contains("Removed Code-Review+1 by " + user.fullName + " <" + user.email + ">\n"); diff --git a/javatests/com/google/gerrit/acceptance/rest/change/DeleteVoteIT.java b/javatests/com/google/gerrit/acceptance/rest/change/DeleteVoteIT.java index b6dfde434a..940f2cfa6d 100644 --- a/javatests/com/google/gerrit/acceptance/rest/change/DeleteVoteIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/change/DeleteVoteIT.java @@ -70,7 +70,7 @@ public class DeleteVoteIT extends AbstractDaemonTest { assertThat(messages).hasSize(1); FakeEmailSender.Message msg = messages.get(0); 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()) .contains("Removed Code-Review+1 by " + user.fullName + " <" + user.email + ">\n"); diff --git a/resources/com/google/gerrit/server/mail/DeleteVote.soy b/resources/com/google/gerrit/server/mail/DeleteVote.soy index c306a41fd2..d493e09a09 100644 --- a/resources/com/google/gerrit/server/mail/DeleteVote.soy +++ b/resources/com/google/gerrit/server/mail/DeleteVote.soy @@ -25,7 +25,7 @@ * @param fromName */ {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} Change subject: {$change.subject}{\n} ......................................................................{\n}