From 326017ea4f1347eff164bca6f33e04404a502b2a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 6 Jul 2017 00:05:13 +0200 Subject: [PATCH] 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. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../localization/bundle_de_DE.properties | 26 +++---------------- .../localization/bundle_en_US.properties | 16 ++---------- .../register/guest_form_register_page1.tpl | 4 +-- 3 files changed, 7 insertions(+), 39 deletions(-) diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index a0e64af5..0a819444 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -832,32 +832,12 @@ ERROR_USER_PASSWORD_TO_WEAK=Das eingegebene Passwort ist zu schwach. Bitte geben #@TODO Please fix German umlauts! GUEST_REGISTRATION_USER_NAME_NOT_ENTERED=Bitte geben Sie einen Benutzernamen ein. Dieser wird auf Verfuegbarkeit hin getestet. #@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! ERROR_USER_PASSWORD_REPEAT_EMPTY=Sie muessen das eingegebene Passwort wiederholen. 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. +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 d42c7e11..12c91dd8 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -827,21 +827,9 @@ 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. -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. +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 df920e50..97af2dba 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 @@ -46,7 +46,7 @@
- +
@@ -62,7 +62,7 @@
- +
-- 2.39.5