password1 and password2 is not clear enough, better <role>Password and <role>Password...

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 f3397094a62921498ec0bccdc54afbfc60999843..1c4dac4bd3cdd5d8df88621e8ca10d63517d6af7 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -41,6 +41,24 @@ LINK_CLOSE_SESSION=Sitzung beenden
 MENU_HOME_TITLE=Home
 LINK_GUEST_LOGIN_TITLE=Login zum Agentenbereich:
 LINK_GUEST_LOGIN=Einloggen
+LINK_GUEST_REGISTER_TITLE=Anmeldung als neuer Benutzer
+LINK_GUEST_REGISTER=Neuer Benutzer
+LINK_GUEST_PASSWORD_TITLE=Neues Passwort erstellen
+LINK_GUEST_PASSWORD=Passwort vergessen?
+PAGE_TITLE_INDEX_IMPRINT=Impressum
+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_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:
+PRIVACY_POLICY_NOT_ACCEPTED_MESSAGE=Bitte den Datenschutzbestimmungen zustimmen.
+TERMS_NOT_ACCEPTED_MESSAGE=Bitte den AGBs zustimmen.
 PERSONAL_DATA_MINIMUM_NOTICE=Bitte geben Sie mindestens Name, Anschrift und Telefonnummer an.
 PERSONAL_DATA_GENDER=Anrede:
 PERSONAL_DATA_FIRST_NAME=Vorname:
@@ -242,8 +260,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 4e27c6791523857f510a461a6e79b90ca964aecb..ad7b1b68586546307fc3c9c10b4a51915da35227 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -41,6 +41,24 @@ LINK_CLOSE_SESSION=Invalidate session
 MENU_HOME_TITLE=Home
 LINK_GUEST_LOGIN_TITLE=Login for existing users
 LINK_GUEST_LOGIN=Login
+LINK_GUEST_REGISTER_TITLE=Registration for new user
+LINK_GUEST_REGISTER=Registration
+LINK_GUEST_PASSWORD_TITLE=Create new password
+LINK_GUEST_PASSWORD=Lost password?
+PAGE_TITLE_INDEX_IMPRINT=Imprint
+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_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:
+PRIVACY_POLICY_NOT_ACCEPTED_MESSAGE=Please accept our privacy policy.
+TERMS_NOT_ACCEPTED_MESSAGE=Please accept Terms&Conditions.
 PERSONAL_DATA_MINIMUM_NOTICE=Please enter at least your name, address and phone number.
 PERSONAL_DATA_GENDER=Salutation:
 PERSONAL_DATA_FIRST_NAME=First name:
@@ -213,8 +231,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 d84b063f0631805d87aa07a6d941e39efe50d7af..c67198e360e973e1fe052416fb62b0f5a6d6cdad 100644 (file)
--- 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 dc9bd8b844f0daf529f23814f06dc794aa0464d7..494484c77c00eff720eb4b09510abcb750625c23 100644 (file)
--- 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 cf7520ea36ebf42405bc62ed3bdba156a1f58011..aef02c12cff9ce4342062f581287b3061e85c1b5 100644 (file)
--- 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>