diff --git a/ccm-cms/src/com/arsdigita/cms/CMSResources.properties b/ccm-cms/src/com/arsdigita/cms/CMSResources.properties index 39b954d69..853abf896 100755 --- a/ccm-cms/src/com/arsdigita/cms/CMSResources.properties +++ b/ccm-cms/src/com/arsdigita/cms/CMSResources.properties @@ -1086,3 +1086,10 @@ cms.ui.contentcenter.location=Location cms.ui.contentcenter.location_hint=In Legacy mode links to public pages. cms.ui.contentcenter.action_hint=If activated displays a form for each content section to create an object of a given type (configurable) in the root of the given content section. The list of available types retrieved for each content section. Administrators will disable this option in order to prevent disorganizing the root directory. cms.ui.property_already_exist=The following Property already exists: +cms.ui.template_not_supportet=The selected mime type is not supported +cms.ui.uploaded_file_not_properly_formatted=The uploaded file is not properly formatted XML: +cms.ui.unique_string_violation=Unique string value constraint violation. +cms.ui.unique_item_name_violation=An item with this name already exists. += +cms.ui.item_searchwidget.submit=item search FormSection submit +cms.ui.workflow.task.approval_or_reject_required=Approval or rejection is required. diff --git a/ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties b/ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties index e2074f059..4e1ae1c1e 100755 --- a/ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties +++ b/ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties @@ -1080,3 +1080,10 @@ cms.ui.contentcenter.location=Ort cms.ui.contentcenter.location_hint=In Legacy mode links to public pages. cms.ui.contentcenter.action_hint=Falls aktiv wird ein Formular angezeigt, um im ROOT Verzeichnis der entsprechenden Sektion ein neues Dokument anzulegen. Administratoren deaktivieren diese Option, um das ROOT Verzeichnis nicht zu \u00fcberfrachten. cms.ui.property_already_exist=Das folgende Objekt existiert bereits: +cms.ui.template_not_supportet=Das ausgew\u00e4hlte Template(mime type) wird nicht unterst\u00fctzt +cms.ui.uploaded_file_not_properly_formatted=Die hochgeladene Datei ist fehlerhaft +cms.ui.unique_string_violation=String bereits vergeben. +cms.ui.unique_item_name_violation=Ein Item mit diesem Namen existiert bereits. += +cms.ui.item_searchwidget.submit=item search FormSection submit +cms.ui.workflow.task.approval_or_reject_required=Ablehnung oder Zustimmung ist ben\u00f6tigt 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 f8712c103..6b600d405 100755 --- a/ccm-cms/src/com/arsdigita/cms/CMSResources_en_GB.properties +++ b/ccm-cms/src/com/arsdigita/cms/CMSResources_en_GB.properties @@ -123,3 +123,10 @@ cms.ui.contentcenter.location=Location cms.ui.contentcenter.location_hint=In Legacy mode links to public pages. cms.ui.contentcenter.action_hint=If activated displays a form for each content section to create an object of a given type (configurable) in the root of the given content section. The list of available types retrieved for each content section. Administrators will disable this option in order to prevent disorganizing the root directory. cms.ui.property_already_exist=The following Property already exists: +cms.ui.template_not_supportet=The selected mime type is not supported +cms.ui.uploaded_file_not_properly_formatted=The uploaded file is not properly formatted XML: +cms.ui.unique_string_violation=Unique string value constraint violation. +cms.ui.unique_item_name_violation=An item with this name already exists. += +cms.ui.item_searchwidget.submit=item search FormSection submit +cms.ui.workflow.task.approval_or_reject_required=Approval or rejection is required. diff --git a/ccm-cms/src/com/arsdigita/cms/CMSResources_fr.properties b/ccm-cms/src/com/arsdigita/cms/CMSResources_fr.properties index d3df9db1c..b4439e0f2 100755 --- a/ccm-cms/src/com/arsdigita/cms/CMSResources_fr.properties +++ b/ccm-cms/src/com/arsdigita/cms/CMSResources_fr.properties @@ -592,3 +592,10 @@ cms.ui.contentcenter.location=TRANSLATE: Location cms.ui.contentcenter.location_hint=In Legacy mode links to public pages. cms.ui.contentcenter.action_hint=If activated displays a form for each content section to create an object of a given type (configurable) in the root of the given content section. The list of available types retrieved for each content section. Administrators will disable this option in order to prevent disorganizing the root directory. cms.ui.property_already_exist=The following Property already exists: +cms.ui.template_not_supportet=The selected mime type is not supported +cms.ui.uploaded_file_not_properly_formatted=The uploaded file is not properly formatted XML: +cms.ui.unique_string_violation= +cms.ui.unique_item_name_violation= += +cms.ui.item_searchwidget.submit=item search FormSection submit +cms.ui.workflow.task.approval_or_reject_required=Approval or rejection is required. diff --git a/ccm-cms/src/com/arsdigita/cms/contentsection/ContentSectionCreateForm.java b/ccm-cms/src/com/arsdigita/cms/contentsection/ContentSectionCreateForm.java index 0fe69802e..20779fd60 100644 --- a/ccm-cms/src/com/arsdigita/cms/contentsection/ContentSectionCreateForm.java +++ b/ccm-cms/src/com/arsdigita/cms/contentsection/ContentSectionCreateForm.java @@ -151,7 +151,7 @@ public class ContentSectionCreateForm extends Form { if (saveCancelSection.getCancelButton().isSelected(event.getPageState())) { event.getFormData().put(NEW_SECTION_NAME, ""); - throw new FormProcessException("Canceled"); + throw new FormProcessException(GlobalizationUtil.globalize("cms.contentsection.cancelled")); } } diff --git a/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchCreateItemPane.java b/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchCreateItemPane.java index db4867fa1..ea0964313 100644 --- a/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchCreateItemPane.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchCreateItemPane.java @@ -19,7 +19,6 @@ package com.arsdigita.cms.ui; import com.arsdigita.bebop.BoxPanel; -import com.arsdigita.bebop.Component; import com.arsdigita.bebop.FormData; import com.arsdigita.bebop.FormProcessException; import com.arsdigita.bebop.Label; @@ -333,8 +332,8 @@ class ItemSearchCreateItemPane extends CMSContainer if ((folderOidStr == null) || folderOidStr.isEmpty()) { fse.getFormData().addError(FLAT_FOLDER, GlobalizationUtil.globalize( "cms.ui.item_search.create.folder_missing")); - throw new FormProcessException((String) GlobalizationUtil.globalize( - "cms.ui.item_search.create.folder_missing").localize()); + throw new FormProcessException(GlobalizationUtil.globalize( + "cms.ui.item_search.create.folder_missing")); } final OID folderOID = OID.valueOf(folderOidStr); m_folderSel.setSelectedKey(state, folderOID.get("id")); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchWidget.java b/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchWidget.java index f068ae35c..5b8313e26 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchWidget.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchWidget.java @@ -438,7 +438,7 @@ public class ItemSearchWidget extends FormSection // component is in metaform. nothing to do here. Custom generateXML must hide for us } - throw new FormProcessException("item search FormSection submit"); + throw new FormProcessException(GlobalizationUtil.globalize("cms.ui.item_searchwidget.submit")); } else if (m_searchComponent.hasQuery(state)) { s_log.debug("Has query"); @@ -459,7 +459,7 @@ public class ItemSearchWidget extends FormSection state.setValue(new BigDecimalParameter(ItemSearch.SINGLE_TYPE_PARAM), null); } - throw new FormProcessException("item search FormSection submit"); + throw new FormProcessException(GlobalizationUtil.globalize("cms.ui.item_searchwidget.submit")); } else if (m_search.isSelected(state)) { s_log.debug("Search selected"); try { @@ -479,7 +479,7 @@ public class ItemSearchWidget extends FormSection state.setValue(new BigDecimalParameter(ItemSearch.SINGLE_TYPE_PARAM), null); } - throw new FormProcessException("item search FormSection submit"); + throw new FormProcessException(GlobalizationUtil.globalize("cms.ui.item_searchwidget.submit")); } else if (m_clear.isSelected(state)) { s_log.debug("Clear selected"); m_item.setValue(state, null); @@ -491,7 +491,7 @@ public class ItemSearchWidget extends FormSection } catch (IllegalStateException ex) { // component is in metaform. nothing to do here. Custom generateXML must hide for us } - throw new FormProcessException("item search FormSection submit"); + throw new FormProcessException(GlobalizationUtil.globalize("cms.ui.item_searchwidget.submit")); } else { s_log.debug("Something else"); try { diff --git a/ccm-cms/src/com/arsdigita/cms/ui/SectionConfigurationPage.java b/ccm-cms/src/com/arsdigita/cms/ui/SectionConfigurationPage.java index 6aa17a706..5065d8230 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/SectionConfigurationPage.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/SectionConfigurationPage.java @@ -374,7 +374,7 @@ public class SectionConfigurationPage extends CMSPage implements Resettable { throws FormProcessException { PageState state = event.getPageState(); if ( isCancelled(state) ) { - throw new FormProcessException( (String) GlobalizationUtil.globalize("cms.ui.cancel_hit").localize()); + throw new FormProcessException(GlobalizationUtil.globalize("cms.ui.cancel_hit")); } } }); @@ -502,7 +502,7 @@ public class SectionConfigurationPage extends CMSPage implements Resettable { throws FormProcessException { PageState state = event.getPageState(); if ( isCancelled(state) ) { - throw new FormProcessException( (String) GlobalizationUtil.globalize("cms.ui.cancel_hit").localize()); + throw new FormProcessException(GlobalizationUtil.globalize("cms.ui.cancel_hit")); } } }); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/SecurityPropertyEditor.java b/ccm-cms/src/com/arsdigita/cms/ui/SecurityPropertyEditor.java index ba8c9c6da..919353ce2 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/SecurityPropertyEditor.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/SecurityPropertyEditor.java @@ -274,7 +274,7 @@ public class SecurityPropertyEditor extends PropertyEditor { if ( !ca.canAccess(state, sm) ) { showDisplayPane(state); - throw new FormProcessException( (String) GlobalizationUtil.globalize("cms.ui.insufficient_privileges").localize()); + throw new FormProcessException(GlobalizationUtil.globalize("cms.ui.insufficient_privileges")); } } }); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/UniqueItemNameValidationListener.java b/ccm-cms/src/com/arsdigita/cms/ui/UniqueItemNameValidationListener.java index 934d3dacc..7d4fe1288 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/UniqueItemNameValidationListener.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/UniqueItemNameValidationListener.java @@ -40,7 +40,7 @@ public class UniqueItemNameValidationListener extends UniqueStringValidationListener { private final static String ERROR_MSG = - "An item with this name already exists."; + "cms.ui.unique_item_name_violation"; /** * Constructor. diff --git a/ccm-cms/src/com/arsdigita/cms/ui/authoringkit/AddStep.java b/ccm-cms/src/com/arsdigita/cms/ui/authoringkit/AddStep.java index b60adfa09..94e4da52f 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/authoringkit/AddStep.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/authoringkit/AddStep.java @@ -134,7 +134,7 @@ public class AddStep extends Form throws FormProcessException { PageState state = event.getPageState(); if ( isCancelled(state) ) { - throw new FormProcessException( (String) GlobalizationUtil.globalize("cms.ui.cancel_hit").localize()); + throw new FormProcessException(GlobalizationUtil.globalize("cms.ui.cancel_hit")); } } }); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/authoringkit/DeleteStep.java b/ccm-cms/src/com/arsdigita/cms/ui/authoringkit/DeleteStep.java index 1cfd5a71c..4fee1a1ea 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/authoringkit/DeleteStep.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/authoringkit/DeleteStep.java @@ -116,7 +116,7 @@ public class DeleteStep extends Form */ public void submitted(FormSectionEvent e) throws FormProcessException { if(m_cancelWidget.isSelected(e.getPageState())) { - throw new FormProcessException( (String) GlobalizationUtil.globalize("cms.ui.authoringkit.submission_cancelled").localize()); + throw new FormProcessException(GlobalizationUtil.globalize("cms.ui.authoringkit.submission_cancelled")); } } diff --git a/ccm-cms/src/com/arsdigita/cms/ui/category/BaseCategoryForm.java b/ccm-cms/src/com/arsdigita/cms/ui/category/BaseCategoryForm.java index 42b6bc49b..d3a632d9b 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/category/BaseCategoryForm.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/category/BaseCategoryForm.java @@ -33,6 +33,7 @@ import com.arsdigita.bebop.parameters.TrimmedStringParameter; import com.arsdigita.categorization.Category; import com.arsdigita.categorization.CategoryCollection; import com.arsdigita.cms.ui.BaseForm; +import com.arsdigita.cms.util.GlobalizationUtil; import com.arsdigita.globalization.GlobalizedMessage; import com.arsdigita.web.Web; import com.arsdigita.xml.Element; @@ -181,7 +182,7 @@ class BaseCategoryForm extends BaseForm { if (compField.equalsIgnoreCase(title) && (m_category == null || !m_category.getCategory(state).equals(child))) { - throw new FormProcessException(lz("cms.ui.category.name_not_unique")); + throw new FormProcessException(GlobalizationUtil.globalize("cms.ui.category.name_not_unique")); } } } diff --git a/ccm-cms/src/com/arsdigita/cms/ui/folder/ChildUniqueValidationListener.java b/ccm-cms/src/com/arsdigita/cms/ui/folder/ChildUniqueValidationListener.java index 33249de63..85074f9cb 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/folder/ChildUniqueValidationListener.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/folder/ChildUniqueValidationListener.java @@ -23,6 +23,7 @@ import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.event.ParameterEvent; import com.arsdigita.bebop.event.ParameterListener; import com.arsdigita.cms.Folder; +import com.arsdigita.cms.util.GlobalizationUtil; import com.arsdigita.persistence.DataQuery; import com.arsdigita.persistence.SessionManager; @@ -80,7 +81,7 @@ final class ChildUniqueValidationListener implements ParameterListener { if (count > 0) { throw new FormProcessException - ("An item with this name already exists"); + (GlobalizationUtil.globalize("cms.ui.unique_item_name_violation")); } } else { throw new IllegalStateException(); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderItemPane.java b/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderItemPane.java index 4a076809a..5e1fe8de3 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderItemPane.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderItemPane.java @@ -340,10 +340,10 @@ public class FolderItemPane extends SegmentedPanel if ( e.getSource() == m_folderCreator && m_folderCreator.isCancelled(s) ) { browseMode(s); - throw new FormProcessException( (String) GlobalizationUtil.globalize("cms.ui.cancelled").localize()); + throw new FormProcessException(GlobalizationUtil.globalize("cms.ui.cancelled")); } else if (e.getSource() == m_folderEditor && m_folderEditor.isCancelled(s)) { browseMode(s); - throw new FormProcessException( (String) GlobalizationUtil.globalize("cms.ui.cancelled").localize()); + throw new FormProcessException(GlobalizationUtil.globalize("cms.ui.cancelled")); } else if ( e.getSource() == m_folderManip.getTargetSelector() ) { // This only works if this submission listener is run // after the target selector's one diff --git a/ccm-cms/src/com/arsdigita/cms/ui/type/SelectType.java b/ccm-cms/src/com/arsdigita/cms/ui/type/SelectType.java index 322c6f560..9626022ac 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/type/SelectType.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/type/SelectType.java @@ -121,7 +121,7 @@ public class SelectType extends CMSForm public void submitted(FormSectionEvent event) throws FormProcessException { PageState state = event.getPageState(); if (isCancelled(state)) { - throw new FormProcessException("cancelled"); + throw new FormProcessException(GlobalizationUtil.globalize("cms.ui.cancelled")); } } diff --git a/ccm-cms/src/com/arsdigita/cms/ui/util/UniqueStringValidationListener.java b/ccm-cms/src/com/arsdigita/cms/ui/util/UniqueStringValidationListener.java index 78c00594d..4f08a1082 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/util/UniqueStringValidationListener.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/util/UniqueStringValidationListener.java @@ -23,6 +23,7 @@ import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.event.FormSectionEvent; import com.arsdigita.bebop.event.FormValidationListener; import com.arsdigita.bebop.form.Widget; +import com.arsdigita.cms.util.GlobalizationUtil; /** @@ -35,7 +36,7 @@ public abstract class UniqueStringValidationListener implements FormValidationListener { private final static String ERROR_MSG = - "Unique string value constraint violation."; + "cms.ui.unique_string_violation"; private Widget m_widget; private String m_errorMsg; @@ -90,7 +91,7 @@ public abstract class UniqueStringValidationListener String value = (String) m_widget.getValue(state); if ( !isUnique(state, value) ) { - throw new FormProcessException(m_errorMsg); + throw new FormProcessException(GlobalizationUtil.globalize(m_errorMsg)); } } diff --git a/ccm-cms/src/com/arsdigita/cms/ui/workflow/TaskFinishForm.java b/ccm-cms/src/com/arsdigita/cms/ui/workflow/TaskFinishForm.java index b5180d7ec..5ce2d16d0 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/workflow/TaskFinishForm.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/workflow/TaskFinishForm.java @@ -32,6 +32,7 @@ import com.arsdigita.bebop.parameters.BooleanParameter; import com.arsdigita.cms.ContentSection; import com.arsdigita.cms.ContentCenter; import com.arsdigita.cms.ui.ContentItemPage; +import com.arsdigita.cms.util.GlobalizationUtil; import com.arsdigita.cms.workflow.CMSEngine; import com.arsdigita.cms.workflow.CMSTask; import com.arsdigita.cms.workflow.CMSTaskType; @@ -116,7 +117,8 @@ public final class TaskFinishForm extends CommentAddForm { final CMSTask task = m_task.getTask(state); if (requiresApproval(task) && m_approve.getValue(state) == null) { - throw new FormProcessException(lz("cms.ui.workflow.task.approval_or_reject_required")); + throw new FormProcessException(GlobalizationUtil.globalize( + "cms.ui.workflow.task.approval_or_reject_required")); } } }