diff --git a/bigbluebutton-client/locale/en_US/bbbResources.properties b/bigbluebutton-client/locale/en_US/bbbResources.properties index 1fb51ad9b63785bcb64d14fae4bbd15475bdfa76..0aca9990c6eacb6ffaeead4e19acbf9b4f9f3b09 100755 --- a/bigbluebutton-client/locale/en_US/bbbResources.properties +++ b/bigbluebutton-client/locale/en_US/bbbResources.properties @@ -91,6 +91,7 @@ bbb.listeners.title = Listeners{0} {1} bbb.listeners.pushToTalk.toolTip = Click to talk bbb.listeners.pushToMute.toolTip = Click to mute yourself bbb.listeners.talk=Talk +bbb.listeners.mute=Mute bbb.listeners.muteAllBtn.toolTip = Mute all bbb.listeners.unmuteAllBtn.toolTip = Unmute all bbb.listeners.ejectTooltip = Kick User diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/listeners/views/ListenersWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/listeners/views/ListenersWindow.mxml index 1e7e355100c01a208a94e54958069a37f72c3c85..666098ba0b04e8fdefd3dc4785563c7c28eb2d73 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/listeners/views/ListenersWindow.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/listeners/views/ListenersWindow.mxml @@ -207,7 +207,7 @@ click="toggleMuteMeState()" width="60" height="30"> <mx:HBox verticalAlign="middle" horizontalGap="0" paddingLeft="5" paddingTop="5" paddingRight="5" paddingBottom="5"> <mx:Image source="{UserManager.getInstance().getConference().voiceMuted ? images.sound_mute : images.sound_none}" /> - <mx:Label text="{ResourceUtil.getInstance().getString('bbb.listeners.talk')}" /> + <mx:Label text="{UserManager.getInstance().getConference().voiceMuted ? ResourceUtil.getInstance().getString('bbb.listeners.talk') : ResourceUtil.getInstance().getString('bbb.listeners.mute')}" /> </mx:HBox> </flc:CanvasButton> <mx:Spacer width="100%"/> diff --git a/bigbluebutton-client/src/org/bigbluebutton/util/i18n/ResourceUtil.as b/bigbluebutton-client/src/org/bigbluebutton/util/i18n/ResourceUtil.as index 6395b428100597fd0adcd8fd3ec743996f641b05..e7c61389dfdf19f583ab316d73bf53427de60285 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/util/i18n/ResourceUtil.as +++ b/bigbluebutton-client/src/org/bigbluebutton/util/i18n/ResourceUtil.as @@ -105,7 +105,9 @@ package org.bigbluebutton.util.i18n } private function load(language:String):IEventDispatcher { - var localeURI:String = 'locale/' + language + '_resources.swf'; + // Add a random string on the query so that we don't get a cached version. + var date:Date = new Date(); + var localeURI:String = 'locale/' + language + '_resources.swf?a=' + date.time; return resourceManager.loadResourceModule(localeURI, false); }