From b1941b689c1be209f5db30b88955a6263d9f09d8 Mon Sep 17 00:00:00 2001 From: tosmers Date: Sun, 15 Feb 2015 13:37:55 +0000 Subject: [PATCH] =?UTF-8?q?[UPDATE]=20In=20der=20Klasse=20ccm-cms/src/com/?= =?UTF-8?q?arsdigita/cms/ui/authoring/TextAssetBody.java=20die=20FormProce?= =?UTF-8?q?ssException=20in=20der=20Zeile=20378=20umgebaut=20und=20cms.ui.?= =?UTF-8?q?authoring.couldnt=5Fconvert=5Finso=5Ffailed=20den=20Properties?= =?UTF-8?q?=20hinzugef=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@3176 8810af33-2d31-482b-a856-94f89814c4df --- ccm-cms/src/com/arsdigita/cms/CMSResources.properties | 1 + ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties | 3 ++- ccm-cms/src/com/arsdigita/cms/CMSResources_en_GB.properties | 1 + ccm-cms/src/com/arsdigita/cms/CMSResources_fr.properties | 1 + .../src/com/arsdigita/cms/ui/authoring/TextAssetBody.java | 5 ++--- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ccm-cms/src/com/arsdigita/cms/CMSResources.properties b/ccm-cms/src/com/arsdigita/cms/CMSResources.properties index cd682f976..8fc7747a3 100755 --- a/ccm-cms/src/com/arsdigita/cms/CMSResources.properties +++ b/ccm-cms/src/com/arsdigita/cms/CMSResources.properties @@ -1104,3 +1104,4 @@ cms.ui.live_item_not_editable=Live items cannot be edited cms.dataqueryexistslistener.error=Error on validating the data query cms.ui.authoring.invalid_file_type=Files with invalide type connot be loaded into the article body cms.ui.authoring.couldnt_convert_missing_inso=Could not convert to html format because interMedia INSO filter is not installed +cms.ui.authoring.couldnt_convert_inso_failed=Could not convert to html format because interMedia INSO filter conversion failed diff --git a/ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties b/ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties index 4413f49d1..ec42e1557 100755 --- a/ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties +++ b/ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties @@ -1097,4 +1097,5 @@ cms.contenttypes.ui.false_link_target=Das Ziel des Links ist das Selbe, wie dies cms.ui.live_item_not_editable=Live-Items k\u00f6nnen nicht editiert/bearbeitet werden cms.dataqueryexistslistener.error=Fehler beim Best\u00e4tigen der Datenabfrage cms.ui.authoring.invalid_file_type=Dateien mit ung\u00fcltigem Typ k\u00f6nnen nicht in den Artikel geladen werden -cms.ui.authoring.couldnt_convert_missing_inso=Konnte nicht ins html Format umgewandelt werden, da der interMedia inso +cms.ui.authoring.couldnt_convert_missing_inso=Konnte nicht ins html Format umgewandelt werden, da der interMedia INSO Filter nicht installiert ist +cms.ui.authoring.couldnt_convert_inso_failed=Konnte nicht ins html Format umgewandelt werden, da die interMedia INSO Umwandlung fehlschlug 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 6c0dfb3c1..13639d1bc 100755 --- a/ccm-cms/src/com/arsdigita/cms/CMSResources_en_GB.properties +++ b/ccm-cms/src/com/arsdigita/cms/CMSResources_en_GB.properties @@ -142,3 +142,4 @@ cms.ui.live_item_not_editable= cms.dataqueryexistslistener.error= cms.ui.authoring.invalid_file_type= cms.ui.authoring.couldnt_convert_missing_inso= +cms.ui.authoring.couldnt_convert_inso_failed= diff --git a/ccm-cms/src/com/arsdigita/cms/CMSResources_fr.properties b/ccm-cms/src/com/arsdigita/cms/CMSResources_fr.properties index 46fff84a7..325e84a7b 100755 --- a/ccm-cms/src/com/arsdigita/cms/CMSResources_fr.properties +++ b/ccm-cms/src/com/arsdigita/cms/CMSResources_fr.properties @@ -614,3 +614,4 @@ cms.ui.live_item_not_editable=articles en direct peuvent pas \u00eatre modifi\u0 cms.dataqueryexistslistener.error=Erreur sur la validation de la requ\u00eate de donn\u00e9es cms.ui.authoring.invalid_file_type=Fichiers de type invalide connot \u00eatre charg\u00e9s dans le corps de l'article cms.ui.authoring.couldnt_convert_missing_inso=Impossible de convertir au format HTML car le filtre interMedia INSO n'est pas install\u00e9 +cms.ui.authoring.couldnt_convert_inso_failed=Impossible de convertir au format HTML car la conversion de filtre interMedia INSO a \u00e9chou\u00e9 diff --git a/ccm-cms/src/com/arsdigita/cms/ui/authoring/TextAssetBody.java b/ccm-cms/src/com/arsdigita/cms/ui/authoring/TextAssetBody.java index 0d5039733..9af5207fc 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/authoring/TextAssetBody.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/authoring/TextAssetBody.java @@ -375,9 +375,8 @@ public abstract class TextAssetBody extends SecurityPropertyEditor // Converted successfully, flag type should be html used_inso[0] = true; } else { - throw new FormProcessException( - "Could not convert to html format. " - + "interMedia INSO filter conversion failed."); + throw new FormProcessException(GlobalizationUtil.globalize( + "cms.ui.authoring.couldnt_convert_inso_failed")); } } else { // Text type, no need to convert