LibreCCM
/
libreccm
3
0
Fork 0
Code Issues 10 Pull Requests Packages Releases Wiki Activity

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
pull/2/head
baka 2016-10-06 11:07:06 +00:00
parent ddc5d62a4b
commit b4fa3a5d77
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ccm-cms/src/main/java/com/arsdigita/cms/ui/PartyAddForm.java
View File

@ -43,6 +43,7 @@ import com.arsdigita.ui.admin.GlobalizationUtil;
import com.arsdigita.util.UncheckedWrapperException; import com.arsdigita.util.UncheckedWrapperException;
import com.arsdigita.xml.Element; import com.arsdigita.xml.Element;
import org.libreccm.security.Party; import org.libreccm.security.Party;
import org.librecms.CmsConstants;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.List; import java.util.List;
@ -64,6 +65,7 @@ public abstract class PartyAddForm extends SimpleContainer
private final static String SUBMIT = "addSubmit"; private final static String SUBMIT = "addSubmit";
private final static String CANCEL = "addCancel"; private final static String CANCEL = "addCancel";
private final static String SUBMIT_LABEL = "Add Members"; private final static String SUBMIT_LABEL = "Add Members";
private final static String CANCEL_LABEL = "Cancel";
private Widget m_search; private Widget m_search;
private RequestLocal m_query; private RequestLocal m_query;
@ -164,9 +166,9 @@ public abstract class PartyAddForm extends SimpleContainer
// Submit and Cancel buttons. // Submit and Cancel buttons.
SimpleContainer s = new SimpleContainer(); 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); 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); s.add(m_cancel);
form.add(s, ColumnPanel.FULL_WIDTH | ColumnPanel.CENTER); form.add(s, ColumnPanel.FULL_WIDTH | ColumnPanel.CENTER);

2
ccm-cms/src/main/java/com/arsdigita/cms/ui/role/BaseRoleForm.java
View File

@ -92,7 +92,7 @@ class BaseRoleForm extends BaseForm {
final List<String> possiblePrivileges = permissionManager.listDefiniedPrivileges(CmsConstants.class); final List<String> possiblePrivileges = permissionManager.listDefiniedPrivileges(CmsConstants.class);
for (final String privilege : possiblePrivileges) { 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))));
} }
} }
} }