From: Roland Häder <roland@mxchange.org>
Date: Tue, 10 May 2016 13:29:43 +0000 (+0200)
Subject: password1 and password2 is not clear enough, better <role>Password and <role>Password... 
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=fcc1be51be23a14ff8a9048615b9938bf91cc813;p=jjobs-war.git

password1 and password2 is not clear enough, better <role>Password and <role>PasswordRepeat respectively (cherry-pick this)

Signed-off-by: Roland Häder <roland@mxchange.org>
---

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index 0287a4cd..18cdd2cd 100644
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -50,10 +50,10 @@ CONTENT_TITLE_INDEX_IMPRINT=Impressum:
 GUEST_REGISTRATION_TITLE=Anmelden als Benutzer
 GUEST_REGISTRATION_EMAIL_LEGEND_TITLE=Zum Best\u00e4tigen wird Ihre Email-Adresse ben\u00f6tigt, f\u00fcr den Login Benutzername und Passwort.
 GUEST_REGISTRATION_EMAIL_LEGEND=Email-Adresse und Passwort:
-GUEST_REGISTRATION_ENTER_EMAIL1=Email-Adresse eingeben:
-GUEST_REGISTRATION_ENTER_EMAIL2=Email-Adresse wiederholen:
-GUEST_REGISTRATION_ENTER_PASSWORD1=Passwort eingeben:
-GUEST_REGISTRATION_ENTER_PASSWORD2=Passwort wiederholen:
+GUEST_REGISTRATION_ENTER_EMAIL=Email-Adresse eingeben:
+GUEST_REGISTRATION_ENTER_EMAIL_REPEAT=Email-Adresse wiederholen:
+GUEST_REGISTRATION_ENTER_PASSWORD=Passwort eingeben:
+GUEST_REGISTRATION_ENTER_PASSWORD_REPEAT=Passwort wiederholen:
 BUTTON_FINISH_REGISTRATION=Anmelden
 PRIVACY_TERMS_LEGEND_TITLE=Bitte die AGBs und Datenschutzbestimmungen lesen und akzeptieren.
 PRIVACY_TERMS_LEGEND=Rechtliches:
@@ -323,8 +323,8 @@ ADMIN_LIST_MOBILE_PROVIDER_DIAL_PREFIX=Vorwahl:
 ADMIN_LIST_MOBILE_PROVIDER_COUNTRY=Land:
 ADMIN_LIST_MOBILE_PROVIDER_ENTRY_CREATED=Erstellt:
 ADMIN_LINK_EDIT_DELETE_MOBILE_PROVIDER_TITLE=Editieren oder l\u00f6schen des Handyanbieters
-ADMIN_USER_DATA_ENTER_PASSWORD1=Passwort eingeben:
-ADMIN_USER_DATA_ENTER_PASSWORD2=Passwort wiederholen:
+ADMIN_USER_DATA_ENTER_PASSWORD=Passwort eingeben:
+ADMIN_USER_DATA_ENTER_PASSWORD_REPEAT=Passwort wiederholen:
 ADMIN_LIST_USER_ID=Benutzer-Id:
 ADMIN_LIST_USER_NAME=Benutzername:
 ADMIN_LIST_USER_GENDER=Anrede:
diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index 31ea70ab..054f6798 100644
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -50,10 +50,10 @@ CONTENT_TITLE_INDEX_IMPRINT=Imprint:
 GUEST_REGISTRATION_TITLE=Register a new user account
 GUEST_REGISTRATION_EMAIL_LEGEND_TITLE=For account confirmation your email address is required. For logins your user name and password are required.
 GUEST_REGISTRATION_EMAIL_LEGEND=Email address and password:
-GUEST_REGISTRATION_ENTER_EMAIL1=Enter your email address:
-GUEST_REGISTRATION_ENTER_EMAIL2=Repeat your email address:
-GUEST_REGISTRATION_ENTER_PASSWORD1=Enter a password:
-GUEST_REGISTRATION_ENTER_PASSWORD2=Repeat your password:
+GUEST_REGISTRATION_ENTER_EMAIL=Enter your email address:
+GUEST_REGISTRATION_ENTER_EMAIL_REPEAT=Repeat your email address:
+GUEST_REGISTRATION_ENTER_PASSWORD=Enter a password:
+GUEST_REGISTRATION_ENTER_PASSWORD_REPEAT=Repeat your password:
 BUTTON_FINISH_REGISTRATION=Register
 PRIVACY_TERMS_LEGEND_TITLE=Please read and accept terms and privacy policy.
 PRIVACY_TERMS_LEGEND=Terms & privacy policy:
@@ -325,8 +325,8 @@ ADMIN_LIST_MOBILE_PROVIDER_DIAL_PREFIX=Dial prefix:
 ADMIN_LIST_MOBILE_PROVIDER_COUNTRY=Country:
 ADMIN_LIST_MOBILE_PROVIDER_ENTRY_CREATED=Created:
 ADMIN_LINK_EDIT_DELETE_MOBILE_PROVIDER_TITLE=Edit or delete mobile provider
