Some JSF fiyxes:

- id "cellphoneLinks" removed as it happens in a loop
- sometimes user is null, then user.userContact cannot be accessed and any attempts cause a NPE
- new error message ERROR_PARAMETER_CELLPHONE_NUMBER_USER_NOT_SET added (and used)
- added div tags for better showing error messages

Signed-off-by: Roland Häder <roland@haeder.net>
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 86c84986f74afde6202f6891e036a0307d4a212a..db87bd4910bd02d7e77f308fb1d0de55fa2f680c 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -74,7 +74,19 @@ PERSONAL_DATA_LEGEND_TITLE=Bitte geben Sie Ihre Daten ein.
 PERSONAL_DATA_LEGEND=Bitte Ihre Daten eingeben:
 PAGE_TITLE_USER_LOGIN=Einloggen
 CONTENT_TITLE_USER_LOGIN=Zum Benutzerbereich einloggen:
+PAGE_TITLE_USER_LOST_PASSWORD=Passwort vergessen
+CONTENT_TITLE_USER_LOST_PASSWORD=Stellen Sie Ihr Passwort wieder her:
+GUEST_LOST_PASSWORD_TITLE=Sie haben Ihr Passwort vergessen?
+GUEST_LOST_PASSWORD_LEGEND_TITLE=Bitte Daten eingeben:
+GUEST_LOST_PASSWORD_LEGEND=Bitte Daten eingeben:
 ENTER_EMAIL_ADDRESS=Email-Adresse:
+GUEST_LOST_PASSWORD_NUMBER_OR_EMAIL=... oder ...
+PAGE_TITLE_USER_REGISTER=Anmeldung
+CONTENT_TITLE_USER_REGISTER=Anmelden zu JRecruiter:
+PAGE_TITLE_INDEX_TERMS=Allgemeine Gesch\u00e4ftsbedingungen
+CONTENT_TITLE_INDEX_TERMS=Allgemeine Gesch\u00e4ftsbedingungen
+PAGE_TITLE_INDEX_PRIVACY=Datenschutzbestimmungen
+CONTENT_TITLE_INDEX_PRIVACY=Datenschutzbestimmungen:
 ADMIN_MENU_MAIN_TITLE=Hauptauswahl
 ADMIN_MENU_LOGOUT_TITLE=Ausloggen
 LINK_ADMIN_INDEX_TITLE=Zur Willkommensseite
@@ -84,11 +96,23 @@ LINK_ADMIN_INDEX=Home
 LINK_ADMIN_LOGOUT=Ausloggen
 LINK_ADMIN_TO_WEBPAGE=Webseite aufrufen
 LINK_ADMIN_FOOTER_TO_WEBPAGE=Zur Webseite
+LINK_GUEST_IMPRINT=Impressum
+LINK_GUEST_TERMS=AGBs
+LINK_GUEST_PRIVACY=Datenschutz
+LINK_GUEST_IMPRINT_TITLE=Impressum aufrufen
+LINK_GUEST_TERMS_TITLE=Allgemeine Gesch\u00e4ftsbedingungen
+LINK_GUEST_PRIVACY_TITLE=Datenschutzbestimmungen ansehen
 MENU_USER_TITLE=Benutzer
 ENTER_USER_NAME=Benutzernamen:
 BUTTON_USER_LOGIN=Einloggen
 BUTTON_CONTINUE_STEP_2=Weiter zu Schritt 2
+GUEST_REGISTRATION_ENTER_USER_NAME=Benutzernamen eingeben:
+GUEST_REGISTRATION_USER_NAME_NOTICE=Der Benutzername darf nur einmal vorkommen.
+LINK_GUEST_RESENT_CONFIRMATION_LINK=Nochmals den Best\u00e4tigungslink aussenden?
+GUEST_USER_REGISTRATION_COMPLETED=Die Anmeldung ist abgeschlossen und Ihr Account wartet auf Freischaltung. Es ist eine Email mit einem entsprechenden Best\u00e4tigungslink zu Ihnen unterwegs. Diesen m\u00fcssen Sie einmal anklicken oder in die Adresszeile des Browsers kopieren und dann aufrufen lassen. Danach ist Ihr Account freigegeben.
 PERSONAL_DATA_COUNTRY_CODE=L\u00e4ndercode:
+PAGE_TITLE_USER_REGISTER_DONE=Anmeldung abgeschlossen
+CONTENT_TITLE_USER_REGISTER_DONE=Die Anmeldung ist abgeschlossen:
 PAGE_TITLE_INDEX_RESEND_LINK=Best\u00e4tigungslink erneut aussenden
 CONTENT_TITLE_INDEX_RESEND_LINK=Best\u00e4tigungslink anfordern:
 LINK_GUEST_RESEND_LINK=Best\u00e4tigungslink

diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index 7a93ac04e251d0de95cd004467b0acb4145cb9dc..92beb2b1cd582037b15112ddbddcfd14c47e1f86 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -74,7 +74,19 @@ PERSONAL_DATA_LEGEND_TITLE=Please enter your data.
 PERSONAL_DATA_LEGEND=Please enter your data:
 PAGE_TITLE_USER_LOGIN=Login
 CONTENT_TITLE_USER_LOGIN=Login to user area:
