From 98d8152214515099558e3cb6f30038c3024d7a6d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 9 Aug 2016 16:42:25 +0200 Subject: [PATCH] Fixed old combined un/lock user stuff as this is now separated (please cherry-pick) --- src/java/org/mxchange/localization/bundle_de_DE.properties | 4 ++-- src/java/org/mxchange/localization/bundle_en_US.properties | 4 ++-- web/admin/user/admin_user_lock.xhtml | 4 ++-- web/admin/user/admin_user_unlock.xhtml | 4 ++-- 4 files changed, 8 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 9aff8da2..9dbeddc1 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -587,13 +587,12 @@ 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_UN_LOCK_USER_ACCOUNT_UNCONFIRMED=Fehler: Kann das Benutzerkonto nicht sperren oder entsperren, da es noch nicht best\u00e4tigt ist. +ERROR_CANNOT_UNLOCK_USER_ACCOUNT_UNCONFIRMED=Fehler: Kann das Benutzerkonto 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}) BUTTON_ADMIN_LOCK_USER_ACCOUNT=Benutzeraccount sperren BUTTON_ADMIN_UNLOCK_USER_ACCOUNT=Benutzeraccount entsperren -ERROR_CANNOT_UN_LOCK_USER_ACCOUNT_UNCONFIRMED=Unbest\u00e4tigte Benutzeraccounts k\u00f6nnen nicht gesperrt werden. PAGE_TITLE_ADMIN_LOCK_USER=Benutzeraccount sperren CONTENT_TITLE_ADMIN_LOCK_USER=Benutzeraccount sperren: ERROR_BEAN_HELPER_USER_NOT_SET=Fehler: Instanz 'user' im Bean-Helper nicht gesetzt. @@ -614,3 +613,4 @@ 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. diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index f0707069..a205cee2 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -587,13 +587,12 @@ 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_UN_LOCK_USER_ACCOUNT_UNCONFIRMED=Error: Cannot lock or unlock user account, it is still unconfirmed. +ERROR_CANNOT_UNLOCK_USER_ACCOUNT_UNCONFIRMED=Error: Cannot unlock user account, 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}) BUTTON_ADMIN_LOCK_USER_ACCOUNT=Lock user account BUTTON_ADMIN_UNLOCK_USER_ACCOUNT=Unlock user account -ERROR_CANNOT_UN_LOCK_USER_ACCOUNT_UNCONFIRMED=Unconfirmed user accounts cannot be locked. PAGE_TITLE_ADMIN_LOCK_USER=Lock user account CONTENT_TITLE_ADMIN_LOCK_USER=Lock user account: ERROR_BEAN_HELPER_USER_NOT_SET=Error: Instance 'user' not set in bean helper. @@ -614,3 +613,4 @@ 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. diff --git a/web/admin/user/admin_user_lock.xhtml b/web/admin/user/admin_user_lock.xhtml index e074bcb7..6800f5ee 100644 --- a/web/admin/user/admin_user_lock.xhtml +++ b/web/admin/user/admin_user_lock.xhtml @@ -70,7 +70,7 @@
- +
@@ -82,7 +82,7 @@ - + diff --git a/web/admin/user/admin_user_unlock.xhtml b/web/admin/user/admin_user_unlock.xhtml index fe8dc182..5d321208 100644 --- a/web/admin/user/admin_user_unlock.xhtml +++ b/web/admin/user/admin_user_unlock.xhtml @@ -69,7 +69,7 @@
- +
@@ -81,7 +81,7 @@ - + -- 2.39.5