opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.14' into stable-2.15

Browse Source 
* stable-2.14:
  MyPasswordScreen: Fix default text in password field

Change-Id: I98cf0ce7fda9af11193d56ffe78534781cd4804b
This commit is contained in:
David Pursehouse
2018-06-12 19:41:08 +09:00
parent 61caa7d43f 32b6adfade
commit 4e3b480c35
3 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AccountConstants.java
View File

@@ -129,6 +129,8 @@ public interface AccountConstants extends Constants {
String buttonGeneratePassword(); String buttonGeneratePassword();
String revokePassword();
String linkObtainPassword(); String linkObtainPassword();
String linkEditFullName(); String linkEditFullName();

1
gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AccountConstants.properties
View File

@@ -74,6 +74,7 @@ confirmSetUserNameTitle = Confirm Setting the Username
confirmSetUserName = Setting the Username is permanent. Are you sure? confirmSetUserName = Setting the Username is permanent. Are you sure?
buttonClearPassword = Clear Password buttonClearPassword = Clear Password
buttonGeneratePassword = Generate Password buttonGeneratePassword = Generate Password
revokePassword = (click 'Generate Password' to revoke an old password)
linkObtainPassword = Obtain Password linkObtainPassword = Obtain Password
linkEditFullName = Edit linkEditFullName = Edit
linkReloadContact = Reload linkReloadContact = Reload

2
gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyPasswordScreen.java
View File

@@ -49,7 +49,7 @@ public class MyPasswordScreen extends SettingsScreen {
return; return;
} }
password = new CopyableLabel("(click 'generate' to revoke an old password)"); password = new CopyableLabel(Util.C.revokePassword());
password.addStyleName(Gerrit.RESOURCES.css().accountPassword()); password.addStyleName(Gerrit.RESOURCES.css().accountPassword());
generatePassword = new Button(Util.C.buttonGeneratePassword()); generatePassword = new Button(Util.C.buttonGeneratePassword());