Changes to localise strings in creating groups (Site Info tool) SAK-3…

…1125 (sakaiproject#2587)
jonny-irving · May 30, 2016 · 3b7ff1c · 3b7ff1c
1 parent 390ba17
commit 3b7ff1c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/...l/src/bundle/org/sakaiproject/site/tool/managegroupsectionrole/bundle/Messages.properties b/...l/src/bundle/org/sakaiproject/site/tool/managegroupsectionrole/bundle/Messages.properties
@@ -7,6 +7,8 @@ group.number = Size (Max)
 group.newgroup = Create New Group
 group.editgroup = Edit Group
 group.nogroup = There are no groups defined.
+group.role_prefix = Role: 
+group.section_prefix = Section: 
 editgroup.instruction = Select members of the site member list and add to group. Select members of group list and remove. Click {0} to save changes.
 editgroup.membership = Membership
 editgroup.remove = Remove?

diff --git a/.../java/org/sakaiproject/site/tool/helper/managegroupsectionrole/rsf/GroupEditProducer.java b/.../java/org/sakaiproject/site/tool/helper/managegroupsectionrole/rsf/GroupEditProducer.java
@@ -59,9 +59,6 @@ public class GroupEditProducer implements ViewComponentProducer, ActionResultInt
 	/** Our log (commons). */
 	private static final Logger M_log = LoggerFactory.getLogger(GroupEditProducer.class);
 
-	private static final String SECTION_PREFIX = "Section: ";
-	private static final String ROLE_PREFIX = "Role: ";
-
     public SiteManageGroupSectionRoleHandler handler;
     public static final String VIEW_ID = "GroupEdit";
     public MessageLocator messageLocator;
@@ -238,7 +235,7 @@ public void fillComponents(UIContainer arg0, ViewParameters arg1, ComponentCheck
 			 // not include in the group yet
 			 if ((groupProviderId == null || !groupProviderId.contains(roster)) && !membersSelected.contains( roster ))
 			 {
-				 siteMemberLabels.add( SECTION_PREFIX + handler.getRosterLabel(roster) + " (" + roster + ")");
+				 siteMemberLabels.add( messageLocator.getMessage("group.section_prefix") + handler.getRosterLabel(roster) + " (" + roster + ")");
 				 siteMemberValues.add( roster );
 			 }
 		 }
@@ -248,7 +245,7 @@ public void fillComponents(UIContainer arg0, ViewParameters arg1, ComponentCheck
 			 // not include in the group yet
 			 if ((groupRoleProviderRoles == null || !groupRoleProviderRoles.contains(role.getId())) && !membersSelected.contains( role.getId() ))
 			 {
-				 siteMemberLabels.add( ROLE_PREFIX + role.getId() );
+				 siteMemberLabels.add( messageLocator.getMessage("group.role_prefix") + role.getId() );
 				 siteMemberValues.add( role.getId() );
 			 }
 		 }
@@ -302,7 +299,7 @@ public void fillComponents(UIContainer arg0, ViewParameters arg1, ComponentCheck
 		 {
 			 for (String groupRoster:groupRosters)
 			 {
-				 groupMemberLabels.add( SECTION_PREFIX + handler.getRosterLabel(groupRoster) + " (" + groupRoster + ")" );
+				 groupMemberLabels.add( messageLocator.getMessage("group.section_prefix") + handler.getRosterLabel(groupRoster) + " (" + groupRoster + ")" );
 				 groupMemberValues.add( groupRoster );
 			 }
 		 }
@@ -311,7 +308,7 @@ public void fillComponents(UIContainer arg0, ViewParameters arg1, ComponentCheck
 		 {
 			 for (String groupProviderRole:groupProviderRoles)
 			 {
-				 groupMemberLabels.add( ROLE_PREFIX + groupProviderRole );
+				 groupMemberLabels.add( messageLocator.getMessage("group.role_prefix") + groupProviderRole );
 				 groupMemberValues.add( groupProviderRole );
 			 }
 		 }
@@ -345,14 +342,14 @@ public void fillComponents(UIContainer arg0, ViewParameters arg1, ComponentCheck
                 // Selected roster...
                 if( siteRosters.contains( memberID ) )
                 {
-                    groupMemberLabels.add( SECTION_PREFIX + handler.getRosterLabel(memberID) + " (" + memberID + ")" );
+                    groupMemberLabels.add( messageLocator.getMessage("group.section_prefix") + handler.getRosterLabel(memberID) + " (" + memberID + ")" );
                     groupMemberValues.add( memberID );
                 }
 
                 // Selected role...
                 else if( siteRoleIDs.contains( memberID ) )
                 {
-                    groupMemberLabels.add( ROLE_PREFIX + memberID );
+                    groupMemberLabels.add( messageLocator.getMessage("group.role_prefix") + memberID );
                     groupMemberValues.add( memberID );
                 }