From 0df1dd628b2714100834fe3b083ee00a17055eee Mon Sep 17 00:00:00 2001 From: tosmers Date: Sat, 14 Feb 2015 00:09:55 +0000 Subject: [PATCH] =?UTF-8?q?[UPDATE]=20In=20der=20Klasse=20com/arsdigita/cm?= =?UTF-8?q?s/ui/ContentItemPage.java=20die=20FormProcessException=20in=20d?= =?UTF-8?q?er=20Zeile=20267=20umgebaut=20und=20den=20key=20live=5Fitem=5Fn?= =?UTF-8?q?ot=5Feditable=20den=20Properties=20hinzugef=C3=BCgt.=20String-V?= =?UTF-8?q?ariable=20err,=20die=20den=20dynamischen=20Fehlertext=20speiche?= =?UTF-8?q?rte,=20gel=C3=B6scht=20und=20Varableninhalt=20als=20Error-Text?= =?UTF-8?q?=20=C3=BCber=20den=20Logger=20zum=20Ausgeben=20umgebaut.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.libreccm.org/ccm/trunk@3169 8810af33-2d31-482b-a856-94f89814c4df --- ccm-cms/src/com/arsdigita/cms/CMSResources.properties | 1 + ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties | 1 + .../src/com/arsdigita/cms/CMSResources_en_GB.properties | 1 + ccm-cms/src/com/arsdigita/cms/CMSResources_fr.properties | 1 + ccm-cms/src/com/arsdigita/cms/ui/ContentItemPage.java | 7 ++++--- 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ccm-cms/src/com/arsdigita/cms/CMSResources.properties b/ccm-cms/src/com/arsdigita/cms/CMSResources.properties index 91cacefc1..1992c24ef 100755 --- a/ccm-cms/src/com/arsdigita/cms/CMSResources.properties +++ b/ccm-cms/src/com/arsdigita/cms/CMSResources.properties @@ -1100,3 +1100,4 @@ cms.contenttypes.ui.url_not_valid=The URL is not valid cms.contenttypes.ui.url_missing_protocol=A valid URL starts with a protocol, eg http:// cms.contenttypes.ui.internal_link_requires_item_selection=Item selection is required for internal link cms.contenttypes.ui.false_link_target=Link target is the same as this object +cms.ui.live_item_not_editable=Live items cannot be edited diff --git a/ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties b/ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties index a83f8f419..247712899 100755 --- a/ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties +++ b/ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties @@ -1094,3 +1094,4 @@ cms.contenttypes.ui.url_not_valid=Die URL ist nicht g\u00fcltig cms.contenttypes.ui.url_missing_protocol=Eine g\u00fcltige URL startet mit einem Protokoll, z.B. http:// cms.contenttypes.ui.internal_link_requires_item_selection=Item-Wahl f\u00fcr den internen Link ist notwendig cms.contenttypes.ui.false_link_target=Das Ziel des Links ist das Selbe, wie dieses Objekt +cms.ui.live_item_not_editable=Live-Items k\u00f6nnen nicht editiert/bearbeitet werden diff --git a/ccm-cms/src/com/arsdigita/cms/CMSResources_en_GB.properties b/ccm-cms/src/com/arsdigita/cms/CMSResources_en_GB.properties index 387e473c4..18373cf21 100755 --- a/ccm-cms/src/com/arsdigita/cms/CMSResources_en_GB.properties +++ b/ccm-cms/src/com/arsdigita/cms/CMSResources_en_GB.properties @@ -138,3 +138,4 @@ cms.contenttypes.ui.url_not_valid= cms.contenttypes.ui.url_missing_protocol= cms.contenttypes.ui.internal_link_requires_item_selection= cms.contenttypes.ui.false_link_target= +cms.ui.live_item_not_editable= diff --git a/ccm-cms/src/com/arsdigita/cms/CMSResources_fr.properties b/ccm-cms/src/com/arsdigita/cms/CMSResources_fr.properties index d272f007d..db3157535 100755 --- a/ccm-cms/src/com/arsdigita/cms/CMSResources_fr.properties +++ b/ccm-cms/src/com/arsdigita/cms/CMSResources_fr.properties @@ -610,3 +610,4 @@ cms.contenttypes.ui.url_not_valid=L'URL n'est pas valide cms.contenttypes.ui.url_missing_protocol=Une URL valide commence par un protocol, p.e. http:// cms.contenttypes.ui.internal_link_requires_item_selection=Choix d'article pour le lien interne est n\u00e9cessaire cms.contenttypes.ui.false_link_target=La cible de lien est la m\u00eame que cet objet +cms.ui.live_item_not_editable=articles en direct peuvent pas \u00eatre modifi\u00e9s diff --git a/ccm-cms/src/com/arsdigita/cms/ui/ContentItemPage.java b/ccm-cms/src/com/arsdigita/cms/ui/ContentItemPage.java index 86ddd7d21..be649c507 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/ContentItemPage.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/ContentItemPage.java @@ -261,10 +261,11 @@ public class ContentItemPage extends CMSPage implements ActionListener { FormData data = e.getFormData(); final ContentItem item = m_item.getContentItem(s); if (item != null && ContentItem.LIVE.equals(item.getVersion())) { - String err = "The item " + item.getID() - + " is live and cannot be edited."; + s_log.error(String.format( + "The item %d is live and cannot be edited.", item.getID())); // data.addError(err); - throw new FormProcessException(err); + throw new FormProcessException(GlobalizationUtil.globalize( + "cms.ui.live_item_not_editable")); } } });