Fixed issue 274

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3097 af16638f-c34d-0410-8cfa-b39d5352b314
This commit is contained in:
DJP 2009-12-14 19:32:47 +00:00
parent 498ddbb370
commit 4cc6242823
2 changed files with 28 additions and 2 deletions

View File

@ -69,7 +69,7 @@
<copy file="/var/www/bigbluebutton/client/conf/config.xml" todir="${OUTPUT_DIR}/conf" />
</target>
<target name="generate-wrapper" depends="mxmlc-component">
<target name="generate-wrapper" depends="mxmlc-component, localization">
<html-wrapper
title="BigBlueButton"
file="BigBlueButton.html"
@ -86,6 +86,10 @@
output="${OUTPUT_DIR}"
/>
<copy file="./html-template/BigBlueButton.html" todir="${OUTPUT_DIR}" overwrite="true"/>
<echo>Building Localization .swf's</echo>
<compileLocale locale="en_US" />
<compileLocale locale="zh_CN" />
<compileLocale locale="fr_FR" />
</target>
<target name="clean">

View File

@ -32,6 +32,27 @@ var hasProductInstall = DetectFlashVer(6, 0, 65);
// Version check based upon the values defined in globals
var hasRequestedVersion = DetectFlashVer(requiredMajorVersion, requiredMinorVersion, requiredRevision);
// Check locale
var localeChain = "en_US";
if (navigator.language)
localeChain = navigator.language;
else if (navigator.browserLanguage)
localeChain = navigator.browserLanguage;
if(/^([a-z]+)-([a-z]+)$/i.test(localeChain)){
var matches = /^([a-z]+)-([a-z]+)$/i.exec(localeChain);
localeChain = matches[1].toLowerCase() + "_" + matches[2].toUpperCase();
}
else if(/^([a-z]+)$/i.test(localeChain)){
var matches = /^([a-z]+)$/i.exec(localeChain);
localeChain = matches[1].toLowerCase() + "_" + matches[1].toUpperCase();
}
else{
localeChain = "en_US";
}
var resourceModuleURLs = "locale/" + localeChain + "_resources.swf";
// Check to see if a player with Flash Product Install is available and the version does not meet the requirements for playback
if ( hasProductInstall && !hasRequestedVersion ) {
@ -46,7 +67,7 @@ if ( hasProductInstall && !hasRequestedVersion ) {
AC_FL_RunContent(
"src", "playerProductInstall",
"FlashVars", "MMredirectURL="+MMredirectURL+'&MMplayerType='+MMPlayerType+'&MMdoctitle='+MMdoctitle+"",
"FlashVars", "MMredirectURL="+MMredirectURL+'&MMplayerType='+MMPlayerType+'&MMdoctitle='+MMdoctitle+"" + '&resourceModuleURLs='+resourceModuleURLs+'&localeChain='+localeChain,
"width", "100%",
"height", "100%",
"align", "middle",
@ -64,6 +85,7 @@ if ( hasProductInstall && !hasRequestedVersion ) {
// embed the Flash Content SWF when all tests are passed
AC_FL_RunContent(
"src", "BigBlueButton",
"FlashVars", 'resourceModuleURLs='+resourceModuleURLs+'&localeChain='+localeChain,
"width", "100%",
"height", "100%",
"align", "middle",