In der Klasse com/arsdigita/cms/contenttypes/ui/LinkPropertyForm.java die FormProcessException in der Zeile 451 umgebaut. Properties um den Eintrag internal_link_requires_item_selection ergänzt. Property-Key requires_uri_field changed to external_link_requires_uri_field.

git-svn-id: https://svn.libreccm.org/ccm/trunk@3157 8810af33-2d31-482b-a856-94f89814c4df
master
tosmers 2015-02-13 22:32:08 +00:00
parent 1a7d832fa2
commit 9e6fdac629
5 changed files with 10 additions and 6 deletions

View File

@ -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.workflow.task.approval_or_reject_required=Approval or rejection is required.
cms.ui.type.cancelled=Cancelled 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.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_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.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

View File

@ -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.workflow.task.approval_or_reject_required=Ablehnung oder Zustimmung ist ben\u00f6tigt
cms.ui.type.cancelled=Abgebrochen 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.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_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.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

View File

@ -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.name_not_unique=Name not unique
cms.ui.type.cancelled=cancelled cms.ui.type.cancelled=cancelled
cms.contenttypes.ui.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_not_valid=
cms.contenttypes.ui.url_missing_protocol= cms.contenttypes.ui.url_missing_protocol=
cms.contenttypes.ui.internal_link_requires_item_selection=

View File

@ -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.type.invalid=Invalide
cms.ui.category.name_not_unique=Il y a d\u00e9ja une cat\u00e9gorie avec le nom 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.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_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.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

View File

@ -381,7 +381,7 @@ public class LinkPropertyForm extends FormSection
String externalURI = (String) m_targetURI.getValue(state); String externalURI = (String) m_targetURI.getValue(state);
if (externalURI == null || externalURI.length() == 0) { if (externalURI == null || externalURI.length() == 0) {
throw new FormProcessException(GlobalizationUtil.globalize( 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); 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 // The link is internal, the item selected must be not null
if (data.get(ITEM_SEARCH) == null) { if (data.get(ITEM_SEARCH) == null) {
throw new FormProcessException( throw new FormProcessException(
"Item selection is required for internal link."); GlobalizationUtil.globalize("cms.contenttypes.ui.internal_link_requires_item_selection"));
} }
// Quasimodo // Quasimodo
// The target of the link must not be the same as the owner // The target of the link must not be the same as the owner