From 32b6adfade11355bf2d362825815b70c84c08730 Mon Sep 17 00:00:00 2001
From: David Pursehouse <dpursehouse@collab.net>
Date: Tue, 12 Jun 2018 17:10:41 +0900
Subject: [PATCH] MyPasswordScreen: Fix default text in password field

The default text says:

  "click 'generate' to revoke an old password"

but the label on the button is actually 'Generate Password'.

Change the text to be consistent with the label. At the same time,
move the text into the AccountConstants class.

Change-Id: I2220103237c71d653f62fbf76ea866604f195d65
---
 .../java/com/google/gerrit/client/account/AccountConstants.java | 2 ++
 .../google/gerrit/client/account/AccountConstants.properties    | 1 +
 .../java/com/google/gerrit/client/account/MyPasswordScreen.java | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AccountConstants.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AccountConstants.java
index 4a3a5f8ea5..87694f9a8e 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AccountConstants.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AccountConstants.java
@@ -127,6 +127,8 @@ public interface AccountConstants extends Constants {
 
   String buttonGeneratePassword();
 
+  String revokePassword();
+
   String linkObtainPassword();
 
   String linkEditFullName();
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AccountConstants.properties b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AccountConstants.properties
index 9d87365b25..481a9a7e7e 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AccountConstants.properties
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AccountConstants.properties
@@ -73,6 +73,7 @@ confirmSetUserNameTitle = Confirm Setting the Username
 confirmSetUserName = Setting the Username is permanent.  Are you sure?
 buttonClearPassword = Clear Password
 buttonGeneratePassword = Generate Password
+revokePassword = (click 'Generate Password' to revoke an old password)
 linkObtainPassword = Obtain Password
 linkEditFullName = Edit
 linkReloadContact = Reload
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyPasswordScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyPasswordScreen.java
index 03e72c7c05..e1d9ef0080 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyPasswordScreen.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyPasswordScreen.java
@@ -49,7 +49,7 @@ public class MyPasswordScreen extends SettingsScreen {
       return;
     }
 
-    password = new CopyableLabel("(click 'generate' to revoke an old password)");
+    password = new CopyableLabel(Util.C.revokePassword());
     password.addStyleName(Gerrit.RESOURCES.css().accountPassword());
 
     generatePassword = new Button(Util.C.buttonGeneratePassword());