fixed German umlauts + removed TODO (not needed)

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 7e24534d4f758cc4b903cf07a0bb7be089808f70..ab68dd949ac84d9eefc8626637879c9b19b00891 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -162,7 +162,7 @@ LOGIN_CHOOSE_PERSONAL_DATA_EMAIL_PASSWORD_NOTICE=Sie k\u00f6nnen hier Ihre pers\
 LINK_LOGIN_CHANGE_PERSONAL_DATA=Pers\u00f6nliche Daten, wie Anschrift usw. \u00e4ndern
 LINK_LOGIN_CHANGE_PERSONAL_DATA_TITLE=\u00c4ndern Sie hier Ihre pers\u00f6nlichen Daten, wie Anschrift, Telefonnummer und so weiter.
 LINK_LOGIN_CHANGE_EMAIL_ADDRESS=Ihre Email-Adresse \u00e4ndern
-LINK_LOGIN_CHANGE_EMAIL_ADDRESS_TITLE=\u00c4ndern Sie hier Ihre Email-Adresse. Dies ben\u00f6tigt eine weitere Best\u00e4tigung und kann auch zur\u00fcckg\u00e4ngig gemacht werden.
+LINK_LOGIN_CHANGE_EMAIL_ADDRESS_TITLE=\u00c4ndern Sie hier Ihre Email-Adresse. Dies ben\u00f6tigt eine weitere Best\u00e4tigung und kann jederzeit zur\u00fcckgaengig gemacht werden.
 LINK_LOGIN_CHANGE_PASSWORD=Ihr Passwort \u00e4ndern
 LINK_LOGIN_CHANGE_PASSWORD_TITLE=\u00c4ndern Sie hier Ihr Passwort, falls Sie ein anderes m\u00f6chten.
 LOGIN_ENTER_CURRENT_PASSWORD_CONFIRMATION_LEGEND=Bitte derzeitiges Passwort zur Best\u00e4tigung eingeben:
@@ -176,19 +176,14 @@ MESSAGE_BOX_PARAMETER_MESSAGE_EMPTY=Fehler: Parameter "message" nicht gesetzt.
 LOGIN_MESSAGE_DATA_SAVED=Daten wurden gespeichert.
 PAGE_TITLE_LOGIN_DATA_SAVED=Ihre Daten wurden gespeichert
 CONTENT_TITLE_LOGIN_DATA_SAVED=Daten wurden gespeichert:
-#TODO: Please fix German umlaut!
-LOGIN_CHANGE_EMAIL_ADDRESS_TITLE=Aendern Sie Ihre Email-Adresse:
-#TODO: Please fix German umlaut!
-LOGIN_CHANGE_EMAIL_LEGEND=Email-Adresse aendern:
-#TODO: Please fix German umlaut!
-LOGIN_CHANGE_EMAIL_LEGEND_TITLE=Hier koennen Sie Ihre Email-Adresse aendern. Dazu muessen Sie diese zweimal eingeben und die neue Adresse bestaetigen.
+LOGIN_CHANGE_EMAIL_ADDRESS_TITLE=\u00c4ndern Sie Ihre Email-Adresse:
+LOGIN_CHANGE_EMAIL_LEGEND=Email-Adresse \u00e4ndern:
+LOGIN_CHANGE_EMAIL_LEGEND_TITLE=Hier k\u00f6nnen Sie Ihre Email-Adresse \u00e4ndern. Dazu m\u00fcssen Sie diese zweimal eingeben und die neue Adresse best\u00e4tigen.
 LOGIN_CHANGE_EMAIL_OLD_ADDRESS=Ihre derzeitige Email-Adresse:
 LOGIN_CHANGE_EMAIL_ENTER_EMAIL=Neue Email-Adresse eingeben:
 LOGIN_CHANGE_EMAIL_ENTER_EMAIL_REPEAT=Neue Email-Adresse wiederholen:
