Index: lams_central/web/author.jsp
===================================================================
diff -u -rfae6f243052809ce89a2916271a995f38c9bb042 -rcad78e73cd579e5afd056c6c96532c1687cbce50
--- lams_central/web/author.jsp (.../author.jsp) (revision fae6f243052809ce89a2916271a995f38c9bb042)
+++ lams_central/web/author.jsp (.../author.jsp) (revision cad78e73cd579e5afd056c6c96532c1687cbce50)
@@ -224,6 +224,7 @@
Author :: LAMS
+lams_authoring.swf?userID=&serverURL=<%=pathToRoot%>&build=<%=authoringClientVersion%>&lang=&country=&theme=
@@ -233,12 +234,12 @@
width="100%" height="100%" align="" id="authoring">
- &serverURL=<%=pathToRoot%>&build=<%=authoringClientVersion%>&lang=<%=serverLanguage%>&date=<%=languageDate%>&theme=">
+
&serverURL=<%=pathToRoot%>&build=<%=authoringClientVersion%>&lang=<%=serverLanguage%>&date=<%=languageDate%>&theme="
+ src="${authorurl}"
quality="high"
scale="noscale"
bgcolor="#B3B7C8"
Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -r2225350cef107fbaf8265ad2941a9ea4fe5836a9 -rcad78e73cd579e5afd056c6c96532c1687cbce50
Binary files differ
Index: lams_common/src/flash/org/lamsfoundation/lams/common/Config.as
===================================================================
diff -u -rdb383642acd52b1adb1186f050ae221ff4d1cc81 -rcad78e73cd579e5afd056c6c96532c1687cbce50
--- lams_common/src/flash/org/lamsfoundation/lams/common/Config.as (.../Config.as) (revision db383642acd52b1adb1186f050ae221ff4d1cc81)
+++ lams_common/src/flash/org/lamsfoundation/lams/common/Config.as (.../Config.as) (revision cad78e73cd579e5afd056c6c96532c1687cbce50)
@@ -298,10 +298,18 @@
//TODO: make this a real call to get browser lcoale!
//return 'en';
//return 'en';
-
+ var lang:String;
+
if(_root.lang){
- Debugger.log('Getting language from root: '+String(_root.lang),Debugger.GEN,'getLanguage','Config');
- return _root.lang;
+ lang = _root.lang;
+ if(_root.country){
+ lang += StringUtils.pad(String(_root.country).toUpperCase(), 3, '_', false);
+ Debugger.log('Appending country from root: '+lang,Debugger.GEN,'getLanguage','Config');
+ return lang;
+ } else {
+ Debugger.log('Getting language from root: '+String(_root.lang),Debugger.GEN,'getLanguage','Config');
+ return lang;
+ }
} else {
return 'en';
}