From f4a40ed80c69feacf3ac6f5dc77d30d8efaf55e1 Mon Sep 17 00:00:00 2001 From: DJP Date: Wed, 13 Jan 2010 01:55:10 +0000 Subject: [PATCH] Added missing locale string to ToolBar, Listener module and Presentation module git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3288 af16638f-c34d-0410-8cfa-b39d5352b314 --- .../locale/en_US/bbbResources.properties | 14 ++++++- .../locale/fr_FR/bbbResources.properties | 14 ++++++- .../view/components/ToolbarButton.mxml | 3 +- .../listeners/view/ListenersWindowMediator.as | 3 +- .../view/components/ListenerItem.mxml | 13 +++--- .../view/components/ListenersWindow.mxml | 7 ++-- .../phone/views/components/ToolbarButton.mxml | 3 +- .../present/views/FileUploadWindow.mxml | 41 ++++++++++--------- .../present/views/PresentationWindow.mxml | 20 ++++----- .../videoconf/views/ToolbarButton.mxml | 3 +- 10 files changed, 74 insertions(+), 47 deletions(-) diff --git a/bigbluebutton-client/locale/en_US/bbbResources.properties b/bigbluebutton-client/locale/en_US/bbbResources.properties index d1b6235963..2b38aab2c4 100644 --- a/bigbluebutton-client/locale/en_US/bbbResources.properties +++ b/bigbluebutton-client/locale/en_US/bbbResources.properties @@ -53,12 +53,15 @@ bbb.viewers.raiseHandBtn.toolTip = Click to raise hand. # Presentation ## PresentationWindow.mxml bbb.presentation.title = Presentation -bbb.presentation.uploadPresBtn.toolTip = Upload PDF document for presentation. +bbb.presentation.uploadPresBtn = Upload a document for presentation. +bbb.presentation.uploadPresBtn.toolTip = Upload a document for presentation. bbb.presentation.backBtn.toolTip = Previous slide. bbb.presentation.slideNumLbl = bbb.presentation.forwardBtn.toolTip = Next slide bbb.presentation.resetZoomBtn.toolTip = Reset Zoom bbb.presentation.presenterNameLbl = {0} is currently presenting. +bbb.presentation.maximizeRestoreBtn.toolTip = Maximize this window +bbb.presentation.maximizeRestoreBtn.toolTip2 = Restore to previous size ## PresentationWindowMediator.as bbb.presentation.presenting = {0} is currently presenting. @@ -82,7 +85,7 @@ bbb.presentation.error.convert.thumbnail = Error When Creating Thumbnail. Please bbb.presentation.converted = Converted {0} of {1} slides. bbb.presentation.extracting = Extracting slide {0} of {1} slides. bbb.presentation.ok = OK -bbb.presentation.uploadwindow.presentationfile = PRESENTATION FILE +bbb.presentation.uploadwindow.presentationfile = Presentation file bbb.presentation.uploadwindow.pdf = PDF bbb.presentation.uploadwindow.word = WORD bbb.presentation.uploadwindow.excel = EXCEL @@ -123,6 +126,8 @@ bbb.listeners.title = Voice Participants bbb.listeners.muteAllBtn.toolTip = Mute all bbb.listeners.unmuteAllBtn.toolTip = Unmute all bbb.listeners.ejectBtn.toolTip = Select voice participant to eject. +bbb.listeners.nameLabel.toolTip = Select this user and click button to mute or unmute. +bbb.listeners.ejectTooltip = Click to eject user. # ListenerItem.mxml bbb.listenerItem.nameLbl.toolTip = Select this user and click button to mute or unmute. @@ -135,3 +140,8 @@ bbb.publishVideo.startPublishBtn.toolTip = start streaming # DesktopPublishWindow.mxml bbb.desktopPublish.title = Desktop Sharing + +# ToolbarButton.mxml +bbb.toolbar.phone.toolTip = Start My Microphone +bbb.toolbar.deskshare.toolTip = Share your desktop +bbb.toolbar.video.toolTip = Start My Camera \ No newline at end of file diff --git a/bigbluebutton-client/locale/fr_FR/bbbResources.properties b/bigbluebutton-client/locale/fr_FR/bbbResources.properties index 2fa8d590e0..591460d25e 100755 --- a/bigbluebutton-client/locale/fr_FR/bbbResources.properties +++ b/bigbluebutton-client/locale/fr_FR/bbbResources.properties @@ -53,12 +53,15 @@ bbb.viewers.raiseHandBtn.toolTip = Cliquez-ici pour lever la main et demander la # Presentation ## PresentationWindow.mxml bbb.presentation.title = Présentation -bbb.presentation.uploadPresBtn.toolTip = Envoyez un document pour présentation. +bbb.presentation.uploadPresBtn = Envoyez un document à présenter +bbb.presentation.uploadPresBtn.toolTip = Envoyez un document à présenter bbb.presentation.backBtn.toolTip = Slide précédent. bbb.presentation.slideNumLbl = bbb.presentation.forwardBtn.toolTip = Slide suivant bbb.presentation.resetZoomBtn.toolTip = Zoom par défaut bbb.presentation.presenterNameLbl = {0} est actuellement présentateur. +bbb.presentation.maximizeRestoreBtn.toolTip = Agrandir cette fenêtre +bbb.presentation.maximizeRestoreBtn.toolTip2 = Restaurer à sa taille précédente ## PresentationWindowMediator.as bbb.presentation.presenting = {0} est en ce moment présentateur. @@ -123,6 +126,8 @@ bbb.listeners.title = Participants conférence voix bbb.listeners.muteAllBtn.toolTip = Rendre tout le monde muet bbb.listeners.unmuteAllBtn.toolTip = Rendre la parole à tout le monde bbb.listeners.ejectBtn.toolTip = Selectionnez un participant à expulser. +bbb.listeners.nameLabel.toolTip = Select this user and click button to mute or unmute. +bbb.listeners.ejectTooltip = Cliquer pour ejecter ce participant. # ListenerItem.mxml bbb.listenerItem.nameLbl.toolTip = Selectionnez un utilisateur et cliquez sur le bouton Select this user and click button to mute or unmute. @@ -130,8 +135,13 @@ bbb.listenerItem.talkImg.toolTip = Parler # PublishWindow.mxml bbb.publishVideo.title = Webcam / Visio conférence -bbb.publishVideo.startPublishBtn.toolTip = Démarrer ma caméra +bbb.publishVideo.startPublishBtn.toolTip = Activer ma webcam # DesktopPublishWindow.mxml bbb.desktopPublish.title = Partage de bureau + +# ToolbarButton.mxml +bbb.toolbar.phone.toolTip = Activer mon microphone +bbb.toolbar.deskshare.toolTip = Partager votre bureau +bbb.toolbar.video.toolTip = Activer ma webcam diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/deskShare/view/components/ToolbarButton.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/deskShare/view/components/ToolbarButton.mxml index 67a19ad0f0..f40f3504fd 100644 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/deskShare/view/components/ToolbarButton.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/deskShare/view/components/ToolbarButton.mxml @@ -26,13 +26,14 @@ - + diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/listeners/view/components/ListenersWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/listeners/view/components/ListenersWindow.mxml index 45d51f305a..b01bda5a44 100644 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/listeners/view/components/ListenersWindow.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/listeners/view/components/ListenersWindow.mxml @@ -32,6 +32,7 @@ import mx.events.ListEvent; import org.bigbluebutton.modules.listeners.ListenersModuleConstants; import org.bigbluebutton.modules.listeners.view.components.Images; + import org.bigbluebutton.util.i18n.ResourceUtil; import flash.events.MouseEvent; import mx.controls.Label; import mx.collections.ArrayCollection; @@ -128,14 +129,14 @@ diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml index a8a71359a8..ca47588314 100644 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml @@ -23,7 +23,7 @@ + toolTip="{ResourceUtil.getInstance().getString('bbb.toolbar.phone.toolTip')}"> @@ -34,6 +34,7 @@ import org.bigbluebutton.modules.phone.events.CallConnectedEvent; import org.bigbluebutton.modules.phone.events.JoinVoiceConferenceEvent; import org.bigbluebutton.modules.phone.views.assets.Images; + import org.bigbluebutton.util.i18n.ResourceUtil; private var images:Images = new Images(); private var localDispatcher:IEventDispatcher; diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/present/views/FileUploadWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/present/views/FileUploadWindow.mxml index 15e56d9307..1f8112e780 100644 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/present/views/FileUploadWindow.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/present/views/FileUploadWindow.mxml @@ -22,8 +22,8 @@ --> @@ -46,9 +46,10 @@ import mx.managers.PopUpManager; import org.bigbluebutton.common.Images; import mx.collections.* - import mx.events.ValidationResultEvent; - import mx.validators.*; - import mx.events.FlexEvent; + import mx.events.ValidationResultEvent; + import mx.validators.*; + import mx.events.FlexEvent; + import org.bigbluebutton.util.i18n.ResourceUtil; public var presentationNames:Array = new Array(); [Bindable] public var presentationNamesAC:ArrayCollection; @@ -59,7 +60,7 @@ [Bindable] private var deleteIcon : Class = images.delete_icon; private var thumbnailTimer:Timer = new Timer(5000); - private var genThumbText:String = "Generating thumbnails.."; + private var genThumbText:String = ResourceUtil.getInstance().getString('bbb.fileupload.genThumbText'); private var genThumbDots:String = "."; private var fileToUpload:FileReference = new FileReference(); @@ -119,12 +120,12 @@ private function selectFile():void{ fileToUpload.addEventListener(Event.SELECT, onSelectFile); fileToUpload.browse([ - new FileFilter("Presentation file", "*.pdf;*.doc;*.docx;*.xls;*.xlsx;*.ppt;*.pptx;*.txt;*.rtf;*.odt;*.ods;*.odp;*.odg;*.odc;*.odi;*.jpg;*.png"), - new FileFilter("PDF", "*.pdf"), - new FileFilter("WORD", "*.doc;*.docx;*.odt;*.rtf;*.txt"), - new FileFilter("EXCEL", "*.xls;*.xlsx;*.ods"), - new FileFilter("POWERPOINT", "*.ppt;*.pptx;*.odp"), - new FileFilter("IMAGE", "*.jpg;*.jpeg;*.png")]); + new FileFilter(ResourceUtil.getInstance().getString('bbb.presentation.uploadwindow.presentationfile'), "*.pdf;*.doc;*.docx;*.xls;*.xlsx;*.ppt;*.pptx;*.txt;*.rtf;*.odt;*.ods;*.odp;*.odg;*.odc;*.odi;*.jpg;*.png"), + new FileFilter(ResourceUtil.getInstance().getString('bbb.presentation.uploadwindow.pdf'), "*.pdf"), + new FileFilter(ResourceUtil.getInstance().getString('bbb.presentation.uploadwindow.word'), "*.doc;*.docx;*.odt;*.rtf;*.txt"), + new FileFilter(ResourceUtil.getInstance().getString('bbb.presentation.uploadwindow.excel'), "*.xls;*.xlsx;*.ods"), + new FileFilter(ResourceUtil.getInstance().getString('bbb.presentation.uploadwindow.powerpoint'), "*.ppt;*.pptx;*.odp"), + new FileFilter(ResourceUtil.getInstance().getString('bbb.presentation.uploadwindow.image'), "*.jpg;*.jpeg;*.png")]); } private function onSelectFile(e:Event):void{ @@ -239,26 +240,26 @@ - + - - + - + - + - - - \ No newline at end of file diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/present/views/PresentationWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/present/views/PresentationWindow.mxml index 6850367b0a..8425577520 100644 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/present/views/PresentationWindow.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/present/views/PresentationWindow.mxml @@ -102,7 +102,7 @@ private var mouseDown:Boolean = false; [Bindable] private var isPresenter:Boolean = false; [Bindable] private var presentationLoaded:Boolean = false; - [Bindable] private var currentPresentation:String = "Presentation"; + [Bindable] private var currentPresentation:String = ResourceUtil.getInstance().getString('bbb.presentation.title'); // The following code block is to deal with a bug in FLexLib // with MDI windows not responding well to being maximized @@ -119,15 +119,15 @@ savedX = this.x; savedY = this.y; dispatchEvent(new MDIWindowEvent(MDIWindowEvent.MAXIMIZE, this)); - isMaximized = true; - windowControls.maximizeRestoreBtn.toolTip = "Restore to previous size"; + isMaximized = true; + windowControls.maximizeRestoreBtn.toolTip = ResourceUtil.getInstance().getString('bbb.presentation.maximizeRestoreBtn.toolTip2'); } else{ this.width = savedWindowWidth; this.height = savedWindowHeight; this.x = savedX; this.y = savedY; isMaximized = false; - windowControls.maximizeRestoreBtn.toolTip = "Maximize this window"; + windowControls.maximizeRestoreBtn.toolTip = ResourceUtil.getInstance().getString('bbb.presentation.maximizeRestoreBtn.toolTip'); } } @@ -241,13 +241,13 @@ thumbnailWindow.y = this.height - 270; thumbnailWindow.visible = true; } else if (slideView.slides != null){ - slideNumLbl.text = "" + (slideView.selectedSlide + 1) + " of " + slideView.slides.length; + slideNumLbl.text = "" + ResourceUtil.getInstance().getString('bbb.presentation.pages', [(slideView.selectedSlide + 1), slideView.slides.length]); } } private function onSlideHighlighted(e:Event):void{ if (slideView.visible) - slideNumLbl.text = "" + (thumbnailWindow.slideNumber+1) + " of " + slideView.slides.length; + slideNumLbl.text = "" + ResourceUtil.getInstance().getString('bbb.presentation.pages', [(thumbnailWindow.slideNumber + 1), slideView.slides.length]); } /** @@ -255,7 +255,7 @@ */ private function hideThumbs():void{ if (slideView.slides != null) - slideNumLbl.text = "" + (slideView.selectedSlide + 1) + " of " + slideView.slides.length; + slideNumLbl.text = "" + ResourceUtil.getInstance().getString('bbb.presentation.pages', [(slideView.selectedSlide + 1), slideView.slides.length]); thumbnailWindow.visible = false; } @@ -298,7 +298,7 @@ this.isPresenter = true; if (presentationLoaded) { - slideNumLbl.text = (slideView.selectedSlide + 1) + " of " + slideView.slides.length; + slideNumLbl.text = ResourceUtil.getInstance().getString('bbb.presentation.pages', [(slideView.selectedSlide + 1), slideView.slides.length]); backButton.visible = true; forwardButton.visible = true; zoomSlider.visible = true; @@ -317,7 +317,7 @@ this.isPresenter = false; uploadPres.visible = false; if (presentationLoaded) { - slideNumLbl.text = (slideView.selectedSlide + 1) + " of " + slideView.slides.length; + slideNumLbl.text = ResourceUtil.getInstance().getString('bbb.presentation.pages', [(slideView.selectedSlide + 1), slideView.slides.length]); backButton.visible = false; forwardButton.visible = false; zoomSlider.visible = false; @@ -409,7 +409,7 @@ + toolTip="{ResourceUtil.getInstance().getString('bbb.presentation.uploadPresBtn')}" click="dispatchEvent(new UploadEvent(UploadEvent.OPEN_UPLOAD_WINDOW))"/> - +