-#TODO: Please fix German umlaut!
-BUTTON_CHANGE_EMAIL_ADDRESS=Email-Adresse aendern
-#TODO: Please fix German umlaut!
-PAGE_TITLE_LOGIN_CHANGE_EMAIL_ADDRESS=Aendern Ihrer Email-Adresse
+BUTTON_CHANGE_EMAIL_ADDRESS=Email-Adresse \u00e4ndern
+PAGE_TITLE_LOGIN_CHANGE_EMAIL_ADDRESS=\u00c4ndern Ihrer Email-Adresse
 CONTENT_TITLE_LOGIN_CHANGE_EMAIL_ADDRESS=Neue Email-Adresse eingeben:
 #TODO: Please fix German umlaut!
 PAGE_TITLE_LOGIN_CHANGE_PERSONAL_DATA=Ihre persoenlichen Daten aendern

diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index ebb59280180a1ef604b072fd740b8de9124c210d..edcecd1a93967cb3309ab5020bf1c02b5c3ff01f 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -468,3 +468,21 @@ GUEST_RESEND_LINK_ENTER_EMAIL_ADDRESS=Please enter email address you have used o
 GUEST_RESEND_CONFIRMATION_LINK_NOTICE=The old confirmation link won't work after this. Please always use the one from newer email.
 RESEND_CONFIRMATION_LINK_LEGEND=Enter email address:
 RESEND_CONFIRMATION_LINK_LEGEND_TITLE=Please enter your email address you have used on registration.
+LINK_LOGIN_CHANGE_EMAIL_ADDRESS_TITLE=Change your email address. This requires another confirmation and can be undone.
+LOGIN_ENTER_CURRENT_PASSWORD_CONFIRM=Current password:
+LOGIN_ENTER_CURRENT_PASSWORD_CONFIRMATION_LEGEND_TITLE=Please enter your current password for confirmation of the change.
+LOGIN_EDIT_USER_DATA_TITLE=What do you want to change?
+LOGIN_CHOOSE_PERSONAL_DATA_EMAIL_PASSWORD_NOTICE=You can change your personal data, your email address and your password for login here.
+BUTTON_CHANGE_PERSONAL_DATA=Change personal data
+LINK_LOGIN_CHANGE_PERSONAL_DATA_TITLE=Change your personal data like address, phone number and so on.
+LINK_LOGIN_CHANGE_PASSWORD=Change your password
+LINK_LOGIN_CHANGE_PERSONAL_DATA=Change personal data such as your address.
+LINK_GUEST_LOGIN_LOST_PASSWORD=Forgot your password?
+SELECTION_NOTICE_USER_PROFILE_MODE_INVISIBLE=If you choose "Invisible", nobody can share address books with you.
+SELECTION_NOTICE_USER_PROFILE_MODE_MEMBERS=If you choose "Only members", other users can start sharing address books with you.
+SELECTION_NOTICE_USER_PROFILE_MODE_PUBLIC=If you choose "All" the whole Internet can view your profile, including bots.
+LOGIN_ENTER_CURRENT_PASSWORD_CONFIRMATION_LEGEND=Your current password for confirmation:
+LOGIN_CHANGE_PERSONAL_DATA_TITLE=Change personal data:
+LINK_LOGIN_CHANGE_PASSWORD_TITLE=Change here your password, if you want another one.
+LINK_LOGIN_CHANGE_EMAIL_ADDRESS=Change your email address
+LINK_TITLE_GUEST_LOGIN_LOST_PASSWORD=Restore your password

diff --git a/src/java/org/mxchange/pizzaapplication/beans/profile/PizzaUserProfileWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/profile/PizzaUserProfileWebRequestBean.java
index 85b82e56452038055f9bb07cf30fa2be453f8d1c..189d8c0f10c9a8c65c7424c3571cde5c17191b83 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/profile/PizzaUserProfileWebRequestBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/profile/PizzaUserProfileWebRequestBean.java
@@ -110,7 +110,6 @@ public class PizzaUserProfileWebRequestBean extends BasePizzaController implemen
                ProfileMode profileMode = user.getUserProfileMode();
 
                // Check all conditions (except for admin)
-               // TODO: Add admin role somehow?
                return ((profileMode.equals(ProfileMode.PUBLIC)) ||
                                (this.userLoginController.isUserLoggedIn()) && (profileMode.equals(ProfileMode.MEMBERS)));
        }