diff --git a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/WorkspaceResources.properties b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/WorkspaceResources.properties index 12c88c18b..761343918 100755 --- a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/WorkspaceResources.properties +++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/WorkspaceResources.properties @@ -33,3 +33,5 @@ cw.workspace.default_layout=Layout cw.workspace.ui.categorized.create_workspace.info=Currently there is no Portal Workspace for this category. If you want to create one now, please click the link below. cw.workspace.ui.categorized.create_workspace.link=Create PortalWorkspace for this category cw.workspace.ui.categorized.workspace.add_row.link=Add new row +portal.ui.cancelled=Cancelled +portal.ui.skip=Skip diff --git a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/WorkspaceResources_de.properties b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/WorkspaceResources_de.properties index 1eecf6658..33b6471af 100755 --- a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/WorkspaceResources_de.properties +++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/WorkspaceResources_de.properties @@ -33,3 +33,5 @@ cw.workspace.default_layout=Layout cw.workspace.ui.categorized.create_workspace.info=Es gibt noch keinen Portal Workspace f\u00fcr diese Kategorie. Wenn Sie jetzt einen neuen Workspace f\u00fcr diese Kategorie anlegen m\u00f6chten klicken Sie bitte auf untenstehenden Link. cw.workspace.ui.categorized.create_workspace.link=PortalWorkspace f\u00fcr diese Kategorie anlegen cw.workspace.ui.categorized.workspace.add_row.link=Weitere Zeile hinzuf\u00fcgen +portal.ui.cancelled=Abgebrochen +portal.ui.skip=\u00dcberspringen diff --git a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/WorkspaceResources_en.properties b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/WorkspaceResources_en.properties index 12c88c18b..761343918 100755 --- a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/WorkspaceResources_en.properties +++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/WorkspaceResources_en.properties @@ -33,3 +33,5 @@ cw.workspace.default_layout=Layout cw.workspace.ui.categorized.create_workspace.info=Currently there is no Portal Workspace for this category. If you want to create one now, please click the link below. cw.workspace.ui.categorized.create_workspace.link=Create PortalWorkspace for this category cw.workspace.ui.categorized.workspace.add_row.link=Add new row +portal.ui.cancelled=Cancelled +portal.ui.skip=Skip diff --git a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/WorkspaceResources_fr.properties b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/WorkspaceResources_fr.properties index 12c88c18b..761343918 100755 --- a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/WorkspaceResources_fr.properties +++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/WorkspaceResources_fr.properties @@ -33,3 +33,5 @@ cw.workspace.default_layout=Layout cw.workspace.ui.categorized.create_workspace.info=Currently there is no Portal Workspace for this category. If you want to create one now, please click the link below. cw.workspace.ui.categorized.create_workspace.link=Create PortalWorkspace for this category cw.workspace.ui.categorized.workspace.add_row.link=Add new row +portal.ui.cancelled=Cancelled +portal.ui.skip=Skip diff --git a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/ApplicationSelector.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/ApplicationSelector.java index 0344148d3..bc4fd28a5 100755 --- a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/ApplicationSelector.java +++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/ApplicationSelector.java @@ -30,6 +30,7 @@ import com.arsdigita.bebop.form.Option; import com.arsdigita.bebop.FormProcessException; import com.arsdigita.bebop.SaveCancelSection; import com.arsdigita.bebop.SimpleContainer; +import com.arsdigita.cms.util.GlobalizationUtil; import com.arsdigita.kernel.Kernel; import com.arsdigita.kernel.Party; import com.arsdigita.kernel.permissions.PermissionService; @@ -40,6 +41,7 @@ import com.arsdigita.web.Application; import com.arsdigita.web.ApplicationCollection; import com.arsdigita.london.util.ui.parameters.DomainObjectParameter; +import com.arsdigita.portalworkspace.util.GlobalizationUtil; import java.util.TooManyListenersException; @@ -114,7 +116,7 @@ public class ApplicationSelector extends Form { if (m_buttons.getCancelButton().isSelected(e.getPageState())) { s_log.debug("Firing event for cancel"); fireCompletionEvent(e.getPageState()); - throw new FormProcessException("canncelled"); + throw new FormProcessException(GlobalizationUtil.globalize("portal.ui.cancelled")); } s_log.debug("Falling through for process"); } diff --git a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/WorkspaceCreateForm.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/WorkspaceCreateForm.java index 7bb000c6c..7ae761a26 100644 --- a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/WorkspaceCreateForm.java +++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/WorkspaceCreateForm.java @@ -35,6 +35,7 @@ import com.arsdigita.globalization.GlobalizedMessage; import com.arsdigita.persistence.OID; import com.arsdigita.portalworkspace.PageLayout; import com.arsdigita.portalworkspace.Workspace; +import com.arsdigita.portalworkspace.util.GlobalizationUtil; import com.arsdigita.toolbox.ui.OIDParameter; import com.arsdigita.ui.admin.applications.ApplicationCreateForm; import com.arsdigita.util.UncheckedWrapperException; @@ -92,7 +93,7 @@ public class WorkspaceCreateForm extends ApplicationCreateForm { if (getSaveCancelSection().getCancelButton().isSelected(state)) { layout.setValue(state, ""); - throw new FormProcessException("Canceled"); + throw new FormProcessException(GlobalizationUtil.globalize("portal.ui.cancelled")); } } diff --git a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/portlet/RSSFeedPortletEditor.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/portlet/RSSFeedPortletEditor.java index 4106ed798..1f0988550 100755 --- a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/portlet/RSSFeedPortletEditor.java +++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/portlet/RSSFeedPortletEditor.java @@ -29,6 +29,7 @@ import com.arsdigita.bebop.event.FormSubmissionListener; import com.arsdigita.kernel.Resource; import com.arsdigita.kernel.ResourceType; import com.arsdigita.kernel.ui.ResourceConfigComponent; +import com.arsdigita.portalworkspace.util.GlobalizationUtil; public class RSSFeedPortletEditor extends ResourceConfigComponent { @@ -83,11 +84,15 @@ public class RSSFeedPortletEditor extends ResourceConfigComponent { if (m_buttons.getCancelButton().isSelected(state)) { fireCompletionEvent(state); - throw new FormProcessException("cancelled"); + throw new FormProcessException( + GlobalizationUtil.globalize( + "portal.ui.cancelled")); } else if (m_section.isBrowsePressed(state)) { m_form.setVisible(state, false); m_browser.setVisible(state, true); - throw new FormProcessException("skip"); + throw new FormProcessException( + GlobalizationUtil.globalize( + "portal.ui.skip")); } } });