LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[UPDATE] 

In der Klasse com/arsdigita/cms/contenttypes/ui/LinkPropertyForm.java die FormProcessException in der Zeile 442 umgebaut. Properties um den Eintrag url_missing_protocol ergänzt. Einige Zeilenumbrüche ergänzt für Text-Wrap.

git-svn-id: https://svn.libreccm.org/ccm/trunk@3156 8810af33-2d31-482b-a856-94f89814c4df
master
tosmers 2015-02-13 22:23:44 +00:00
parent b926481721
commit 1a7d832fa2
5 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ccm-cms/src/com/arsdigita/cms/CMSResources.properties
View File

@ -1097,3 +1097,4 @@ cms.ui.type.cancelled=Cancelled
cms.contenttypes.ui.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.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_not_valid=The URL is not valid
cms.contenttypes.ui.url_missing_protocol=A valid URL starts with a protocol, eg http://

1
ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties
View File

@ -1091,3 +1091,4 @@ cms.ui.type.cancelled=Abgebrochen
cms.contenttypes.ui.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.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_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://

1
ccm-cms/src/com/arsdigita/cms/CMSResources_en_GB.properties
View File

@ -135,3 +135,4 @@ cms.ui.type.cancelled=cancelled
cms.contenttypes.ui.cancelled=Cancelled cms.contenttypes.ui.cancelled=Cancelled
cms.contenttypes.ui.requires_uri_field= cms.contenttypes.ui.requires_uri_field=
cms.contenttypes.ui.url_not_valid= cms.contenttypes.ui.url_not_valid=
cms.contenttypes.ui.url_missing_protocol=

1
ccm-cms/src/com/arsdigita/cms/CMSResources_fr.properties
View File

@ -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.cancelled=Annul\u00e9
cms.contenttypes.ui.requires_uri_field=Le champ URI est n\u00e9cessaire pour un lien externe 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_not_valid=L'URL n'est pas valide
cms.contenttypes.ui.url_missing_protocol=Une URL valide commence par un protocol, p.e. http://

11
ccm-cms/src/com/arsdigita/cms/contenttypes/ui/LinkPropertyForm.java
View File

@ -358,7 +358,8 @@ public class LinkPropertyForm extends FormSection
s_log.debug("cancel in submission listener"); s_log.debug("cancel in submission listener");
m_linkModel.clearSelection(e.getPageState()); m_linkModel.clearSelection(e.getPageState());
init(e); 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 // No idea, just throw the error
// originally: "URL is not valid: " + ex.getMessage() // 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 { try {
@ -429,7 +431,8 @@ public class LinkPropertyForm extends FormSection
msg.append(ex.getMessage()); 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 // If we fixed it by adding a protocol, notify the user to
@ -437,7 +440,7 @@ public class LinkPropertyForm extends FormSection
if (!localLink && !hasProtocol) { if (!localLink && !hasProtocol) {
m_targetURI.setValue(state, newURL); m_targetURI.setValue(state, newURL);
throw new FormProcessException( 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( } else if (Link.INTERNAL_LINK.equals((String) m_linkType.getValue(