You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2018/08/22 23:29:18 UTC
roller git commit: Wrong password tip on user register page.
Repository: roller
Updated Branches:
refs/heads/bootstrap-ui 5889e03e9 -> 96a006503
Wrong password tip on user register page.
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/96a00650
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/96a00650
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/96a00650
Branch: refs/heads/bootstrap-ui
Commit: 96a00650304d31e7b45785e5720caf383e848a09
Parents: 5889e03
Author: Dave Johnson <sn...@gmail.com>
Authored: Wed Aug 22 19:29:16 2018 -0400
Committer: Dave Johnson <sn...@gmail.com>
Committed: Wed Aug 22 19:29:16 2018 -0400
----------------------------------------------------------------------
app/src/main/resources/ApplicationResources.properties | 3 ++-
app/src/main/webapp/WEB-INF/jsps/core/Profile.jsp | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller/blob/96a00650/app/src/main/resources/ApplicationResources.properties
----------------------------------------------------------------------
diff --git a/app/src/main/resources/ApplicationResources.properties b/app/src/main/resources/ApplicationResources.properties
index 8a8b4e9..09747fd 100644
--- a/app/src/main/resources/ApplicationResources.properties
+++ b/app/src/main/resources/ApplicationResources.properties
@@ -1451,7 +1451,8 @@ userRegister.tip.openid.only=This site uses only OpenID for logins, so please \
specify your OpenID identifier below. For more information about OpenID see \
<a href=\"http://openid.net\">http://openid.net</a>.
-userRegister.tip.password=Your password. Fill in only if you wish to change it.
+userRegister.tip.password=Your password.
+userSettings.tip.password=Your password. Fill-in only if you wish to change it.
userRegister.tip.passwordConfirm=Confirm your password.
userRegister.tip.openIdUrl=Your OpenID identifier (in the form of a URL).
http://git-wip-us.apache.org/repos/asf/roller/blob/96a00650/app/src/main/webapp/WEB-INF/jsps/core/Profile.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/core/Profile.jsp b/app/src/main/webapp/WEB-INF/jsps/core/Profile.jsp
index 4079bca..fa8287a 100644
--- a/app/src/main/webapp/WEB-INF/jsps/core/Profile.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/core/Profile.jsp
@@ -51,7 +51,7 @@
<s:if test="authMethod == 'ROLLERDB' || authMethod == 'DB_OPENID'">
<s:password label="%{getText('userSettings.password')}"
- tooltip="%{getText('userRegister.tip.password')}"
+ tooltip="%{getText('userSettings.tip.password')}"
onchange="formChanged()" onkeyup="formChanged()"
name="bean.passwordText" size="20" maxlength="20"/>