+PAGE_TITLE_USER_LOST_PASSWORD=Lost password
+CONTENT_TITLE_USER_LOST_PASSWORD=Recover your password:
+GUEST_LOST_PASSWORD_TITLE=Have you forgotten your password?
+GUEST_LOST_PASSWORD_LEGEND_TITLE=Please enter your data:
+GUEST_LOST_PASSWORD_LEGEND=Please enter your data:
 ENTER_EMAIL_ADDRESS=Email address:
+GUEST_LOST_PASSWORD_NUMBER_OR_EMAIL=... or ...
+PAGE_TITLE_USER_REGISTER=Register
+CONTENT_TITLE_USER_REGISTER=Register at JRecruiter:
+PAGE_TITLE_INDEX_TERMS=Terms & Conditions
+CONTENT_TITLE_INDEX_TERMS=Terms & Conditions
+PAGE_TITLE_INDEX_PRIVACY=Privacy
+CONTENT_TITLE_INDEX_PRIVACY=Privacy:
 ADMIN_MENU_MAIN_TITLE=Main
 ADMIN_MENU_LOGOUT_TITLE=Logout
 LINK_ADMIN_INDEX_TITLE=To welcome page
@@ -84,11 +96,23 @@ LINK_ADMIN_INDEX=Home
 LINK_ADMIN_LOGOUT=Logout
 LINK_ADMIN_TO_WEBPAGE=Call website
 LINK_ADMIN_FOOTER_TO_WEBPAGE=To website
-MENU_USER_TITLE=Agent
-ENTER_USER_NAME=Agent name:
+LINK_GUEST_IMPRINT=Imprint
+LINK_GUEST_TERMS=T&C
+LINK_GUEST_PRIVACY=Privacy
+LINK_GUEST_IMPRINT_TITLE=Go to imprint page
+LINK_GUEST_TERMS_TITLE=View terms & conditions
+LINK_GUEST_PRIVACY_TITLE=View privacy statement
+MENU_USER_TITLE=User
+ENTER_USER_NAME=User name:
 BUTTON_USER_LOGIN=Login
 BUTTON_CONTINUE_STEP_2=Continue to step 2
+GUEST_REGISTRATION_ENTER_USER_NAME=Enter user name:
+GUEST_REGISTRATION_USER_NAME_NOTICE=The user name must only exist once.
+LINK_GUEST_RESENT_CONFIRMATION_LINK=Resend again the confirmation link?
+GUEST_USER_REGISTRATION_COMPLETED=The registration is completed and your account is pending confirmation. An email has been sent to you. There you will find a confirmation link which you have to click once or copy it into your browser's address bar and call it.
 PERSONAL_DATA_COUNTRY_CODE=Country code:
+PAGE_TITLE_USER_REGISTER_DONE=Registration completed
+CONTENT_TITLE_USER_REGISTER_DONE=Registration is completed:
 PAGE_TITLE_INDEX_RESEND_LINK=Resend confirmation link
 CONTENT_TITLE_INDEX_RESEND_LINK=Request confirmation link:
 LINK_GUEST_RESEND_LINK=Confirmation link
@@ -248,6 +272,9 @@ ADMIN_LIST_USER_CREATED=Registered:
 USER_ACCOUNT_STATUS_CONFIRMED=Confirmed
 USER_ACCOUNT_STATUS_UNCONFIRMED=Unconfirmed
 USER_ACCOUNT_STATUS_LOCKED=Locked
+USER_PROFILE_MODE_INVISIBLE=Invisible
+USER_PROFILE_MODE_MEMBERS=Only members
+USER_PROFILE_MODE_PUBLIC=Public
 ADMIN_LINK_SHOW_USER_TITLE=Show administrative user profile
 PAGE_TITLE_ADMIN_SHOW_USER=Show user profile
 CONTENT_TITLE_ADMIN_SHOW_USER=Show profile of a user:
@@ -307,7 +334,6 @@ PAGE_TITLE_ADMIN_LIST_CONTACT_CELLPHONE=List all cellphone entries
 PAGE_TITLE_ADMIN_SHOW_CONTACT_CELLPHONE=Show contact's cellphone entry
 CONTENT_TITLE_ADMIN_SHOW_CONTACT_CELLPHONE=Show contact's cellphone entry:
 PAGE_TITLE_ADMIN_UNLINK_CONTACT_CELLPHONE=Remove link contact-cellphone
-#@TODO Please fix German umlauts!
 CONTENT_TITLE_ADMIN_UNLINK_CONTACT_CELLPHONE=Remove link between contact-cellphone:
 ERROR_PARAMETER_PHONE_ID_NOT_SET=Error: Parameter 'phoneId' is not set.
 PAGE_TITLE_ADMIN_SHOW_MOBILE_PROVIDER=Show mobile provider