From 402ae851955ccb878c74880c4662919b40cb3ede Mon Sep 17 00:00:00 2001 From: Ingo Bauersachs Date: Sat, 9 Nov 2013 12:39:07 +0100 Subject: [PATCH] Placeholder for error received from message --- resources/languages/resources.properties | 2 +- .../gui/main/call/conference/BasicConferenceCallPanel.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/languages/resources.properties b/resources/languages/resources.properties index f3a91d36f..05355cf6d 100644 --- a/resources/languages/resources.properties +++ b/resources/languages/resources.properties @@ -199,7 +199,7 @@ service.gui.ENTER_PHONE_NUMBER=Enter phone number service.gui.ENTER_NAME_OR_NUMBER=Enter name or number service.gui.ERROR=Error service.gui.ERROR_WAS=Error was: {0} -service.gui.ERROR_RECEIVED_FROM=Error received from +service.gui.ERROR_RECEIVED_FROM=Error received from {0} service.gui.ESTIMATED_TIME=Estimated time: service.gui.EVENTS=Events service.gui.EXIT=E&xit diff --git a/src/net/java/sip/communicator/impl/gui/main/call/conference/BasicConferenceCallPanel.java b/src/net/java/sip/communicator/impl/gui/main/call/conference/BasicConferenceCallPanel.java index 5ed12e937..35f90354e 100644 --- a/src/net/java/sip/communicator/impl/gui/main/call/conference/BasicConferenceCallPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/call/conference/BasicConferenceCallPanel.java @@ -264,8 +264,8 @@ protected void conferenceMemberErrorReceived(CallPeerConferenceEvent ev) GuiActivator.getAlertUIService().showAlertPopup( GuiActivator.getResources().getI18NString( - "service.gui.ERROR_RECEIVED_FROM") - + callPeer.getDisplayName(), + "service.gui.ERROR_RECEIVED_FROM", + new String[]{callPeer.getDisplayName()}), ev.getErrorString()); }