Revision: 4267
Author: solomax666
Date: Thu Sep 22 10:00:43 2011
Log: Fixes Issue 1520 (All language related fixes are merged from the
trunk)
http://code.google.com/p/openmeetings/source/detail?r=4267
Modified:
/tags/1_8/WebContent/openmeetings/base/auth/checkLoginData.lzx
/tags/1_8/WebContent/openmeetings/base/hibernate/hibRtmpConnection.lzx
/tags/1_8/WebContent/openmeetings/base/mainAttributes.lzx
/tags/1_8/WebContent/openmeetings/modules/admin/useradmin/userAdminValueForm.lzx
/tags/1_8/src/app/org/openmeetings/app/data/user/Usermanagement.java
/tags/1_8/src/app/org/openmeetings/app/ldap/LdapLoginManagement.java
/tags/1_8/src/app/org/openmeetings/app/remote/UserService.java
/tags/1_8/src/app/org/openmeetings/app/xmlimport/LanguageImport.java
/tags/1_8/src/templates/install_step2_EN.vm
/tags/1_8/src/templates/install_welcome_EN.vm
=======================================
--- /tags/1_8/WebContent/openmeetings/base/auth/checkLoginData.lzx Tue Sep
13 08:06:45 2011
+++ /tags/1_8/WebContent/openmeetings/base/auth/checkLoginData.lzx Thu Sep
22 10:00:43 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()) {
=======================================
--- /tags/1_8/WebContent/openmeetings/base/hibernate/hibRtmpConnection.lzx
Mon Sep 12 11:03:36 2011
+++ /tags/1_8/WebContent/openmeetings/base/hibernate/hibRtmpConnection.lzx
Thu Sep 22 10:00:43 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;
}
=======================================
--- /tags/1_8/WebContent/openmeetings/base/mainAttributes.lzx Mon Sep 12
11:03:36 2011
+++ /tags/1_8/WebContent/openmeetings/base/mainAttributes.lzx Thu Sep 22
10:00:43 2011
@@ -254,6 +254,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" />
=======================================
---
/tags/1_8/WebContent/openmeetings/modules/admin/useradmin/userAdminValueForm.lzx
Mon Sep 12 11:03:36 2011
+++
/tags/1_8/WebContent/openmeetings/modules/admin/useradmin/userAdminValueForm.lzx
Thu Sep 22 10:00:43 2011
@@ -241,6 +241,7 @@
this.sendObject["level_id"] =
Number(this.parent.level.getValue());
this.sendObject["title_id"] =
Number(this.parent.salutation.getValue());
this.sendObject["jNameTimeZone"] =
parent._timeZone.getValue();
+ this.sendObject["language_id"] = parent.languages.getValue();
this.sendObject["forceTimeZoneCheck"] =
parent.forceTimeZoneCheck.getValue();
this.sendObject["organisations"] =
this.parent._organisationslist.getAllItems();
@@ -272,7 +273,7 @@
<netparam><method name="getValue">return
parent.sendObject;</method></netparam>
<handler name="ondata" args="val">
<![CDATA[
- //Debug.write("saveOrUpdateUser: ",val);
+ if ($debug) Debug.write("saveOrUpdateUser ondata:
",val);
if (val>0){
var obj = new Array();
obj["user_id"] = val;
=======================================
--- /tags/1_8/src/app/org/openmeetings/app/data/user/Usermanagement.java
Mon Sep 19 10:26:55 2011
+++ /tags/1_8/src/app/org/openmeetings/app/data/user/Usermanagement.java
Thu Sep 22 10:00:43 2011
@@ -454,7 +454,7 @@
public Long updateUser(long user_level, Long user_id, Long level_id,
String login, String password, String lastname, String
firstname,
Date age, String street, String additionalname, String
zip,
- long states_id, String town, int availible, String
telefon,
+ long states_id, String town, Long language_id, int availible, String
telefon,
String fax, String mobil, String email, String comment,
int status,
List<?> organisations, int title_id, String phone,
String sip_user,
String sip_pass, String sip_auth, Boolean
generateSipUserData,
@@ -511,6 +511,7 @@
us.setTitle_id(title_id);
us.setOmTimeZone(omTimeZoneDaoImpl
.getOmTimeZone(jNameTimeZone));
+ us.setLanguage_id(language_id);
us.setForceTimeZoneCheck(forceTimeZoneCheck);
us.setUserOffers(userOffers);
@@ -1277,7 +1278,6 @@
public Long addUser(Users usr) {
try {
usr = em.merge(usr);
- em.refresh(usr);
Long user_id = usr.getUser_id();
return user_id;
} catch (Exception ex2) {
@@ -1302,7 +1302,6 @@
}
usr = em.merge(usr);
- em.refresh(usr);
Long user_id = usr.getUser_id();
return user_id;
@@ -1353,6 +1352,7 @@
savedUser.setTitle_id(Integer.parseInt(values.get(
"title_id").toString()));
+
savedUser.setLanguage_id(Long.parseLong(values.get("languages_id").toString()));
savedUser.setOmTimeZone(omTimeZoneDaoImpl
.getOmTimeZone((values.get("jnameTimeZone")
.toString())));
=======================================
--- /tags/1_8/src/app/org/openmeetings/app/ldap/LdapLoginManagement.java
Mon Sep 19 07:34:05 2011
+++ /tags/1_8/src/app/org/openmeetings/app/ldap/LdapLoginManagement.java
Thu Sep 22 10:00:43 2011
@@ -103,10 +103,6 @@
public static final String CONFIGKEY_LDAP_KEY_TOWN
= "ldap_user_attr_town";
public static final String CONFIGKEY_LDAP_KEY_PHONE
= "ldap_user_attr_phone";
- private LdapLoginManagement() {
- // do not use -> singleton
- }
-
/**
* Determine if is a supported Auth Type
*
=======================================
--- /tags/1_8/src/app/org/openmeetings/app/remote/UserService.java Wed Sep
7 11:46:30 2011
+++ /tags/1_8/src/app/org/openmeetings/app/remote/UserService.java Thu Sep
22 10:00:43 2011
@@ -382,7 +382,7 @@
Long.valueOf(argObjectMap.get("states_id").toString())
.longValue(),
argObjectMap.get("town").toString(),
- 0,
+ new
Long(argObjectMap.get("language_id").toString()),
true,
organisations,
argObjectMap.get("phone").toString(),
@@ -426,6 +426,7 @@
argObjectMap.get("states_id")
.toString()).longValue(),
argObjectMap.get("town").toString(),
+ new
Long(argObjectMap.get("language_id").toString()),
Integer.valueOf(
argObjectMap.get("availible")
.toString()).intValue(),
=======================================
--- /tags/1_8/src/app/org/openmeetings/app/xmlimport/LanguageImport.java
Mon Sep 19 07:43:24 2011
+++ /tags/1_8/src/app/org/openmeetings/app/xmlimport/LanguageImport.java
Thu Sep 22 10:00:43 2011
@@ -24,9 +24,6 @@
@Autowired
private FieldLanguageDaoImpl fieldLanguageDaoImpl;
- public LanguageImport() {
- }
-
public Long addLanguageByDocument(Long language_id, InputStream is)
throws Exception {
=======================================
--- /tags/1_8/src/templates/install_step2_EN.vm Mon Sep 19 08:03:46 2011
+++ /tags/1_8/src/templates/install_step2_EN.vm Thu Sep 22 10:00:43 2011
@@ -2,7 +2,7 @@
## author swagner
## 11.05.2007
<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0
Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='de' lang='de'>
+<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
<head>
<meta http-equiv='Content-Type' content='text/html; charset=iso-8859-1' />
</head>
=======================================
--- /tags/1_8/src/templates/install_welcome_EN.vm Mon Sep 19 07:50:10 2011
+++ /tags/1_8/src/templates/install_welcome_EN.vm Thu Sep 22 10:00:43 2011
@@ -13,7 +13,7 @@
<ol>
<li>Install and configure a database
<li>Edit <b>persistence.xml</b> to fit your database authentification
values.<br/>
-persistence.xml can be found in
<b>$RED5-HOME/webapps/openmeetings/WEB-INF/classes/META-INF/</b>.<br/>
+persistence.xml can be found in
<b>$RED5-HOME/webapps/openmeetings/WEB-INF/classes/META-INF/</b>.<br/>
You need to alter:
<pre>
<property
@@ -35,10 +35,6 @@
</ol>
-<BR/>
-
-
-
<BR/>
If this steps have been done you can follow with step 1 of
installation:<BR/><BR/>
<h1><A HREF="?command=step1">Continue with STEP 1</A></h1>
--
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.