-ADMIN_USER_DATA_ENTER_PASSWORD1=Enter password:
-ADMIN_USER_DATA_ENTER_PASSWORD2=Repeat password:
+ADMIN_USER_DATA_ENTER_PASSWORD=Enter password:
+ADMIN_USER_DATA_ENTER_PASSWORD_REPEAT=Repeat password:
 ADMIN_LIST_USER_ID=User id:
 ADMIN_LIST_USER_NAME=User name:
 ADMIN_LIST_USER_GENDER=Gender:
diff --git a/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl b/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl
index d84b063f..c67198e3 100644
--- a/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl
+++ b/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl
@@ -28,11 +28,11 @@
 
 				<div class="table_row">
 					<div class="table_left">
-						<h:outputLabel for="password1" value="#{msg.ADMIN_USER_DATA_ENTER_PASSWORD1}" />
+						<h:outputLabel for="userPassword" value="#{msg.ADMIN_USER_DATA_ENTER_PASSWORD}" />
 					</div>
 
 					<div class="table_right">
-						<h:inputSecret styleClass="input" id="password1" size="10" maxlength="255" value="#{adminUserController.userPassword}" />
+						<h:inputSecret styleClass="input" id="userPassword" size="10" maxlength="255" value="#{adminUserController.userPassword}" />
 					</div>
 
 					<div class="clear"></div>
@@ -40,11 +40,11 @@
 
 				<div class="table_row">
 					<div class="table_left">
-						<h:outputLabel for="password2" value="#{msg.ADMIN_USER_DATA_ENTER_PASSWORD2}" />
+						<h:outputLabel for="userPasswordRepeat" value="#{msg.ADMIN_USER_DATA_ENTER_PASSWORD_REPEAT}" />
 					</div>
 
 					<div class="table_right">
-						<h:inputSecret styleClass="input" id="password2" size="10" maxlength="255" value="#{adminUserController.userPasswordRepeat}" />
+						<h:inputSecret styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{adminUserController.userPasswordRepeat}" />
 					</div>
 
 					<div class="clear"></div>
diff --git a/web/WEB-INF/templates/guest/guest_registration_form.tpl b/web/WEB-INF/templates/guest/guest_registration_form.tpl
index 73e5c5a0..10114a5d 100644
--- a/web/WEB-INF/templates/guest/guest_registration_form.tpl
+++ b/web/WEB-INF/templates/guest/guest_registration_form.tpl
@@ -58,11 +58,11 @@
 
 					<div class="table_row">
 						<div class="table_left">
-							<h:outputLabel for="password1" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD1}" />
+							<h:outputLabel for="userPassword" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD}" />
 						</div>
 
 						<div class="table_right">
-							<h:inputSecret styleClass="input" id="password1" size="10" maxlength="255" value="#{userController.userPassword}" required="true" />
+							<h:inputSecret styleClass="input" id="userPassword" size="10" maxlength="255" value="#{userController.userPassword}" required="true" />
 						</div>
 
 						<div class="clear"></div>
@@ -70,11 +70,11 @@
 
 					<div class="table_row">
 						<div class="table_left">
-							<h:outputLabel for="password2" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD2}" />
+							<h:outputLabel for="userPasswordRepeat" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD_REPEAT}" />
 						</div>
 
 						<div class="table_right">
-							<h:inputSecret styleClass="input" id="password2" size="10" maxlength="255" value="#{userController.userPasswordRepeat}" required="true" />
+							<h:inputSecret styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{userController.userPasswordRepeat}" required="true" />
 						</div>
 
 						<div class="clear"></div>
diff --git a/web/user/login_change_password.xhtml b/web/user/login_change_password.xhtml
index cf7520ea..aef02c12 100644
--- a/web/user/login_change_password.xhtml
+++ b/web/user/login_change_password.xhtml
@@ -29,11 +29,11 @@
 
 								<div class="table_row">
 									<div class="table_left">
-										<h:outputLabel for="password1" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD1}" />
+										<h:outputLabel for="userPassword" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD}" />
 									</div>
 
 									<div class="table_right">
-										<h:inputSecret styleClass="input" id="password1" size="10" maxlength="255" value="#{userLoginController.userPassword}" required="true" />
+										<h:inputSecret styleClass="input" id="userPassword" size="10" maxlength="255" value="#{userLoginController.userPassword}" required="true" />
 									</div>
 
 									<div class="clear"></div>
@@ -41,11 +41,11 @@
 
 								<div class="table_row">
 									<div class="table_left">
-										<h:outputLabel for="password2" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD2}" />
+										<h:outputLabel for="userPasswordRepeat" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD_REPEAT}" />
 									</div>
 
 									<div class="table_right">
-										<h:inputSecret styleClass="input" id="password2" size="10" maxlength="255" value="#{userLoginController.userPasswordRepeat}" required="true" />
+										<h:inputSecret styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{userLoginController.userPasswordRepeat}" required="true" />
 									</div>
 
 									<div class="clear"></div>