Revision: 4266
Author: solomax666
Date: Thu Sep 22 08:39:01 2011
Log: Fixes Issue 1514
application default language is used:
- if user has no language
- if user logged out
http://code.google.com/p/openmeetings/source/detail?r=4266
Modified:
/trunk/singlewebapp/WebContent/openmeetings/base/auth/checkLoginData.lzx
/trunk/singlewebapp/WebContent/openmeetings/base/hibernate/hibRtmpConnection.lzx
/trunk/singlewebapp/WebContent/openmeetings/base/mainAttributes.lzx
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/base/auth/checkLoginData.lzx
Tue Sep 13 08:06:45 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/base/auth/checkLoginData.lzx
Thu Sep 22 08:39:01 2011
@@ -283,7 +283,7 @@
}
if (!(value<0)){
- hib.userlang = isNaN(value.language_id) ? 1 :
Number(value.language_id);
+ hib.userlang = isNaN(value.language_id) ?
canvas.default_lang_id : Number(value.language_id);
var g = canvas.getUserData();
if (this.parent._savelogindata.getValue()) {
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/base/hibernate/hibRtmpConnection.lzx
Sun Sep 18 07:58:10 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/base/hibernate/hibRtmpConnection.lzx
Thu Sep 22 08:39:01 2011
@@ -248,6 +248,7 @@
canvas.setUserData(g);
canvas.setColorStyle(canvas.baseColorScheme);
+ parent.userlang = canvas.default_lang_id;
parent.getLanguageByIdAndMax.start = 0;
parent.getLanguageByIdAndMax.doCall();
</handler>
@@ -270,9 +271,10 @@
<netRemoteCallHib name="getDefaultLanguage"
funcname="languageservice.getDefaultLanguage" >
<handler name="ondata" args="value">
//The onResult-Handler will be called be the rtmpconnection
+ canvas.default_lang_id = value;
if ($debug) Debug.write("getDefaultLanguage: ",value,";
canvas.lang = ", canvas.language_id);
if (canvas.language_id==0){
- parent.userlang = value;
+ parent.userlang = canvas.default_lang_id;
} else {
parent.userlang = canvas.language_id;
}
=======================================
--- /trunk/singlewebapp/WebContent/openmeetings/base/mainAttributes.lzx Sat
Sep 17 08:15:38 2011
+++ /trunk/singlewebapp/WebContent/openmeetings/base/mainAttributes.lzx Thu
Sep 22 08:39:01 2011
@@ -265,6 +265,8 @@
<!--- skip loading of Language -->
<attribute name="language_id" value="0" type="number" />
+<!--- application default language -->
+<attribute name="default_lang_id" value="1" type="number" />
<attribute name="isResetUsername" value="false" type="boolean" />
<attribute name="resetHash" value="" type="string" />
--
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en.
