diff --git a/bigbluebutton-client/locale/en_US/bbbResources.properties b/bigbluebutton-client/locale/en_US/bbbResources.properties
index 06b8cd7fde8579f8d7e4f399856faae09b696c1e..e26b05426fa166fb868d81877aa955ed513f1f5b 100755
--- a/bigbluebutton-client/locale/en_US/bbbResources.properties
+++ b/bigbluebutton-client/locale/en_US/bbbResources.properties
@@ -19,8 +19,8 @@ bbb.mainshell.fullScreenBtn.toolTip = Toggle Full-Screen
bbb.mainshell.resetLayoutBtn.toolTip = Reset Layout
# OldLocaleWarnWIndow.mxml
-bbb.oldlocalewindow.oldLocalesReminder1=You may have an old language translations of BigBlueButton.
-bbb.oldlocalewindow.oldLocalesReminder2=Please clear you browser's cache and try again.
+bbb.oldlocalewindow.reminder1=You may have an old language translations of BigBlueButton.
+bbb.oldlocalewindow.reminder2=Please clear your browser's cache and try again.
bbb.oldlocalewindow.windowTitle=Warning: Old Language Translations
# LogWindow.mxml
diff --git a/bigbluebutton-client/src/conf/config.xml.template b/bigbluebutton-client/src/conf/config.xml.template
index 54a9adafdee3b7240d49cc911ea06e175bdee673..a6f4eec5bb7c273f1d115868395eda2044062d9e 100755
--- a/bigbluebutton-client/src/conf/config.xml.template
+++ b/bigbluebutton-client/src/conf/config.xml.template
@@ -1,5 +1,6 @@
<?xml version="1.0" ?>
<config>
+ <localeversion>0.7</localeversion>
<version>VERSION</version>
<help url="http://HOST/help.html"/>
<porttest host="HOST" application="video"/>
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/model/BbbModuleManager.as b/bigbluebutton-client/src/org/bigbluebutton/main/model/BbbModuleManager.as
index c36e45dd6dd5313f987f61f41fbc540a2cfbbd09..7b1d34a2ab67b87726d68e13ff73b07438e56e98 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/model/BbbModuleManager.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/model/BbbModuleManager.as
@@ -47,6 +47,7 @@ package org.bigbluebutton.main.model
private var _router:Router;
private var _mode:String;
private var _version:String;
+ private var _localeVersion:String;
private var _protocol:String;
private var _portTestHost:String;
private var _portTestApplication:String;
@@ -110,9 +111,8 @@ package org.bigbluebutton.main.model
var list:XMLList = xml.modules.module;
_version = xml.version;
-
- trace("version " + _version);
-
+ _localeVersion = xml.localeversion;
+
var item:XML;
for each(item in list){
@@ -288,6 +288,10 @@ package org.bigbluebutton.main.model
return _version;
}
+ public function getLocaleVersion():String {
+ return _localeVersion;
+ }
+
public function getNumberOfModules():int {
return _numModules;
}
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/model/ModulesProxy.as b/bigbluebutton-client/src/org/bigbluebutton/main/model/ModulesProxy.as
index e41ef9eebfbb62cd34281832cc19cd6e118f6cb0..8adb04042693ac51e97c69852eceffce00fce5e1 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/model/ModulesProxy.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/model/ModulesProxy.as
@@ -118,6 +118,10 @@ package org.bigbluebutton.main.model
return modulesManager.getAppVersion();
}
+ public function getLocaleVersion():String {
+ return modulesManager.getLocaleVersion();
+ }
+
public function getNumberOfModules():int {
return modulesManager.getNumberOfModules();
}
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/view/MainApplicationShellMediator.as b/bigbluebutton-client/src/org/bigbluebutton/main/view/MainApplicationShellMediator.as
index c41b9a5fb3071d29fee1ffb8c84e012276397e1e..12ebacc190738f3a0f7d4da0b43a41eb61a3b0f8 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/view/MainApplicationShellMediator.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/view/MainApplicationShellMediator.as
@@ -103,7 +103,7 @@ package org.bigbluebutton.main.view
}
private function checkLocaleVersionResultCallback(versionCurrent:Boolean):void {
- if (versionCurrent) testRTMPConnection();
+// if (versionCurrent) testRTMPConnection();
}
override public function handleNotification(notification:INotification):void{
@@ -111,9 +111,8 @@ package org.bigbluebutton.main.view
case MainApplicationConstants.APP_MODEL_INITIALIZED:
shell.appVersion = modulesProxy.getVersion();
shell.numberOfModules = modulesProxy.getNumberOfModules();
- LogUtil.debug("****** APP VERSION ****" + modulesProxy.getVersion());
- shell.checkLocaleVersion(modulesProxy.getVersion(), checkLocaleVersionResultCallback);
-
+// shell.checkLocaleVersion(modulesProxy.getLocaleVersion(), checkLocaleVersionResultCallback);
+ testRTMPConnection();
break;
case MainApplicationConstants.PORT_TEST_FAILED:
var portTestResult:Object = notification.getBody();
@@ -138,6 +137,7 @@ package org.bigbluebutton.main.view
shell.statusInfo.text = "";
shell.statusProgress.text = "";
shell.statusInfo2.text = "";
+ shell.checkLocaleVersion(modulesProxy.getLocaleVersion(), checkLocaleVersionResultCallback);
break;
case MainApplicationConstants.USER_LOGGED_IN:
shell.statusInfo.text = "";
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/view/components/MainApplicationShell.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/view/components/MainApplicationShell.mxml
index 3a075655523e3f6caf74a7f587fd1446943202aa..0c9b549c214b58b7e4f2690aa6f4dafcd6506bfc 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/view/components/MainApplicationShell.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/view/components/MainApplicationShell.mxml
@@ -174,17 +174,16 @@
Alert.okLabel ="OK";
var version:String = "old-locales";
LogUtil.debug("****** LOCALE VERSION ****" + localeVersion + " " + version);
- version = ResourceUtil.getInstance().getString('bbb.mainshell.statusInfo');
+ version = ResourceUtil.getInstance().getString('bbb.mainshell.locale.version');
LogUtil.debug("****** LOCALE VERSION ****" + localeVersion + " " + version);
- versionCheckResultCallback(true);
-/*
+// versionCheckResultCallback(true);
+
if ((version == "old-locales") || (version == "") || (version == null)) {
wrongLocaleVersion();
} else {
if (version != localeVersion) wrongLocaleVersion();
- else
- }
-*/
+ else versionCheckResultCallback(true);
+ }
}
private function wrongLocaleVersion():void {
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/view/components/OldLocaleWarnWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/view/components/OldLocaleWarnWindow.mxml
index fa0d6d89d1e280acf60e21bf903b4e900d8f6305..44f979fe7b370baf1e096bfe42b6886b1d87ace3 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/view/components/OldLocaleWarnWindow.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/view/components/OldLocaleWarnWindow.mxml
@@ -21,7 +21,7 @@
-->
<mx:TitleWindow xmlns:mx="http://www.adobe.com/2006/mxml"
- title="{windowTitle}" showCloseButton="false" creationComplete="init()"
+ title="{ResourceUtil.getInstance().getString('bbb.oldlocalewindow.windowTitle')}" showCloseButton="false" creationComplete="init()"
x="168" y="86" layout="vertical" width="400" height="150" horizontalAlign="center">
<mx:Script>
<![CDATA[
@@ -30,7 +30,7 @@
import mx.managers.PopUpManager;
[Bindable] private var windowTitle:String="Warning: Old Language Version";
[Bindable] private var oldLocalesReminder1:String = "You have an old language translation of BigBlueButton.";
- [Bindable] private var oldLocalesReminder2:String = "Please clear you browser cache and try again.";
+ [Bindable] private var oldLocalesReminder2:String = "Please clear your browser cache and try again.";
private function init():void {
addEventListener(Event.CLOSE, onUserLoggedOutWindowClose);
@@ -38,11 +38,12 @@
var locWindowTitle:String = ResourceUtil.getInstance().getString('bbb.oldlocalewindow.windowTitle');
if ((locWindowTitle != null) && (locWindowTitle != "")) windowTitle = locWindowTitle;
- var reminder1:String = ResourceUtil.getInstance().getString('bbb.oldlocalewindow.oldLocalesReminder1');
+ var reminder1:String = ResourceUtil.getInstance().getString('bbb.oldlocalewindow.reminder1');
if ((reminder1 != null) && (reminder1 != "")) oldLocalesReminder1 = reminder1;
- var reminder2:String = ResourceUtil.getInstance().getString('bbb.oldlocalewindow.oldLocalesReminder2');
+ var reminder2:String = ResourceUtil.getInstance().getString('bbb.oldlocalewindow.reminder2');
if ((reminder2 != null) && (reminder2 != "")) oldLocalesReminder2 = reminder2;
+
}
private function redirect():void {
@@ -58,8 +59,8 @@
]]>
</mx:Script>
- <mx:Label text="{oldLocalesReminder1}"/>
- <mx:Label text="{oldLocalesReminder2}"/>
+ <mx:Label text="{ResourceUtil.getInstance().getString('bbb.oldlocalewindow.reminder1')}"/>
+ <mx:Label text="{ResourceUtil.getInstance().getString('bbb.oldlocalewindow.reminder2')}"/>
<mx:Button id="okBtn" label="OK" click="redirect()"/>
</mx:TitleWindow>
\ No newline at end of file
diff --git a/bigbluebutton-client/src/org/bigbluebutton/util/i18n/ResourceUtil.as b/bigbluebutton-client/src/org/bigbluebutton/util/i18n/ResourceUtil.as
index c71c4e55dc9b913212308f79bb90c8080e06be0b..13013011a4ee4734e73d8b23ce9dd9aa2c2c93d9 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/util/i18n/ResourceUtil.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/util/i18n/ResourceUtil.as
@@ -35,7 +35,7 @@ package org.bigbluebutton.util.i18n
public static const LOCALES_FILE:String = "conf/locales.xml";
private var inited:Boolean = false;
- private static var MSG_RESOURCE:String = 'bbbResources';
+ private static var BBB_RESOURCE_BUNDLE:String = 'bbbResources';
public static var DEFAULT_LANGUAGE:String = "en_US";
private var eventDispatcher:IEventDispatcher;
@@ -129,7 +129,7 @@ package org.bigbluebutton.util.i18n
[Bindable("change")]
public function getString(resourceName:String, parameters:Array = null, locale:String = null):String{
- return resourceManager.getString(MSG_RESOURCE, resourceName, parameters, locale);
+ return resourceManager.getString(BBB_RESOURCE_BUNDLE, resourceName, parameters, locale);
}
}
}