From 9e6fdac62912485a398f7df07cecf26d13579415 Mon Sep 17 00:00:00 2001 From: tosmers Date: Fri, 13 Feb 2015 22:32:08 +0000 Subject: [PATCH] =?UTF-8?q?[UPDATE]=20In=20der=20Klasse=20com/arsdigita/cm?= =?UTF-8?q?s/contenttypes/ui/LinkPropertyForm.java=20die=20FormProcessExce?= =?UTF-8?q?ption=20in=20der=20Zeile=20451=20umgebaut.=20Properties=20um=20?= =?UTF-8?q?den=20Eintrag=20internal=5Flink=5Frequires=5Fitem=5Fselection?= =?UTF-8?q?=20erg=C3=A4nzt.=20Property-Key=20requires=5Furi=5Ffield=20chan?= =?UTF-8?q?ged=20to=20external=5Flink=5Frequires=5Furi=5Ffield.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.libreccm.org/ccm/trunk@3157 8810af33-2d31-482b-a856-94f89814c4df --- ccm-cms/src/com/arsdigita/cms/CMSResources.properties | 3 ++- ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties | 3 ++- ccm-cms/src/com/arsdigita/cms/CMSResources_en_GB.properties | 3 ++- ccm-cms/src/com/arsdigita/cms/CMSResources_fr.properties | 3 ++- .../com/arsdigita/cms/contenttypes/ui/LinkPropertyForm.java | 4 ++-- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ccm-cms/src/com/arsdigita/cms/CMSResources.properties b/ccm-cms/src/com/arsdigita/cms/CMSResources.properties index dbd12d212..852b78712 100755 --- a/ccm-cms/src/com/arsdigita/cms/CMSResources.properties +++ b/ccm-cms/src/com/arsdigita/cms/CMSResources.properties @@ -1095,6 +1095,7 @@ cms.ui.item_searchwidget.submit=item search FormSection submit cms.ui.workflow.task.approval_or_reject_required=Approval or rejection is required. cms.ui.type.cancelled=Cancelled cms.contenttypes.ui.cancelled=Cancelled -cms.contenttypes.ui.requires_uri_field=The URI field is required for an external link +cms.contenttypes.ui.external_link_requires_uri_field=The URI field is required for an external link 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 diff --git a/ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties b/ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties index b01787ad0..c0d0851b9 100755 --- a/ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties +++ b/ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties @@ -1089,6 +1089,7 @@ cms.ui.item_searchwidget.submit=item search FormSection submit cms.ui.workflow.task.approval_or_reject_required=Ablehnung oder Zustimmung ist ben\u00f6tigt cms.ui.type.cancelled=Abgebrochen cms.contenttypes.ui.cancelled=Abgebrochen -cms.contenttypes.ui.requires_uri_field=Das URI-Feld wird f\u00fcr einen externen Link ben\u00f6tigt +cms.contenttypes.ui.external_link_requires_uri_field=Das URI-Feld wird f\u00fcr einen externen Link ben\u00f6tigt 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 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 8be32416c..8b9775bba 100755 --- a/ccm-cms/src/com/arsdigita/cms/CMSResources_en_GB.properties +++ b/ccm-cms/src/com/arsdigita/cms/CMSResources_en_GB.properties @@ -133,6 +133,7 @@ cms.ui.workflow.task.approval_or_reject_required=Approval or rejection is requir cms.ui.type.name_not_unique=Name not unique cms.ui.type.cancelled=cancelled cms.contenttypes.ui.cancelled=Cancelled -cms.contenttypes.ui.requires_uri_field= +cms.contenttypes.ui.external_link_requires_uri_field= cms.contenttypes.ui.url_not_valid= cms.contenttypes.ui.url_missing_protocol= +cms.contenttypes.ui.internal_link_requires_item_selection= diff --git a/ccm-cms/src/com/arsdigita/cms/CMSResources_fr.properties b/ccm-cms/src/com/arsdigita/cms/CMSResources_fr.properties index 67a079b5c..41ffe4e94 100755 --- a/ccm-cms/src/com/arsdigita/cms/CMSResources_fr.properties +++ b/ccm-cms/src/com/arsdigita/cms/CMSResources_fr.properties @@ -605,6 +605,7 @@ cms.ui.role.name_not_unique=Il y a d\u00e9ja un r\u00f4le cms.ui.type.invalid=Invalide cms.ui.category.name_not_unique=Il y a d\u00e9ja une cat\u00e9gorie avec le nom cms.contenttypes.ui.cancelled=Annul\u00e9 -cms.contenttypes.ui.requires_uri_field=Le champ URI est n\u00e9cessaire pour un lien externe +cms.contenttypes.ui.external_link_requires_uri_field=Le champ URI est n\u00e9cessaire pour un lien externe 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 diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/LinkPropertyForm.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/LinkPropertyForm.java index 6172a5363..3b93a5099 100755 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/LinkPropertyForm.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/LinkPropertyForm.java @@ -381,7 +381,7 @@ public class LinkPropertyForm extends FormSection String externalURI = (String) m_targetURI.getValue(state); if (externalURI == null || externalURI.length() == 0) { throw new FormProcessException(GlobalizationUtil.globalize( - "cms.contenttypes.ui.requires_uri_field")); + "cms.contenttypes.ui.external_link_requires_uri_field")); } String url = (String) m_targetURI.getValue(state); @@ -448,7 +448,7 @@ public class LinkPropertyForm extends FormSection // The link is internal, the item selected must be not null if (data.get(ITEM_SEARCH) == null) { throw new FormProcessException( - "Item selection is required for internal link."); + GlobalizationUtil.globalize("cms.contenttypes.ui.internal_link_requires_item_selection")); } // Quasimodo // The target of the link must not be the same as the owner