diff --git a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/ApplicationSelector.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/ApplicationSelector.java index bc4fd28a5..8d3bda1a6 100755 --- a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/ApplicationSelector.java +++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/ApplicationSelector.java @@ -30,7 +30,6 @@ 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; @@ -39,7 +38,6 @@ import com.arsdigita.util.UncheckedWrapperException; import com.arsdigita.web.ApplicationType; import com.arsdigita.web.Application; import com.arsdigita.web.ApplicationCollection; - import com.arsdigita.london.util.ui.parameters.DomainObjectParameter; import com.arsdigita.portalworkspace.util.GlobalizationUtil; diff --git a/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorResources.properties b/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorResources.properties index be68896c7..1fbc378a3 100755 --- a/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorResources.properties +++ b/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorResources.properties @@ -40,3 +40,4 @@ theme.cancel_button_hint=Abort changes & reset the form. theme.cancel_button_pressed_msg=cancel pressed theme.form.url_can_contain_only_characters=The URL can only contain A-Z, a-z, 0-9, _, and -. theme.form.url_already_exists=A theme with this url already exists. +theme.cancelled=Cancelled diff --git a/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorResources_de.properties b/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorResources_de.properties index d27f27197..084adb6fc 100755 --- a/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorResources_de.properties +++ b/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorResources_de.properties @@ -40,3 +40,4 @@ theme.cancel_button_hint=Verwerfen der Eintragungen und R\u00fccksetzen des Form theme.cancel_button_pressed_msg=Vorgang abgebrochen theme.form.url_can_contain_only_characters=Die URL darf nur die Zeichen A-Z, a-z, 0-9, _ und - enthalten. theme.form.url_already_exists=Ein Theme mit dieser URL existiert bereits. +theme.cancelled=Abgebrochen diff --git a/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorResources_en.properties b/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorResources_en.properties index 21b381b5c..dc1f20446 100755 --- a/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorResources_en.properties +++ b/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorResources_en.properties @@ -40,3 +40,4 @@ theme.cancel_button_hint=Abort changes & reset the form. theme.cancel_button_pressed_msg=cancel pressed theme.form.url_can_contain_only_characters=The URL can only contain A-Z, a-z, 0-9, _, and -. theme.form.url_already_exists=A theme with this url already exists. +theme.cancelled=Cancelled diff --git a/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorResources_fr.properties b/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorResources_fr.properties index 21b381b5c..dc1f20446 100755 --- a/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorResources_fr.properties +++ b/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorResources_fr.properties @@ -40,3 +40,4 @@ theme.cancel_button_hint=Abort changes & reset the form. theme.cancel_button_pressed_msg=cancel pressed theme.form.url_can_contain_only_characters=The URL can only contain A-Z, a-z, 0-9, _, and -. theme.form.url_already_exists=A theme with this url already exists. +theme.cancelled=Cancelled diff --git a/ccm-themedirector/src/com/arsdigita/themedirector/ui/ThemeContainer.java b/ccm-themedirector/src/com/arsdigita/themedirector/ui/ThemeContainer.java index f561ad94e..5533f5741 100755 --- a/ccm-themedirector/src/com/arsdigita/themedirector/ui/ThemeContainer.java +++ b/ccm-themedirector/src/com/arsdigita/themedirector/ui/ThemeContainer.java @@ -20,7 +20,6 @@ package com.arsdigita.themedirector.ui; import com.arsdigita.themedirector.ui.listeners.ApproveThemeActionListener; import com.arsdigita.bebop.ActionLink; -import com.arsdigita.bebop.FormProcessException; import com.arsdigita.bebop.GridPanel; import com.arsdigita.bebop.Label; import com.arsdigita.bebop.Link; @@ -211,7 +210,7 @@ public class ThemeContainer extends SimpleContainer if (m_editForm.isCancelled(state)) { editFormLink.setVisible(state, true); m_editForm.setVisible(state, false); - throw new FormProcessException("cancelled"); + throw new FormProcessException(GlobalizationUtil.globalize("cancelled")); } } }); diff --git a/ccm-themedirector/src/com/arsdigita/themedirector/ui/listeners/CancelListener.java b/ccm-themedirector/src/com/arsdigita/themedirector/ui/listeners/CancelListener.java index e8c0c434b..7b673bda8 100755 --- a/ccm-themedirector/src/com/arsdigita/themedirector/ui/listeners/CancelListener.java +++ b/ccm-themedirector/src/com/arsdigita/themedirector/ui/listeners/CancelListener.java @@ -24,6 +24,7 @@ import com.arsdigita.toolbox.ui.ModalPanel; import com.arsdigita.bebop.event.FormSectionEvent; import com.arsdigita.bebop.event.FormSubmissionListener; import com.arsdigita.bebop.FormProcessException; +import com.arsdigita.themedirector.util.GlobalizationUtil; /** * This class is essentially a copy of the CancelListener @@ -43,7 +44,7 @@ public class CancelListener implements FormSubmissionListener { PageState state = event.getPageState(); if (m_form.isCancelled(state)) { m_modalPanel.pop(state); - throw new FormProcessException("cancelled"); + throw new FormProcessException(GlobalizationUtil.globalize("cancelled")); } } }