From 93160e62a7289276eb13f01d8678442be3a1bbb8 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Thu, 20 Apr 2017 21:58:46 +0200
Subject: [PATCH] Please cherry-pick: - passwords for account creation are now
 optional as random passwords can be   generated - added required-message for
 email-address and user name to not have such   "strange" messages for the
 user
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 .../org/mxchange/localization/bundle_de_DE.properties  |  2 ++
 .../org/mxchange/localization/bundle_en_US.properties  |  1 +
 .../templates/guest/user/guest_registration_form.tpl   | 10 +++++-----
 .../guest/user/register/guest_form_register_page1.tpl  |  2 +-
 .../guest/user/register/guest_form_register_single.tpl |  6 +++---
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index f65cb906..c0b47a08 100644
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -777,3 +777,5 @@ USER_ENTER_NEW_PASSWORD_REPEAT=Wiederholen:
 BUTTON_USER_CHANGE_PASSWORD=Passwort \u00e4ndern
 ADMIN_LINK_SHOW_CONTACT_DATA=Kontaktdaten anzeigen
 ERROR_USER_PASSWORD_TO_WEAK=Das eingegebene Passwort ist zu schwach. Bitte geben Sie Bustaben, Zahlen und Sonderzeichen ein, um ein sicheres Passwort zu erstellen.
+#@TODO Please fix German umlauts!
+GUEST_REGISTRATION_USER_NAME_NOT_ENTERED=Bitte geben Sie einen Benutzernamen ein. Dieser wird auf Verfuegbarkeit hin getestet.
diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index 87da744b..ec37daf9 100644
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -776,3 +776,4 @@ USER_ENTER_NEW_PASSWORD_REPEAT=Repeat:
 BUTTON_USER_CHANGE_PASSWORD=Change password
 ADMIN_LINK_SHOW_CONTACT_DATA=Show contact data
 ERROR_USER_PASSWORD_TO_WEAK=Your entered password is to weak. Please enter letters, numbers and special characters to create a secure password.
+GUEST_REGISTRATION_USER_NAME_NOT_ENTERED=Please enter a user name. The entered name is being checked for availability.
diff --git a/web/WEB-INF/templates/guest/user/guest_registration_form.tpl b/web/WEB-INF/templates/guest/user/guest_registration_form.tpl
index 7ff19cc0..7c46749d 100644
--- a/web/WEB-INF/templates/guest/user/guest_registration_form.tpl
+++ b/web/WEB-INF/templates/guest/user/guest_registration_form.tpl
@@ -23,7 +23,7 @@
 						</div>
 
 						<div class="table_right">
-							<h:inputText styleClass="input" id="userName" size="20" maxlength="255" value="#{userController.userName}" required="true" />
+							<h:inputText styleClass="input" id="userName" size="20" maxlength="255" value="#{userController.userName}" required="true" requiredMessage="#{msg.GUEST_REGISTRATION_USER_NAME_NOT_ENTERED}" />
 						</div>
 
 						<div class="clear"></div>
@@ -39,7 +39,7 @@
 						</div>
 
 						<div class="table_right">
-							<h:inputText styleClass="input" id="emailAddress" size="20" maxlength="255" value="#{contactController.emailAddress}" required="true" />
+							<h:inputText styleClass="input" id="emailAddress" size="20" maxlength="255" value="#{contactController.emailAddress}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_NOT_ENTERED}" />
 						</div>
 
 						<div class="clear"></div>
@@ -55,7 +55,7 @@
 						</div>
 
 						<div class="table_right">
-							<h:inputText styleClass="input" id="emailAddressRepeat" size="20" maxlength="255" value="#{contactController.emailAddressRepeat}" required="true" />
+							<h:inputText styleClass="input" id="emailAddressRepeat" size="20" maxlength="255" value="#{contactController.emailAddressRepeat}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_REPEAT_NOT_ENTERED}" />
 						</div>
 
 						<div class="clear"></div>
@@ -73,7 +73,7 @@
 						</div>
 
 						<div class="table_right">
-							<h:inputSecret styleClass="input" id="userPassword" size="10" maxlength="255" value="#{userController.userPassword}" required="true" />
+							<h:inputSecret styleClass="input" id="userPassword" size="10" maxlength="255" value="#{userController.userPassword}" />
 						</div>
 
 						<div class="clear"></div>
@@ -85,7 +85,7 @@
 						</div>
 
 						<div class="table_right">
-							<h:inputSecret styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{userController.userPasswordRepeat}" required="true" />
+							<h:inputSecret styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{userController.userPasswordRepeat}" />
 						</div>
 
 						<div class="clear"></div>
diff --git a/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl b/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl
index 48fa8bcb..aba8452c 100644
--- a/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl
+++ b/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl
@@ -24,7 +24,7 @@
 							</div>
 
 							<div class="table_right_medium">
-								<h:inputText styleClass="input" id="userName" size="20" maxlength="255" value="#{userController.userName}" required="true" />
+								<h:inputText styleClass="input" id="userName" size="20" maxlength="255" value="#{userController.userName}" required="true" requiredMessage="#{msg.GUEST_REGISTRATION_USER_NAME_NOT_ENTERED}" />
 							</div>
 
 							<div class="clear"></div>
diff --git a/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl b/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl
index 8771db23..9a1dd99a 100644
--- a/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl
+++ b/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl
@@ -26,7 +26,7 @@
 							</div>
 
 							<div class="table_right">
-								<h:inputText styleClass="input" id="userName" size="20" maxlength="255" value="#{userController.userName}" required="true" />
+								<h:inputText styleClass="input" id="userName" size="20" maxlength="255" value="#{userController.userName}" required="true" requiredMessage="#{msg.GUEST_REGISTRATION_USER_NAME_NOT_ENTERED}" />
 							</div>
 
 							<div class="clear"></div>
@@ -48,7 +48,7 @@
 							</div>
 
 							<div class="table_right">
-								<h:inputSecret styleClass="input" id="userPassword" size="10" maxlength="255" value="#{userController.userPassword}" required="true" />
+								<h:inputSecret styleClass="input" id="userPassword" size="10" maxlength="255" value="#{userController.userPassword}" />
 							</div>
 
 							<div class="clear"></div>
@@ -64,7 +64,7 @@
 							</div>
 
 							<div class="table_right">
-								<h:inputSecret styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{userController.userPasswordRepeat}" required="true" />
+								<h:inputSecret styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{userController.userPasswordRepeat}" />
 							</div>
 
 							<div class="clear"></div>
-- 
2.39.5