Please cherry-pick:

- rendered-attribute allows expression code, so optionally required password
  fields can be done on JSF side and not just on bean side.

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 c0acff063f7c8f47c0747c91c7a8134bb1c7e6c5..ba8070c6731170e816a75d0cbb53f61b64ee3292 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -797,31 +797,6 @@ CONTENT_TITLE_ADMIN_LIST_CONTACT_CELLPHONE=Mobiltelefonnummern auflisten:
 LOGIN_ENTER_CURRENT_PASSWORD=Aktuelles Passwort eingeben:
 #@TODO Please fix German umlauts!
 GUEST_REGISTRATION_USER_NAME_NOT_ENTERED=Bitte geben Sie einen Benutzernamen ein. Dieser wird auf Verfuegbarkeit hin getestet.
-<<<<<<< HEAD
-=======
-#@TODO Please fix German umlauts!
-PAGE_TITLE_LOGIN_FINANCIAL_OVERVIEW=Finanzen-Uebersicht
-#@TODO Please fix German umlauts!
-SUB_TITLE_LOGIN_FINANCIAL_OVERVIEW=Uebersicht Ihrer Finanzen:
-#@TODO Please fix German umlauts!
-PAGE_TITLE_LOGIN_FINANCIAL_ADD_RECEIPT=Rechnung hinzufuegen/erfassen
-SUB_TITLE_LOGIN_FINANCIAL_ADD_RECEIPT=Weitere Rechnung erfassen:
-#@TODO Please fix German umlauts!
-PAGE_TITLE_LOGIN_FINANCIAL_ADD_INCOME=Neue Einkommensart hinzufuegen
-#@TODO Please fix German umlauts!
-SUB_TITLE_LOGIN_FINANCIAL_ADD_INCOME=Weitere Einkommensart hinzufuegen:
-LOGIN_FINANCIAL_ADD_INCOME_FORM_TITLE=Daten einer Einkommensart erfassen:
-LOGIN_FINANCIAL_INCOME_INTERVAL=Einkommensinterval:
-#@TODO Please fix German umlauts!
-FIELD_FINANCIAL_INCOME_REQUIRED=Feld "Einkommensinterval" muss ausgewaehlt werden.
-#@TODO Please fix German umlauts!
-BUTTON_LOGIN_FINCIAL_ADD_INCOME=Einkommensart hinzufuegen
-LOGIN_FINANCIAL_INCOME_SINGLE_VALUE=Einkommensbetrag:
-#@TODO Please fix German umlauts!
-FIELD_FINANCIAL_INCOME_SINGLE_VALUE_REQUIRED=Feld "Einkommensbetrag" bitte ausfuellen.
-LOGIN_FINANCIAL_INCOME_TITLE=Bezeichnung der Einkommensart:
-#@TODO Please fix German umlauts!
-FIELD_FINANCIAL_INCOME_TITLE_REQUIRED=Feld "Title" muss ausgefuellt werden.
 #@TODO Please fix German umlauts!
 ERROR_USER_PASSWORD_EMPTY=Sie muessen ein Passwort eingeben.
 #@TODO Please fix German umlauts!
@@ -829,4 +804,6 @@ ERROR_USER_PASSWORD_REPEAT_EMPTY=Sie muessen das eingegebene Passwort wiederhole
 GUEST_REGISTRATION_USER_PASSWORDS_EMPTY_ALLOWED=Lassen Sie beide Passwortfelder leer, wird Ihnen ein Passwort per Zufall generiert.
 #@TODO Please fix German umlauts!
 GUEST_REGISTRATION_USER_PASSWORDS_EMPTY_NOT_ALLOWED=Sie muessen selbst ein Passwort vergeben. Bitte geben Sie dies zur Bestaetigung zweimal ein.
->>>>>>> 6ed28b1... Please cherry-pick:
+GUEST_REGISTRATION_PASSWORD_NOT_ENTERED=Bitte geben Sie ein Passwort ein. Dies muss den Sicherheitsregeln entsprechen.
+#@TODO Please fix German umlauts!
+GUEST_REGISTRATION_PASSWORD_REPEAT_NOT_ENTERED=Bitte wiederholen Sie das eingegebene Passwort. Dies wird zur Bestaetigung benoetigt.

diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index bc535b641a309994fc04b1683e055a8806d2174e..79cc129c656ab58d2848181f2ddc55e0de6e5c46 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -796,24 +796,9 @@ ERROR_ADMIN_BEAN_MOBILE_NUMBER_NOT_SET=Error: Instance 'cellPhone' in administra
 CONTENT_TITLE_ADMIN_LIST_CONTACT_CELLPHONE=List mobile phone numbers:
 LOGIN_ENTER_CURRENT_PASSWORD=Enter current password:
 GUEST_REGISTRATION_USER_NAME_NOT_ENTERED=Please enter a user name. The entered name is being checked for availability.
-<<<<<<< HEAD
-=======
-PAGE_TITLE_LOGIN_FINANCIAL_OVERVIEW=Financials Overview
-SUB_TITLE_LOGIN_FINANCIAL_OVERVIEW=Overview of your financials:
-PAGE_TITLE_LOGIN_FINANCIAL_ADD_RECEIPT=Add receipt
-SUB_TITLE_LOGIN_FINANCIAL_ADD_RECEIPT=Add new receipt:
-PAGE_TITLE_LOGIN_FINANCIAL_ADD_INCOME=Add new income type
-SUB_TITLE_LOGIN_FINANCIAL_ADD_INCOME=Add new income type:
-LOGIN_FINANCIAL_ADD_INCOME_FORM_TITLE=Enter all data of one income type:
-LOGIN_FINANCIAL_INCOME_INTERVAL=Income interval:
-FIELD_FINANCIAL_INCOME_REQUIRED=Field "Income interval" must be selected.
-BUTTON_LOGIN_FINCIAL_ADD_INCOME=Add income type
-LOGIN_FINANCIAL_INCOME_SINGLE_VALUE=Income value:
-FIELD_FINANCIAL_INCOME_SINGLE_VALUE_REQUIRED=Field "Income value" must be filled out.
-LOGIN_FINANCIAL_INCOME_TITLE=Title of income type:
-FIELD_FINANCIAL_INCOME_TITLE_REQUIRED=Field "Title" must be filled out.
 ERROR_USER_PASSWORD_EMPTY=You have to enter a password.
 ERROR_USER_PASSWORD_REPEAT_EMPTY=You have to repeat the entered password.
 GUEST_REGISTRATION_USER_PASSWORDS_EMPTY_ALLOWED=If you left both password fields empty, a random password will generated for you.
 GUEST_REGISTRATION_USER_PASSWORDS_EMPTY_NOT_ALLOWED=You have to enter an own password. Please enter it twice for confirmation.
->>>>>>> 6ed28b1... Please cherry-pick:
+GUEST_REGISTRATION_PASSWORD_NOT_ENTERED=Please enter a password. This must match with security rules.
+GUEST_REGISTRATION_PASSWORD_REPEAT_NOT_ENTERED=Please repeat the entered password. This done to confirm the password.

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 df920e5064711a407c24bf17825927c82b0acaaf..97af2dbae5cbca485903cd8adef778ff7b946322 100644 (file)
--- 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
@@ -46,7 +46,7 @@
                                                        </div>
 
                                                        <div class="table_right_medium">
-                                                               <h:inputSecret styleClass="input" id="userPassword" size="10" maxlength="255" value="#{userController.userPassword}" />
+                                                               <h:inputSecret styleClass="input" id="userPassword" size="10" maxlength="255" value="#{userController.userPassword}" required="#{not featureController.isFeatureEnabled('allow_user_registration_empty_password')}" requiredMessage="#{msg.GUEST_REGISTRATION_PASSWORD_NOT_ENTERED}" />
                                                        </div>
 
                                                        <div class="clear"></div>
@@ -62,7 +62,7 @@
                                                        </div>
 
                                                        <div class="table_right_medium">
-                                                               <h:inputSecret styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{userController.userPasswordRepeat}" />
+                                                               <h:inputSecret styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{userController.userPasswordRepeat}" required="#{not featureController.isFeatureEnabled('allow_user_registration_empty_password')}" requiredMessage="#{msg.GUEST_REGISTRATION_PASSWORD_REPEAT_NOT_ENTERED}" />
                                                        </div>
 
                                                        <div class="clear"></div>