From 392dc44fef64ed1c83731272f30916a360b00105 Mon Sep 17 00:00:00 2001 From: Danny van Heumen Date: Sun, 7 Dec 2014 21:05:36 +0100 Subject: [PATCH] i18n: Fix chat room member role name. --- .../impl/gui/main/chat/ChatContactRightButtonMenu.java | 5 +++-- .../impl/gui/main/contactlist/DefaultContactList.java | 9 ++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatContactRightButtonMenu.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatContactRightButtonMenu.java index 0f96aa9fb..64fb24242 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatContactRightButtonMenu.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatContactRightButtonMenu.java @@ -215,8 +215,9 @@ private void init() int roleIndex = role.getRoleIndex(); String roleName = role.getLocalizedRoleName(); - JLabel jl_username - = new JLabel(" "+chatContact.getName()+" ("+roleName+") "); + JLabel jl_username = + new JLabel(" " + chatContact.getName() + " (" + + GuiActivator.getResources().getI18NString(roleName) + ") "); jl_username.setFont(jl_username.getFont().deriveFont(Font.BOLD)); this.add(jl_username); diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/DefaultContactList.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/DefaultContactList.java index 1c5562e7a..41d858be3 100644 --- a/src/net/java/sip/communicator/impl/gui/main/contactlist/DefaultContactList.java +++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/DefaultContactList.java @@ -13,6 +13,7 @@ import javax.swing.*; import javax.swing.text.*; +import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.main.chat.*; import net.java.sip.communicator.impl.gui.main.chat.conference.*; import net.java.sip.communicator.plugin.desktoputil.*; @@ -190,10 +191,12 @@ else if (element instanceof ChatContact) if(descriptor instanceof ChatRoomMember) { ChatRoomMember member = (ChatRoomMember)descriptor; + String roleName = + GuiActivator.getResources().getI18NString( + member.getRole().getLocalizedRoleName()); - tip.addLine( - ChatContactRoleIcon.getRoleIcon(member.getRole()), - member.getRole().getLocalizedRoleName()); + tip.addLine(ChatContactRoleIcon.getRoleIcon(member.getRole()), + roleName); } }