diff --git a/bigbluebutton-client/locale/en_US/bbbResources.properties b/bigbluebutton-client/locale/en_US/bbbResources.properties index 17074f73dd49c2ab3ebe184f14ba59574cbeefe9..ca5b6b4fc110b62d7911adf329d2086a2654750f 100755 --- a/bigbluebutton-client/locale/en_US/bbbResources.properties +++ b/bigbluebutton-client/locale/en_US/bbbResources.properties @@ -13,7 +13,12 @@ bbb.micSettings.microphone.header = Test Microphone bbb.micSettings.playSound = Test Speakers bbb.micSettings.playSound.toolTip = Play music to test your speakers bbb.micSettings.hearFromHeadset = You should hear audio in your headset, not your computer speakers. -bbb.micSettings.speakIntoMic = Test or change your microphone (headset recommended). +bbb.micSettings.speakIntoMic = Speak into your microphone. If you are using a headset, you should hear audio from your headset and not from your computer speakers. +bbb.micSettings.echoTestMicPrompt = Do you hear any audio? +bbb.micSettings.echoTestAudioYes = Yes +bbb.micSettings.echoTestAudioNo = No +bbb.micSettings.speakIntoMicTestLevel = Speak into your microphone. You should see the bar move. If not, choose another mic. +bbb.micSettings.recommendHeadset = Recommend you use a headset or earbuds. Otherwise, you will create echo. bbb.micSettings.changeMic = Test or Change Microphone bbb.micSettings.changeMic.toolTip = Open the Flash Player microphone settings dialog box bbb.micSettings.comboMicList.toolTip = Select a microphone diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/FlashMicSettings.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/FlashMicSettings.mxml index fa56f0b7343258e6c51f0c9b3da003ba0317a084..d3a0299b7b39948efb30be220b741655ba11c350 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/main/views/FlashMicSettings.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/FlashMicSettings.mxml @@ -141,7 +141,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>. //http://groups.yahoo.com/neo/groups/flexcoders/conversations/topics/144047 mic.gain = micRecordVolume.value; - statusText.text = "Please speak to your mic to see f you get a green bar."; break; default: LogUtil.debug("unknown micStatusHandler event: " + event); @@ -284,7 +283,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>. <mx:states> <mx:State name="{FLASH_ECHO_TEST_STATE}"> - <mx:AddChild relativeTo="statusText" position="after"> + <mx:AddChild relativeTo="displayMicNextToThis" position="after"> <mx:VBox id="flashEchoTest" width="100%" height="100%"> <mx:HBox width="100%"> <mx:Text width="100%" text="{ResourceUtil.getInstance().getString('bbb.micSettings.speakIntoMic')}" @@ -293,10 +292,12 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>. <mx:HRule width="100%"/> <mx:Spacer height="10"/> <mx:HBox width="100%" horizontalAlign="right" horizontalGap="18"> - <mx:Button id="yesButton" label="Yes" + <mx:Text width="100%" text="{ResourceUtil.getInstance().getString('bbb.micSettings.echoTestMicPrompt')}" + styleName="micSettingsWindowSpeakIntoMicLabelStyle" /> + <mx:Button id="yesButton" label="{ResourceUtil.getInstance().getString('bbb.micSettings.echoTestAudioYes')}" click="yesButtonClicked()" styleName="micSettingsWindowPlaySoundButtonStyle" toolTip=""/> - <mx:Button id="noButton" label="No" + <mx:Button id="noButton" label="{ResourceUtil.getInstance().getString('bbb.micSettings.echoTestAudioNo')}" styleName="micSettingsWindowPlaySoundButtonStyle" click="noButtonClicked()" toolTip=""/> @@ -306,9 +307,11 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>. </mx:State> <mx:State name="{FLASH_MIC_SETTING_STATE}"> - <mx:AddChild relativeTo="statusText" position="after" > + <mx:AddChild relativeTo="displayMicNextToThis" position="after" > <!-- Flash Microphone --> <mx:VBox id="flashMicSettings" width="100%" height="100%" creationComplete="flashMicSettingsCreated()"> + <mx:Text id="statusText" width="100%" text="{ResourceUtil.getInstance().getString('bbb.micSettings.speakIntoMicTestLevel')}" + styleName="micSettingsWindowHearFromHeadsetLabelStyle"/> <mx:HBox> <mx:ComboBox id="comboMicList" dataProvider="{microphoneList}" change="selectMicrophone(event)" @@ -344,14 +347,13 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>. accessibilityName="{ResourceUtil.getInstance().getString('bbb.micSettings.access.helpButton')}"/> </mx:Canvas> <mx:HBox width="100%"> - <mx:Text width="100%" text="Recommend you use a headset or earbuds. Otherwise, you will create echo." + <mx:Text width="100%" text="{ResourceUtil.getInstance().getString('bbb.micSettings.recommendHeadset')}" styleName="micSettingsWindowSpeakIntoMicLabelStyle" /> <mx:Image source="@Embed('assets/headset-earbuds.png')"/> </mx:HBox> - <mx:HRule width="100%"/> - <mx:Text id="statusText" width="100%" text="Please select a microphone that generates a colored bar." - styleName="micSettingsWindowHearFromHeadsetLabelStyle"/> + <mx:HRule id="displayMicNextToThis" width="100%"/> + <!-- Play Sound, Join and Cancel buttons --> diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/WebRtcEchoTest.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/WebRtcEchoTest.mxml index d2a85e8cb3ef3d7a8d054538a71ce6a119d7fc91..945891f4979fd63a96351cd66f4d7d624eb90265 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/main/views/WebRtcEchoTest.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/WebRtcEchoTest.mxml @@ -100,7 +100,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>. accessibilityName="{ResourceUtil.getInstance().getString('bbb.micSettings.access.helpButton')}"/> </mx:Canvas> <mx:HBox width="100%"> - <mx:Text width="100%" text="Recommend you use a headset or earbuds. Otherwise, you will create echo." + <mx:Text width="100%" text="{ResourceUtil.getInstance().getString('bbb.micSettings.recommendHeadset')}" styleName="micSettingsWindowSpeakIntoMicLabelStyle" /> <mx:Image source="@Embed('assets/headset-earbuds.png')"/> </mx:HBox> @@ -108,18 +108,16 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>. <mx:Text width="100%" text="{ResourceUtil.getInstance().getString('bbb.micSettings.speakIntoMic')}" styleName="micSettingsWindowSpeakIntoMicLabelStyle" /> </mx:HBox> - <mx:HBox width="100%"> - <mx:Text width="100%" text="{ResourceUtil.getInstance().getString('bbb.micSettings.hearFromHeadset')}" - styleName="micSettingsWindowHearFromHeadsetLabelStyle"/> - </mx:HBox> <mx:HRule width="100%"/> <mx:Spacer height="10"/> <mx:HBox width="100%" horizontalAlign="right" horizontalGap="18"> - <mx:Button id="yesButton" label="Yes" + <mx:Text width="100%" text="{ResourceUtil.getInstance().getString('bbb.micSettings.echoTestMicPrompt')}" + styleName="micSettingsWindowSpeakIntoMicLabelStyle" /> + <mx:Button id="yesButton" label="{ResourceUtil.getInstance().getString('bbb.micSettings.echoTestAudioYes')}" click="yesButtonClicked()" styleName="micSettingsWindowPlaySoundButtonStyle" toolTip=""/> <mx:Button id="noButton" - label="No" + label="{ResourceUtil.getInstance().getString('bbb.micSettings.echoTestAudioNo')}" styleName="micSettingsWindowPlaySoundButtonStyle" click="noButtonClicked()" toolTip=""/>