From 75dbaba60009c4e933bf62272a71de1c6c73541e Mon Sep 17 00:00:00 2001 From: tosmers Date: Sun, 15 Feb 2015 17:25:46 +0000 Subject: [PATCH] =?UTF-8?q?[UPDATE]=20In=20der=20Klasse=20ccm-docmgr/src/c?= =?UTF-8?q?om/arsdigita/cms/docmgr/ui/FolderContentsTableForm.java=20die?= =?UTF-8?q?=20FormProcessException=20in=20der=20Zeile=20184=20umgebaut=20u?= =?UTF-8?q?nd=20den=20key=20ui.folder.not=5Fempty=20den=20Properties=20hin?= =?UTF-8?q?zugef=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@3196 8810af33-2d31-482b-a856-94f89814c4df --- .../src/com/arsdigita/cms/docmgr/ui/DMResources.properties | 1 + .../com/arsdigita/cms/docmgr/ui/DMResources_en.properties | 1 + .../arsdigita/cms/docmgr/ui/FolderContentsTableForm.java | 7 +++---- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/DMResources.properties b/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/DMResources.properties index 6344c2783..8993fcc89 100755 --- a/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/DMResources.properties +++ b/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/DMResources.properties @@ -92,3 +92,4 @@ ui.portlet.action.new.doclink=New DocLink ui.intended_audience_cannot_be_null=Intended Audience cannot be null ui.error.sending_document=An error occurred while trying to send document ui.invalid_term=Invalid term +ui.folder.not_empty=Folders must be empty before they can be deleted diff --git a/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/DMResources_en.properties b/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/DMResources_en.properties index 6344c2783..8993fcc89 100755 --- a/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/DMResources_en.properties +++ b/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/DMResources_en.properties @@ -92,3 +92,4 @@ ui.portlet.action.new.doclink=New DocLink ui.intended_audience_cannot_be_null=Intended Audience cannot be null ui.error.sending_document=An error occurred while trying to send document ui.invalid_term=Invalid term +ui.folder.not_empty=Folders must be empty before they can be deleted diff --git a/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/FolderContentsTableForm.java b/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/FolderContentsTableForm.java index 92346f1f2..d9b8c1aa6 100755 --- a/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/FolderContentsTableForm.java +++ b/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/FolderContentsTableForm.java @@ -39,6 +39,7 @@ import com.arsdigita.cms.Folder; import com.arsdigita.cms.docmgr.DocMgr; import com.arsdigita.cms.docmgr.Resource; import com.arsdigita.cms.docmgr.ui.PagingControlContainer; +import com.arsdigita.cms.docmgr.util.GlobalizationUtil; import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.globalization.GlobalizedMessage; @@ -180,10 +181,8 @@ class FolderContentsTableForm extends Form (Resource) DomainObjectFactory.newInstance(oid); if (resource.isFolder()) { if (! ((Folder) resource).isEmpty()) { - throw new FormProcessException - ("Folders must be empty before they can be deleted. "+ - "Attempted to delete non-empty folder "+ - resource.getTitle()); + throw new FormProcessException(GlobalizationUtil.globalize( + "ui.folder.not_empty")); } } } catch (PersistenceException exc) {