Skip to content
Snippets Groups Projects
Commit 0d2234d5 authored by Richard Alam's avatar Richard Alam
Browse files

try to set the language selector to default value

parent f6c46bce
No related branches found
No related tags found
No related merge requests found
......@@ -20,17 +20,17 @@
$Id: $
-->
<mx:ComboBox xmlns:mx="http://www.adobe.com/2006/mxml" dataProvider="{this.langNames}"
selectedIndex="10" change="changeLanguage()" rowCount="15" width="120">
<mx:ComboBox xmlns:mx="http://www.adobe.com/2006/mxml" dataProvider="{ResourceUtil.getInstance().localeNames}"
selectedIndex="{localeIndex}"
change="changeLanguage()" rowCount="15" width="120">
<mx:Script>
<![CDATA[
import org.bigbluebutton.util.i18n.ResourceUtil;
[Bindable] private var langNames:Array = ResourceUtil.getInstance().localeNames;
[Bindable] private var langCodes:Array = ResourceUtil.getInstance().localeCodes;
[Bindable] private var localeIndex:Number = ResourceUtil.getInstance().localeIndex;
private function changeLanguage():void{
var lang:String = this.langCodes[this.selectedIndex];
ResourceUtil.getInstance().setPreferredLocale(lang);
private function changeLanguage():void {
ResourceUtil.getInstance().setPreferredLocale(ResourceUtil.getInstance().getLocaleCodeForIndex(selectedIndex));
}
]]>
</mx:Script>
......
......@@ -64,7 +64,7 @@
chatView.openChatBoxFor(id);
}
private function changeFontSize():void{
private function changeFontSize():void {
var e:ChatOptionsEvent = new ChatOptionsEvent(ChatOptionsEvent.CHANGE_FONT_SIZE);
e.fontSize = int(cmbFontSize.selectedItem);
dispatchEvent(e);
......
......@@ -47,15 +47,15 @@ package org.bigbluebutton.util.i18n
private static var BBB_RESOURCE_BUNDLE:String = 'bbbResources';
private static var MASTER_LOCALE:String = "en_US";
[Bindable]
public var localeCodes:Array = new Array();
[Bindable]
public var localeNames:Array = new Array();
[Bindable] public var localeCodes:Array = new Array();
[Bindable] public var localeNames:Array = new Array();
[Bindable] public var localeIndex:Number;
private var eventDispatcher:IEventDispatcher;
private var resourceManager:IResourceManager;
private var preferredLocale:String
public function ResourceUtil(enforcer:SingletonEnforcer) {
if (enforcer == null) {
throw new Error( "You Can Only Have One ResourceUtil" );
......@@ -69,7 +69,6 @@ package org.bigbluebutton.util.i18n
public function initialize():void {
resourceManager = ResourceManager.getInstance();
// Add a random string on the query so that we always get an up-to-date config.xml
var date:Date = new Date();
LogUtil.debug("Loading " + LOCALES_FILE);
......@@ -111,8 +110,9 @@ package org.bigbluebutton.util.i18n
public function setPreferredLocale(locale:String):void {
LogUtil.debug("Setting up preferred locale " + locale);
preferredLocale = locale;
if (isPreferredLocaleAvailable(preferredLocale)) {
if (isPreferredLocaleAvailable(preferredLocale)) {
preferredLocale = locale;
localeIndex = localeCodes.indexOf(preferredLocale);
changeLocale(preferredLocale);
}
}
......@@ -127,7 +127,8 @@ package org.bigbluebutton.util.i18n
}
private function loadResource(language:String):IEventDispatcher {
var localeURI:String = 'locale/' + language + '_resources.swf';
var date:Date = new Date();
var localeURI:String = 'locale/' + language + '_resources.swf?a=' + date.time;
return resourceManager.loadResourceModule(localeURI, false);
}
......@@ -149,8 +150,11 @@ package org.bigbluebutton.util.i18n
// Set the preferred locale and master as backup.
if (preferredLocale != MASTER_LOCALE) {
resourceManager.localeChain = [preferredLocale, MASTER_LOCALE];
localeIndex = localeCodes.indexOf(preferredLocale);
} else {
resourceManager.localeChain = [MASTER_LOCALE];
preferredLocale = MASTER_LOCALE;
localeIndex = localeCodes.indexOf(preferredLocale);
}
update();
......@@ -162,6 +166,8 @@ package org.bigbluebutton.util.i18n
*/
private function handleResourceNotLoaded(event:ResourceEvent):void{
resourceManager.localeChain = [MASTER_LOCALE];
preferredLocale = MASTER_LOCALE;
localeIndex = localeCodes.indexOf(preferredLocale);
update();
}
......@@ -177,6 +183,10 @@ package org.bigbluebutton.util.i18n
public function getCurrentLanguageCode():String{
return preferredLocale;
}
public function getLocaleCodeForIndex(index:int):String {
return localeCodes[index];
}
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment