From 30913b30b8dd4e8bb18be5bfe5f054efe9ac8220 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 21 Apr 2016 15:44:26 +0200 Subject: [PATCH] Contined a bit: - added check if user name is already in use - fixed German umlauts - better wording MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../jjobs/beans/user/JobsAdminUserWebRequestBean.java | 3 +++ .../org/mxchange/localization/bundle_de_DE.properties | 11 +++++------ .../org/mxchange/localization/bundle_en_US.properties | 7 +++---- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java index 3196ecb9..9eedb0b9 100644 --- a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java @@ -268,6 +268,9 @@ public class JobsAdminUserWebRequestBean implements JobsAdminUserWebRequestContr // Throw exception throw new FaceletException("Not same password entered"); //NOI18N + } else if (this.userBean.ifUserNameExists(this.getUserName())) { + // User name already exists + throw new FaceletException(new UserNameAlreadyRegisteredException(this.getUserName())); } else if (this.isSamePasswordEntered()) { // Same password entered, create container if (UserUtils.ifPasswordMatches(new UserLoginContainer(user, this.getUserPassword()))) { diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index c9e25c47..372f0a5d 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -1,4 +1,4 @@ -# Copyright (C) 2016 Roland Haeder +# Copyright (C) 2016 Cho-Time GmbH # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -329,7 +329,7 @@ ADMIN_USER_DATA_EMAIL_LEGEND=Benutzernamen und Email-Adresse: ADMIN_USER_DATA_EMAIL_LEGEND_TITLE=Vergeben Sie hier den Benutzernamen und geben Sie die Email-Adresse ein. ADMIN_USER_DATA_ENTER_USER_NAME=Benutzername (*1): ADMIN_USER_DATA_ENTER_EMAIL=Email-Adresse (*2): -ADMIN_USER_DATA_USER_NAME_NOTICE=*1: Der Benutzername darf nur einmal vorhanden sein, das System prueft dies fuer Sie. +ADMIN_USER_DATA_USER_NAME_NOTICE=*1: Der Benutzername darf nur einmal vorhanden sein, das System pr\u00fcft dies f\u00fcr Sie. ADMIN_USER_DATA_PASSWORD_ADD_NOTICE=Lassen Sie beide Passwortfelder leer und es wird ein Passwort per Zufall generiert. Das Passwort wird dem Benutzer nach Erstellung des Zugangs an die Email-Adresse gesendet. ADMIN_USER_DATA_EMAIL_ADDRESS_NOTICE=*2: Die Email-Adresse darf nur einmal vorhanden sein. BUTTON_ADMIN_ADD_USER=Neuen Benutzer hinzuf\u00fcgen @@ -415,7 +415,7 @@ ADMIN_HEADER_SHOW_USER=Benutzer {0} (Nummer {1}): ADMIN_SHOW_USER_ID=Benutzer-Id: ADMIN_SHOW_USER_NAME=Benutzername: ADMIN_SHOW_USER_CREATED=Wann Benutzer erstellt: -ADMIN_SHOW_USER_UPDATED=Wann Benutzer ge\u00e4ndert: +ADMIN_SHOW_USER_UPDATED=Wann Benutzerdaten ge\u00e4ndert: ADMIN_SHOW_USER_ACCOUNT_STATUS=Account-Status: ADMIN_SHOW_USER_PROFILE_MODE=Profilmodus: ADMIN_SHOW_USER_LAST_LOCKED=Zuletzt gesperrt: @@ -464,13 +464,13 @@ PAGE_TITLE_ADMIN_LIST_CONTACT_CELLPHONE=Eintr\u00e4ge von Mobiletelefonen auflis PAGE_TITLE_ADMIN_SHOW_CONTACT_CELLPHONE=Mobiltelefoneintrag eines Kontaktes anzeigen CONTENT_TITLE_ADMIN_SHOW_CONTACT_CELLPHONE=Anzeigen eines Mobiltelefoneintrags eines Kontaktes: PAGE_TITLE_ADMIN_UNLINK_CONTACT_CELLPHONE=Verkn\u00fcpfung Kontakt-Mobiletelfon l\u00f6schen -CONTENT_TITLE_ADMIN_UNLINK_CONTACT_CELLPHONE=Entfernen einer Verknuepfung Kontakt-Mobiltelefon: +CONTENT_TITLE_ADMIN_UNLINK_CONTACT_CELLPHONE=Entfernen einer Verkn\u00fcpfung Kontakt-Mobiltelefon: ERROR_PARAMETER_PHONE_ID_NOT_SET=Fehler: Parameter 'phoneId' ist nicht gesetzt. PAGE_TITLE_ADMIN_SHOW_MOBILE_PROVIDER=Mobilfunkbetreiber anzeigen CONTENT_TITLE_ADMIN_SHOW_MOBILE_PROVIDER=Mobilfunkbetreiber anzeigen: TABLE_SUMMARY_ADMIN_SHOW_CONTACT_CELLPHONE=Ein einzelner Mobiltelefoneintrag eines Kontaktes. TABLE_SUMMARY_ADMIN_SHOW_CONTACT_CELLPHONE_LINKS=Diese Tabelle zeigt Verkn\u00fcpfungen von der Mobilfunknummern zu allen Kontaktdaten an. -ADMIN_HEADER_SHOW_CONTACT_CELLPHONE_LINKS=Alle Kontakt-Mobiltelefon-Verknuepfungen f\u00fcr Id-Nummer {0}: +ADMIN_HEADER_SHOW_CONTACT_CELLPHONE_LINKS=Alle Kontakt-Mobiltelefon-Verkn\u00fcpfungen f\u00fcr Id-Nummer {0}: ERROR_PARAMETER_CONTACT_ID_NOT_SET=Fehler: Parameter 'contactId' ist nicht gesetzt. ADMIN_SHOW_CELLPHONE_UNLINK=Trennen: ADMIN_SHOW_CONTACT_ID=Kontakt-Id: @@ -479,7 +479,6 @@ CONTENT_TITLE_ADMIN_SHOW_CONTACT=Kontaktdaten anzeigen: PAGE_TITLE_ADMIN_EDIT_CONTACT=Kontaktdaten editieren CONTENT_TITLE_ADMIN_EDIT_CONTACT=Kontaktdaten editieren: ADMIN_LINK_EDIT_CONTACT=Kontaktdaten editieren -#@TODO Please fix German umlauts! ADMIN_LINK_EDIT_CONTACT_TITLE=Hier k\u00f6nnen Sie die Kontaktdaten editieren. BUTTON_ADMIN_EDIT_USER=Benutzerdaten \u00e4ndern ADMIN_EDIT_USER_TITLE=Benutzerdaten editieren diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index d961dd00..0c7c699f 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -1,4 +1,4 @@ -# Copyright (C) 2016 Roland Haeder +# Copyright (C) 2016 Cho-Time GmbH # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -389,7 +389,7 @@ ADMIN_HEADER_SHOW_USER=User {0} (id {1}): ADMIN_SHOW_USER_ID=User id: ADMIN_SHOW_USER_NAME=User name: ADMIN_SHOW_USER_CREATED=When user created: -ADMIN_SHOW_USER_UPDATED=When user changed: +ADMIN_SHOW_USER_UPDATED=When user data updated: ADMIN_SHOW_USER_ACCOUNT_STATUS=Account status: ADMIN_SHOW_USER_PROFILE_MODE=Profile mode: ADMIN_SHOW_USER_LAST_LOCKED=Last locked: @@ -409,7 +409,7 @@ ADMIN_SHOW_USER_EMAIL_ADDRESS=Email address: ADMIN_SHOW_USER_BIRTHDAY=Birthday: ADMIN_LINKS_HEADER=Administrative links: ADMIN_LINK_EDIT_USER=Edit user data -ADMIN_LINK_EDIT_USER_TITLE=Editing of user data. +ADMIN_LINK_EDIT_USER_TITLE=Editing of user and contact data. ADMIN_LINK_UNLOCK_USER=Lock/Unlock user account ADMIN_LINK_UNLOCK_USER_TITLE=Lock and unlock of user account ADMIN_LINK_DELETE_USER=Delete user account @@ -438,7 +438,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 -- 2.39.5