BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- cleanup

Browse Source 
- display the correct text when locale has the proper text for old locale warning
This commit is contained in:
Richard Alam 2010-06-25 14:50:50 -04:00
parent f2eb54c9bd
commit 1e7d9d8cd6
3 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bigbluebutton-client/src/org/bigbluebutton/main/view/MainApplicationShellMediator.as
View File

@ -101,17 +101,12 @@ package org.bigbluebutton.main.view
MainApplicationConstants.MODULE_LOAD_PROGRESS
];
}
private function checkLocaleVersionResultCallback(versionCurrent:Boolean):void {
// if (versionCurrent) testRTMPConnection();
}
override public function handleNotification(notification:INotification):void{
switch(notification.getName()){
case MainApplicationConstants.APP_MODEL_INITIALIZED:
shell.appVersion = modulesProxy.getVersion();
shell.numberOfModules = modulesProxy.getNumberOfModules();
// shell.checkLocaleVersion(modulesProxy.getLocaleVersion(), checkLocaleVersionResultCallback);
testRTMPConnection();
break;
case MainApplicationConstants.PORT_TEST_FAILED:
@ -137,7 +132,7 @@ package org.bigbluebutton.main.view
shell.statusInfo.text = "";
shell.statusProgress.text = "";
shell.statusInfo2.text = "";
shell.checkLocaleVersion(modulesProxy.getLocaleVersion(), checkLocaleVersionResultCallback);
shell.checkLocaleVersion(modulesProxy.getLocaleVersion());
break;
case MainApplicationConstants.USER_LOGGED_IN:
shell.statusInfo.text = "";

7
bigbluebutton-client/src/org/bigbluebutton/main/view/components/MainApplicationShell.mxml
View File

@ -170,19 +170,16 @@
mdiCanvas.addChild(e.component);
}
public function checkLocaleVersion(localeVersion:String, versionCheckResultCallback:Function):void {
public function checkLocaleVersion(localeVersion:String):void {
Alert.okLabel ="OK";
var version:String = "old-locales";
LogUtil.debug("****** LOCALE VERSION ****" + localeVersion + " " + version);
version = ResourceUtil.getInstance().getString('bbb.mainshell.locale.version');
LogUtil.debug("****** LOCALE VERSION ****" + localeVersion + " " + version);
// versionCheckResultCallback(true);
LogUtil.debug("Locale from config=" + localeVersion + ", from locale file=" + version);
if ((version == "old-locales") || (version == "") || (version == null)) {
wrongLocaleVersion();
} else {
if (version != localeVersion) wrongLocaleVersion();
else versionCheckResultCallback(true);
}
}

4
bigbluebutton-client/src/org/bigbluebutton/main/view/components/OldLocaleWarnWindow.mxml
View File

@ -40,13 +40,15 @@
var locWindowTitle:String = ResourceUtil.getInstance().getString('bbb.oldlocalewindow.windowTitle');
if ((locWindowTitle == null) || (locWindowTitle == "")) windowTitle = windowTitleDefault;
else windowTitle = locWindowTitle;
var reminder1:String = ResourceUtil.getInstance().getString('bbb.oldlocalewindow.reminder1');
if ((reminder1 == null) || (reminder1 == "")) oldLocalesReminder1 = reminder1Default;
else oldLocalesReminder1 = reminder1;
var reminder2:String = ResourceUtil.getInstance().getString('bbb.oldlocalewindow.reminder2');
if ((reminder2 == null) || (reminder2 == "")) oldLocalesReminder2 = reminder2Default;
else oldLocalesReminder2 = reminder2;
}
private function redirect():void {