From 896141b22ed7de30d4a7486cf588aa59959e0cf9 Mon Sep 17 00:00:00 2001 From: tosmers Date: Wed, 18 Feb 2015 20:55:04 +0000 Subject: [PATCH] =?UTF-8?q?[UPDATE]=20In=20der=20Klasse=20ccm-core/src/com?= =?UTF-8?q?/arsdigita/ui/admin/UserPasswordForm.java=20die=20FormProcessEx?= =?UTF-8?q?ception=20in=20der=20Zeile=20222=20umgebaut=20und=20den=20key?= =?UTF-8?q?=20retrieving=5Fuser=5Ffailed=20den=20Properties=20hinzugef?= =?UTF-8?q?=C3=BCgt.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.libreccm.org/ccm/trunk@3238 8810af33-2d31-482b-a856-94f89814c4df --- .../src/com/arsdigita/ui/admin/AdminResources.properties | 1 + .../src/com/arsdigita/ui/admin/AdminResources_de.properties | 1 + .../src/com/arsdigita/ui/admin/AdminResources_en.properties | 1 + .../src/com/arsdigita/ui/admin/AdminResources_fr.properties | 1 + ccm-core/src/com/arsdigita/ui/admin/UserPasswordForm.java | 5 ++--- 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ccm-core/src/com/arsdigita/ui/admin/AdminResources.properties b/ccm-core/src/com/arsdigita/ui/admin/AdminResources.properties index 9adfbd582..5014a18c9 100644 --- a/ccm-core/src/com/arsdigita/ui/admin/AdminResources.properties +++ b/ccm-core/src/com/arsdigita/ui/admin/AdminResources.properties @@ -150,3 +150,4 @@ ui.admin.sysinfo.sax_parser=SAX Parser ui.admin.sysinfo.xml_config=XML config #ID ist null ui.admin.groups.ID_is_null=ID is null +ui.admin.user.userpasswordform.retrieving_user_failed=Failed to retrieve user diff --git a/ccm-core/src/com/arsdigita/ui/admin/AdminResources_de.properties b/ccm-core/src/com/arsdigita/ui/admin/AdminResources_de.properties index 9fb5226ec..c2123717b 100644 --- a/ccm-core/src/com/arsdigita/ui/admin/AdminResources_de.properties +++ b/ccm-core/src/com/arsdigita/ui/admin/AdminResources_de.properties @@ -150,3 +150,4 @@ ui.admin.sysinfo.sax_parser=SAX Parser ui.admin.sysinfo.xml_config=XML Konfiguration #ID ist null ui.admin.groups.ID_is_null=ID is null +ui.admin.user.userpasswordform.retrieving_user_failed=Konnte Benutzer nicht abrufen diff --git a/ccm-core/src/com/arsdigita/ui/admin/AdminResources_en.properties b/ccm-core/src/com/arsdigita/ui/admin/AdminResources_en.properties index 1b22f4db9..4e135910e 100755 --- a/ccm-core/src/com/arsdigita/ui/admin/AdminResources_en.properties +++ b/ccm-core/src/com/arsdigita/ui/admin/AdminResources_en.properties @@ -108,3 +108,4 @@ ui.admin.cancel=Cancel ui.admin.cancel_msg=Submission cancelled #ID ist null ui.admin.groups.ID_is_null=ID is null +ui.admin.user.userpasswordform.retrieving_user_failed=Failed to retrieve user diff --git a/ccm-core/src/com/arsdigita/ui/admin/AdminResources_fr.properties b/ccm-core/src/com/arsdigita/ui/admin/AdminResources_fr.properties index 3b6d52ecc..759a5e48a 100755 --- a/ccm-core/src/com/arsdigita/ui/admin/AdminResources_fr.properties +++ b/ccm-core/src/com/arsdigita/ui/admin/AdminResources_fr.properties @@ -93,3 +93,4 @@ ui.admin.applications.ApplicationInstancePane.parent_app.label=Parent applicatio ui.admin.cancel=Cancel ui.admin.cancel_msg=Submission cancelled ui.admin.groups.ID_is_null= +ui.admin.user.userpasswordform.retrieving_user_failed=Impossible de retrouver l'utilisateur diff --git a/ccm-core/src/com/arsdigita/ui/admin/UserPasswordForm.java b/ccm-core/src/com/arsdigita/ui/admin/UserPasswordForm.java index e7814ea96..d28e078a6 100755 --- a/ccm-core/src/com/arsdigita/ui/admin/UserPasswordForm.java +++ b/ccm-core/src/com/arsdigita/ui/admin/UserPasswordForm.java @@ -19,7 +19,6 @@ package com.arsdigita.ui.admin; -import com.arsdigita.ui.util.GlobalizationUtil ; import com.arsdigita.bebop.Form; import com.arsdigita.bebop.FormData; @@ -220,8 +219,8 @@ class UserPasswordForm extends Form try { user = User.retrieve(id); } catch (DataObjectNotFoundException ex) { - throw new FormProcessException - ("Failed to retrieve user", ex); + throw new FormProcessException(GlobalizationUtil.globalize( + "ui.admin.user.userpasswordform.retrieving_user_failed")); } UserAuthentication auth;