From fed99bf9db5908d570cf60b16c8d2c0bdbe26c27 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 29 Apr 2016 15:16:16 +0200 Subject: [PATCH] Continued with customer: - editing customer data is "basicly finished" - removed i18n key as this was not following convention (and redundant) - a user entry was not found (for users more clear) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../org/mxchange/localization/bundle_de_DE.properties | 9 ++++----- .../org/mxchange/localization/bundle_en_US.properties | 4 ++-- web/WEB-INF/templates/generic/user_profile_link.tpl | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index b79eb70a..b0665d47 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -173,10 +173,8 @@ ERROR_USER_INSTANCE_NOT_SET=Fehler: Benutzer-Instanz nicht gesetzt. LOGIN_ADDRESSBOOK_NOT_SET=Fehler: Adressbuch-Instanz nicht gesetzt. LINK_GUEST_LOGIN_LOST_PASSWORD=Passwort vergessen? LINK_TITLE_GUEST_LOGIN_LOST_PASSWORD=Passwort wiederherstellen -#TODO: Please fix German umlaut! -TABLE_HEADER_ERROR_USER_NOT_LOGGED_IN=Sie muessen angemeldet sein -#TODO: Please fix German umlaut! -USER_IS_NOT_LOGGED_IN_FULL=Damit diese Funktion nutzen koennen, muessen Sie sich anmelden und in Ihren Account eingeloggt sein. +TABLE_HEADER_ERROR_USER_NOT_LOGGED_IN=Sie m\u00fcssen angemeldet sein +USER_IS_NOT_LOGGED_IN_FULL=Damit diese Funktion nutzen k\u00f6nnen, m\u00fcssen Sie sich anmelden und in Ihren Account eingeloggt sein. #TODO: Please fix German umlaut! LOGIN_EDIT_USER_DATA_TITLE=Was moechten Sie aendern? #TODO: Please fix German umlaut! @@ -350,7 +348,7 @@ ADMIN_LINK_SHOW_USER_TITLE=Administratives Benutzerprofil anzeigen PAGE_TITLE_ADMIN_SHOW_USER=Benutzerprofil anzeigen CONTENT_TITLE_ADMIN_SHOW_USER=Profil eines Benutzers anzeigen: ERROR_PARAMETER_USER_ID_NOT_SET=Fehler: Benutzer-Id nicht gesetzt (Parameter: userId). -ERROR_USER_ID_NOT_FOUND=Fehler: Benutzer-Id nicht gefunden. +ERROR_USER_ID_NOT_FOUND=Fehler: Benutzereintrag nicht gefunden. ADMIN_TABLE_SUMMARY_SHOW_USER=Zeigt ein Benutzerprofil f\u00fcr administrative Zwecke an. ADMIN_HEADER_SHOW_USER=Benutzer {0} (Nummer {1}): ADMIN_USER_ID=Benutzer-Id: @@ -458,3 +456,4 @@ ADMIN_DELETE_CONTACT_TITLE=Kontaktdaten unwiederruflich l\u00f6schen BUTTON_ADMIN_DELETE_CONTACT=Kontaktdaten l\u00f6schen ADMIN_DELETE_CONTACT_NOTICE=Sie wollen Kontaktdaten l\u00f6schen. Diese k\u00f6nnten noch evtl. mit anderen Daten verkn\u00fcft sein, was zu Fehlern f\u00fchrt. Bitte l\u00f6schen Sie nur, wenn Sie sich absolut sicher sind, dass keine fremden Daten auf diesen Datensatz mehr verweisen. ADMIN_CONTACT_PERSONAL_DATA_MINIMUM_NOTICE=Bitte geben Sie mindestens Anrede, Vor- und Nachnamen ein. +ERROR_CUSTOMER_ID_NOT_FOUND=Fehler: Kundeneintrag nicht gefunden. diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index a9995905..bde0dcc2 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -170,7 +170,6 @@ LOGIN_NO_PASSWORD_MESSAGE=You have entered no password. LOGIN_NO_USER_NAME_MESSAGE=You have entered no user name. USER_NOT_LOGGED_IN=You are not signed in. LOGIN_OWN_PROFILE_INVISIBLE=Your profile is set to "invisible". -ERROR_USER_INSTANCE_NOT_SET=Error: User instance not set. LOGIN_ADDRESSBOOK_NOT_SET=Error: Address book instance not set. LINK_GUEST_LOGIN_LOST_PASSWORD=Forgot your password? LINK_TITLE_GUEST_LOGIN_LOST_PASSWORD=Restore your password @@ -329,7 +328,7 @@ 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: ERROR_PARAMETER_USER_ID_NOT_SET=Error: User id not set (parameter userId). -ERROR_USER_ID_NOT_FOUND=Error: User id not found. +ERROR_USER_ID_NOT_FOUND=Error: User entry not found. ADMIN_TABLE_SUMMARY_SHOW_USER=Shows a single user profile for administrative purposes. ADMIN_HEADER_SHOW_USER=User {0} (id {1}): ADMIN_USER_ID=User id: @@ -436,3 +435,4 @@ ADMIN_DELETE_CONTACT_TITLE=Delete contact data unreverseable BUTTON_ADMIN_DELETE_CONTACT=Delete contact data ADMIN_DELETE_CONTACT_NOTICE=You want to delete contact data. This data could be still linked with other data which could lead to errors. Please delete only, if you are sure that no foreign data links to this record. ADMIN_CONTACT_PERSONAL_DATA_MINIMUM_NOTICE=Please enter at least gender, first name and family name. +ERROR_CUSTOMER_ID_NOT_FOUND=Error: Customer entry not found. diff --git a/web/WEB-INF/templates/generic/user_profile_link.tpl b/web/WEB-INF/templates/generic/user_profile_link.tpl index 036a9a35..26fe3516 100644 --- a/web/WEB-INF/templates/generic/user_profile_link.tpl +++ b/web/WEB-INF/templates/generic/user_profile_link.tpl @@ -5,7 +5,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - + -- 2.39.5