From: Roland Häder Date: Thu, 11 Aug 2016 09:44:12 +0000 (+0200) Subject: Continued with error messages: (please cherry-pick) X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7a8d907511fb7dd7750ef0d2b6b14c3545a699ba;p=jjobs-war.git Continued with error messages: (please cherry-pick) - added ADMIN_ prefix - added message for locking a locked user and unlocking a already unlocked (confirmed) account - added parameters --- diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index cbfa38f9..45654d5a 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -587,7 +587,7 @@ USER_CURRENT_PASSWORD_REQUIRED=Bitte geben Sie Ihr derzeit verwendetes Passwort USER_NEW_PASSWORD_REQUIRED=Bitte geben Sie ein neues Passwort zweimal ein. Dieses muss anders als Ihr aktuelles sein. USER_NEW_PASSWORD_REPEAT_REQUIRED=Bitte wiederholen Sie das neue Passwort. Dies dient der Reduzierung von Tippfehlern. ADMIN_USER_MUST_CHANGE_PASSWORD=Soll der Benutzer sein Kennwort nach dem Einloggen selber \u00e4ndern? -ERROR_CANNOT_UNLOCK_USER_ACCOUNT_UNCONFIRMED=Fehler: Kann das Benutzerkonto nicht entsperren, da es noch nicht best\u00e4tigt ist. +ERROR_ADMIN_CANNOT_UNLOCK_USER_ACCOUNT_UNCONFIRMED=Fehler: Kann das Benutzerkonto {0} ({1}) nicht entsperren, da es noch nicht best\u00e4tigt ist. ADMIN_USER_UNLOCK_REASON_REQUIRED=Bitte geben Sie einen aussagekr\u00e4ftigen Grund f\u00fcr die Account-Sperre ein. ADMIN_ENTER_USER_LOCK_REASON=Sperrgrund eingeben: ADMIN_UNLOCK_USER_TITLE=Benutzeraccount {0} ({1}) @@ -613,7 +613,7 @@ BUTTON_ADMIN_EDIT_CELLPHONE=Mobiltelefonnumer \u00e4ndern ADMIN_LINK_LOCK_USER=Benutzeraccount sperren ADMIN_LINK_LOCK_USER_TITLE=Sperren von freigeschalteten Benutzeraccounts, mit Angabe eines Sperrgrundes. ADMIN_CELLPHONE_DATA_LEGEND_TITLE=Mobilfunknummer und -anbieter ab\u00e4ndern. -ERROR_CANNOT_LOCK_USER_ACCOUNT_UNCONFIRMED=Fehler: Kann das Benutzerkonto nicht sperren, da es noch nicht best\u00e4tigt ist. +ERROR_ADMIN_CANNOT_LOCK_USER_ACCOUNT_UNCONFIRMED=Fehler: Kann das Benutzerkonto nicht sperren, da es noch nicht best\u00e4tigt ist. ADMIN_MOBILE_PROVIDER_REQUIRED=Bitte einen Mobilfunkanbieter ausw\u00e4hlen. ADMIN_CELLPHONE_NUMBER_REQUIRED=Bitte Mobilfunknummer angeben. BUTTON_ADMIN_DELETE_CELLPHONE=Mobilfunknummer l\u00f6schen @@ -623,3 +623,6 @@ ADMIN_TABLE_SUMMARY_SHOW_CONTACT_MINI=Die Tabelle enth\u00e4lt die wichtigsten D ADMIN_SHOW_FULL_CONTACT_DATA=Gesamte Kontaktdaten anzeigen ADMIN_UNLINK_CONTACT_CELLPHONE_TITLE=Wollen Sie wirklich die Mobilfunknummer vom Kontakt abtrennen? BUTTON_ADMIN_UNLINK_CONTACT_CELLPHONE=Mobilfunknummer vom Kontakt abtrennen +ADMIN_LOCK_USER_TITLE=Wollen Sie diesen Benutzer wirklich sperren? +ERROR_ADMIN_CANNOT_UNLOCK_USER_ACCOUNT_UNLOCKED=Kann den Benutzer {0} ({1}) nicht entsperren, da er bereits entsperrt ist. +ERROR_ADMIN_CANNOT_LOCK_USER_ACCOUNT_LOCKED=Kann den Benutzer {0} ({1}) nicht sperren, da er bereits gesperrt ist. diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index f732c8e9..1e76e967 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -587,7 +587,7 @@ USER_CURRENT_PASSWORD_REQUIRED=Please enter your currently used password for con USER_NEW_PASSWORD_REQUIRED=Please a new password twice. This must be different than the current one. USER_NEW_PASSWORD_REPEAT_REQUIRED=Please repeat your new password. This is for preventing type mistakes. ADMIN_USER_MUST_CHANGE_PASSWORD=Should the user change his password after login? -ERROR_CANNOT_UNLOCK_USER_ACCOUNT_UNCONFIRMED=Error: Cannot unlock user account, it is still unconfirmed. +ERROR_ADMIN_CANNOT_UNLOCK_USER_ACCOUNT_UNCONFIRMED=Error: Cannot unlock user account {0} ({1}), it is still unconfirmed. ADMIN_USER_UNLOCK_REASON_REQUIRED=Please provide a good reason why you want to lock this user's account. ADMIN_ENTER_USER_LOCK_REASON=Enter lock reason: ADMIN_UNLOCK_USER_TITLE=User account {0} ({1}) @@ -613,7 +613,7 @@ BUTTON_ADMIN_EDIT_CELLPHONE=Edit cell phone number ADMIN_LINK_LOCK_USER=Lock user account ADMIN_LINK_LOCK_USER_TITLE=Locking of confirmed user account with lock reason. ADMIN_CELLPHONE_DATA_LEGEND_TITLE=Change cell phone number and provider. -ERROR_CANNOT_LOCK_USER_ACCOUNT_UNCONFIRMED=Error: Cannot lock user account, it is still unconfirmed. +ERROR_ADMIN_CANNOT_LOCK_USER_ACCOUNT_UNCONFIRMED=Error: Cannot lock user account, it is still unconfirmed. ADMIN_MOBILE_PROVIDER_REQUIRED=Please choose a mobile provider. ADMIN_CELLPHONE_NUMBER_REQUIRED=Please enter a cell phone number. BUTTON_ADMIN_DELETE_CELLPHONE=Delete cell phone number @@ -623,3 +623,6 @@ ADMIN_TABLE_SUMMARY_SHOW_CONTACT_MINI=The table contains the most important data ADMIN_SHOW_FULL_CONTACT_DATA=Show all contact data ADMIN_UNLINK_CONTACT_CELLPHONE_TITLE=Do you really want to unlink the shown cell phone number from the contact? BUTTON_ADMIN_UNLINK_CONTACT_CELLPHONE=Unlink cell phone number from contact +ADMIN_LOCK_USER_TITLE=Do You really want to lock this user? +ERROR_ADMIN_CANNOT_UNLOCK_USER_ACCOUNT_UNLOCKED=Cannot unlock user {0} ({1}) because he is already unlocked. +ERROR_ADMIN_CANNOT_LOCK_USER_ACCOUNT_LOCKED=Cannot lock user {0} ({1}) because he is already locked. diff --git a/web/admin/user/admin_user_lock.xhtml b/web/admin/user/admin_user_lock.xhtml index 0b2e4821..482df3db 100644 --- a/web/admin/user/admin_user_lock.xhtml +++ b/web/admin/user/admin_user_lock.xhtml @@ -80,7 +80,15 @@ - + + + + + + + + + diff --git a/web/admin/user/admin_user_unlock.xhtml b/web/admin/user/admin_user_unlock.xhtml index d3c42124..deb5e881 100644 --- a/web/admin/user/admin_user_unlock.xhtml +++ b/web/admin/user/admin_user_unlock.xhtml @@ -79,7 +79,15 @@ - + + + + + + + + +