Index: messageforums-component-impl/src/java/org/sakaiproject/component/app/messageforums/MembershipManagerImpl.java =================================================================== --- messageforums-component-impl/src/java/org/sakaiproject/component/app/messageforums/MembershipManagerImpl.java (revision 66162) +++ messageforums-component-impl/src/java/org/sakaiproject/component/app/messageforums/MembershipManagerImpl.java (revision 66070) @@ -49,8 +49,6 @@ import org.sakaiproject.user.api.UserDirectoryService; import org.sakaiproject.user.api.UserNotDefinedException; -import org.sakaiproject.util.ResourceLoader; - public class MembershipManagerImpl implements MembershipManager{ private static final Log LOG = LogFactory.getLog(MembershipManagerImpl.class); @@ -61,10 +59,6 @@ private ToolManager toolManager; private SecurityService securityService; private PrivacyManager privacyManager; - - private static final String MESSAGECENTER_BUNDLE = "org.sakaiproject.api.app.messagecenter.bundle.Messages"; - private ResourceLoader rl = new ResourceLoader(MESSAGECENTER_BUNDLE); - public void init() { LOG.info("init()"); @@ -190,9 +184,7 @@ if (includeAllParticipantsMember){ MembershipItem memberAll = MembershipItem.getInstance(); memberAll.setType(MembershipItem.TYPE_ALL_PARTICIPANTS); - //memberAll.setName(MembershipItem.ALL_PARTICIPANTS_DESC); - memberAll.setName(rl.getString("all_participants_desc")); - + memberAll.setName(MembershipItem.ALL_PARTICIPANTS_DESC); returnMap.put(memberAll.getId(), memberAll); } @@ -220,8 +212,7 @@ Group currentGroup = (Group) groupIterator.next(); MembershipItem member = MembershipItem.getInstance(); member.setType(MembershipItem.TYPE_GROUP); - //member.setName(currentGroup.getTitle() + " Group"); - member.setName(rl.getFormattedMessage("participants_group_desc",new Object[]{currentGroup.getTitle()})); + member.setName(currentGroup.getTitle() + " Group"); member.setGroup(currentGroup); returnMap.put(member.getId(), member); } @@ -237,8 +228,7 @@ if (roleId != null && roleId.length() > 0){ roleId = roleId.substring(0,1).toUpperCase() + roleId.substring(1); } -// member.setName(roleId + " Role"); - member.setName(rl.getFormattedMessage("participants_role_desc",new Object[]{roleId})); + member.setName(roleId + " Role"); member.setRole(role); returnMap.put(member.getId(), member); } Index: messageforums-api/src/bundle/org/sakaiproject/api/app/messagecenter/bundle/Messages_es.properties =================================================================== --- messageforums-api/src/bundle/org/sakaiproject/api/app/messagecenter/bundle/Messages_es.properties (revision 66162) +++ messageforums-api/src/bundle/org/sakaiproject/api/app/messagecenter/bundle/Messages_es.properties (revision 66070) @@ -542,8 +542,4 @@ stat_sort_by_topic=Ordenar por Tema stat_topic_title=T\u00EDtulo del tema -cdfm_state_inconsistent=No es posible completar su petici\u00F3n porque parece ser que usted est\u00E1 usando m\u00FAltiples pesta\u00F1as. Por favor, cierre todos sus navegadores e int\u00E9ntelo de nuevo. Si usted no estuviera usando m\u00FAltiples pesta\u00F1as, por favor, contacte con el administrador. - -all_participants_desc=Todos los componentes -participants_group_desc=Grupo {0} -participants_role_desc=Todos los {0} \ No newline at end of file +cdfm_state_inconsistent=No es posible completar su petici\u00F3n porque parece ser que usted est\u00E1 usando m\u00FAltiples pesta\u00F1as. Por favor, cierre todos sus navegadores e int\u00E9ntelo de nuevo. Si usted no estuviera usando m\u00FAltiples pesta\u00F1as, por favor, contacte con el administrador. \ No newline at end of file Index: messageforums-api/src/bundle/org/sakaiproject/api/app/messagecenter/bundle/Messages.properties =================================================================== --- messageforums-api/src/bundle/org/sakaiproject/api/app/messagecenter/bundle/Messages.properties (revision 66162) +++ messageforums-api/src/bundle/org/sakaiproject/api/app/messagecenter/bundle/Messages.properties (revision 66070) @@ -547,7 +547,4 @@ ################################## ### FIN PROPERTIES PROPIAS UPV ### -################################## -all_participants_desc=All Participants -participants_group_desc={0} Group -participants_role_desc= All {0} \ No newline at end of file +################################## \ No newline at end of file Index: messageforums-api/src/bundle/org/sakaiproject/api/app/messagecenter/bundle/Messages_ca.properties =================================================================== --- messageforums-api/src/bundle/org/sakaiproject/api/app/messagecenter/bundle/Messages_ca.properties (revision 66162) +++ messageforums-api/src/bundle/org/sakaiproject/api/app/messagecenter/bundle/Messages_ca.properties (revision 66070) @@ -524,8 +524,3 @@ ################################## ### FIN PROPERTIES PROPIES UPV ### ################################## - - -all_participants_desc=Tots els participants -participants_group_desc= Grup {0} -participants_role_desc= Tots {0} \ No newline at end of file Index: messageforums-app/src/java/org/sakaiproject/tool/messageforums/PrivateMessagesTool.java =================================================================== --- messageforums-app/src/java/org/sakaiproject/tool/messageforums/PrivateMessagesTool.java (revision 66162) +++ messageforums-app/src/java/org/sakaiproject/tool/messageforums/PrivateMessagesTool.java (revision 66070) @@ -1432,7 +1432,7 @@ getResourceBundleString("pvt_msg_fwd_authby", new Object[] {pm.getAuthor(), formattedCreateDate}) + "
" + getResourceBundleString("pvt_msg_fwd_to", new Object[] {pm.getRecipientsAsText()}) + "
" + getResourceBundleString("pvt_msg_fwd_subject", new Object[] {pm.getTitle()}) + "
" + - getResourceBundleString("pvt_msg_fwd_label", new Object[] {getResourceBundleString(pm.getLabel())}) + "
"); + getResourceBundleString("pvt_msg_fwd_label", new Object[] {pm.getLabel()}) + "
"); List attachList = getDetailMsg().getAttachList(); if (attachList != null && attachList.size() > 0) {