]> git.mxchange.org Git - pizzaservice-war.git/commitdiff
Please cherry-pick:
authorRoland Häder <roland@mxchange.org>
Thu, 20 Apr 2017 19:58:46 +0000 (21:58 +0200)
committerRoland Häder <roland@mxchange.org>
Thu, 20 Apr 2017 20:01:07 +0000 (22:01 +0200)
- 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

Signed-off-by: Roland Häder <roland@mxchange.org>
src/java/org/mxchange/localization/bundle_de_DE.properties
src/java/org/mxchange/localization/bundle_en_US.properties
web/WEB-INF/templates/guest/user/guest_registration_form.tpl
web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl
web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl

index 48f350f36494bd6db6f1c88b1e676b07ef999e87..772af2af18176090a733b45a8f9805a4319446a6 100644 (file)
@@ -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.
index 99e8ca5f5b5dee0ee7790759987a9aba1d7f4019..5695abbc8924455e94d9a041af73ff260ddd4d1f 100644 (file)
@@ -777,3 +777,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.
index 7ff19cc04cbf0cc011393de46f0433daa2810a5c..7c46749db9473cf7304cc0ed55cf0f9b01571f95 100644 (file)
@@ -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>
index 48fa8bcb98a20c8823480f8729611c61e616606d..aba8452c9e5d261380db4e7dc93ae146344babf3 100644 (file)
@@ -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>
index 8771db2366ebb50897df620e88b3c4c6be7bb57b..9a1dd99aa7841f2697504bd01e7e799d5e1e12dd 100644 (file)
@@ -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>