From b4fa3a5d775352594f0a343829f16f57b5f6a9a5 Mon Sep 17 00:00:00 2001 From: baka Date: Thu, 6 Oct 2016 11:07:06 +0000 Subject: [PATCH] Changed the construction of some GlobalizedMessages to use CMS_BUNDLE. Also adds CANCEL_LABEL in PartyAddForm to make it more structured. git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4361 8810af33-2d31-482b-a856-94f89814c4df --- .../src/main/java/com/arsdigita/cms/ui/PartyAddForm.java | 6 ++++-- .../main/java/com/arsdigita/cms/ui/role/BaseRoleForm.java | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/PartyAddForm.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/PartyAddForm.java index 21c0d7409..304d7f241 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/PartyAddForm.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/PartyAddForm.java @@ -43,6 +43,7 @@ import com.arsdigita.ui.admin.GlobalizationUtil; import com.arsdigita.util.UncheckedWrapperException; import com.arsdigita.xml.Element; import org.libreccm.security.Party; +import org.librecms.CmsConstants; import java.math.BigDecimal; import java.util.List; @@ -64,6 +65,7 @@ public abstract class PartyAddForm extends SimpleContainer private final static String SUBMIT = "addSubmit"; private final static String CANCEL = "addCancel"; private final static String SUBMIT_LABEL = "Add Members"; + private final static String CANCEL_LABEL = "Cancel"; private Widget m_search; private RequestLocal m_query; @@ -164,9 +166,9 @@ public abstract class PartyAddForm extends SimpleContainer // Submit and Cancel buttons. SimpleContainer s = new SimpleContainer(); - Submit m_submit = new Submit(SUBMIT, new GlobalizedMessage(SUBMIT_LABEL)); + Submit m_submit = new Submit(SUBMIT, new GlobalizedMessage(SUBMIT_LABEL, CmsConstants.CMS_BUNDLE)); s.add(m_submit); - m_cancel = new Submit(CANCEL, new GlobalizedMessage("Cancel")); + m_cancel = new Submit(CANCEL, new GlobalizedMessage(CANCEL_LABEL, CmsConstants.CMS_BUNDLE)); s.add(m_cancel); form.add(s, ColumnPanel.FULL_WIDTH | ColumnPanel.CENTER); diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/role/BaseRoleForm.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/role/BaseRoleForm.java index bb99f4891..4e5e16afe 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/role/BaseRoleForm.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/role/BaseRoleForm.java @@ -92,7 +92,7 @@ class BaseRoleForm extends BaseForm { final List possiblePrivileges = permissionManager.listDefiniedPrivileges(CmsConstants.class); for (final String privilege : possiblePrivileges) { - target.addOption(new Option(privilege, new Label(new GlobalizedMessage(privilege)))); + target.addOption(new Option(privilege, new Label(new GlobalizedMessage(privilege, CmsConstants.CMS_BUNDLE)))); } } }