diff --git a/ccm-cms/src/com/arsdigita/cms/CMSResources.properties b/ccm-cms/src/com/arsdigita/cms/CMSResources.properties index b216dc154..dbd12d212 100755 --- a/ccm-cms/src/com/arsdigita/cms/CMSResources.properties +++ b/ccm-cms/src/com/arsdigita/cms/CMSResources.properties @@ -1097,3 +1097,4 @@ 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.url_not_valid=The URL is not valid +cms.contenttypes.ui.url_missing_protocol=A valid URL starts with a protocol, eg http:// diff --git a/ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties b/ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties index 7f1f33554..b01787ad0 100755 --- a/ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties +++ b/ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties @@ -1091,3 +1091,4 @@ 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.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:// 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 e92a9c3b0..8be32416c 100755 --- a/ccm-cms/src/com/arsdigita/cms/CMSResources_en_GB.properties +++ b/ccm-cms/src/com/arsdigita/cms/CMSResources_en_GB.properties @@ -135,3 +135,4 @@ cms.ui.type.cancelled=cancelled cms.contenttypes.ui.cancelled=Cancelled cms.contenttypes.ui.requires_uri_field= cms.contenttypes.ui.url_not_valid= +cms.contenttypes.ui.url_missing_protocol= diff --git a/ccm-cms/src/com/arsdigita/cms/CMSResources_fr.properties b/ccm-cms/src/com/arsdigita/cms/CMSResources_fr.properties index d980e8b08..67a079b5c 100755 --- a/ccm-cms/src/com/arsdigita/cms/CMSResources_fr.properties +++ b/ccm-cms/src/com/arsdigita/cms/CMSResources_fr.properties @@ -607,3 +607,4 @@ 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.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:// 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 446b79baf..6172a5363 100755 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/LinkPropertyForm.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/LinkPropertyForm.java @@ -358,7 +358,8 @@ public class LinkPropertyForm extends FormSection s_log.debug("cancel in submission listener"); m_linkModel.clearSelection(e.getPageState()); init(e); - throw new FormProcessException(GlobalizationUtil.globalize("cms.contenttypes.ui.cancelled")); + throw new FormProcessException( + GlobalizationUtil.globalize("cms.contenttypes.ui.cancelled")); } } @@ -408,7 +409,8 @@ public class LinkPropertyForm extends FormSection // No idea, just throw the error // originally: "URL is not valid: " + ex.getMessage() - throw new FormProcessException(GlobalizationUtil.globalize("cms.contenttypes.ui.url_not_valid")); + throw new FormProcessException(GlobalizationUtil.globalize( + "cms.contenttypes.ui.url_not_valid")); } try { @@ -429,7 +431,8 @@ public class LinkPropertyForm extends FormSection msg.append(ex.getMessage()); } */ - throw new FormProcessException(GlobalizationUtil.globalize("cms.contenttypes.ui.url_not_valid")); + throw new FormProcessException(GlobalizationUtil.globalize( + "cms.contenttypes.ui.url_not_valid")); } // If we fixed it by adding a protocol, notify the user to @@ -437,7 +440,7 @@ public class LinkPropertyForm extends FormSection if (!localLink && !hasProtocol) { m_targetURI.setValue(state, newURL); throw new FormProcessException( - "A valid URL starts with a protocol, eg http://"); + GlobalizationUtil.globalize("cms.contenttypes.ui.url_missing_protocol")); } } } else if (Link.INTERNAL_LINK.equals((String) m_linkType.getValue(