[evolvis-commits] r18373: put LDAP-pulled users with German language by default, again

mirabilos at evolvis.org mirabilos at evolvis.org
Tue Apr 24 16:35:02 CEST 2012


Author: mirabilos
Date: 2012-04-24 16:35:02 +0200 (Tue, 24 Apr 2012)
New Revision: 18373

Modified:
   trunk/gforge_base/evolvisforge-5.1/src/debian/changelog
   trunk/gforge_base/evolvisforge-5.1/src/univention/ldap2psql.sh
Log:
put LDAP-pulled users with German language by default, again

as we have a “switch to English” knob in the UI, now

Modified: trunk/gforge_base/evolvisforge-5.1/src/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/debian/changelog	2012-04-24 14:34:58 UTC (rev 18372)
+++ trunk/gforge_base/evolvisforge-5.1/src/debian/changelog	2012-04-24 14:35:02 UTC (rev 18373)
@@ -6,8 +6,9 @@
   * Language switch code: enable changing account prefs if forced,
     redirect to account prefs page if switch could not be done
   * Use system tzdata for list of timezones (fixes Coiby’s error)
+  * Univention-LDAP sync uses German as default language, again
 
- -- Thorsten Glaser <t.glaser at tarent.de>  Tue, 24 Apr 2012 15:53:01 +0200
+ -- Thorsten Glaser <t.glaser at tarent.de>  Tue, 24 Apr 2012 16:00:36 +0200
 
 fusionforge (1:5.1.1+evolvis55) unstable; urgency=low
 

Modified: trunk/gforge_base/evolvisforge-5.1/src/univention/ldap2psql.sh
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/univention/ldap2psql.sh	2012-04-24 14:34:58 UTC (rev 18372)
+++ trunk/gforge_base/evolvisforge-5.1/src/univention/ldap2psql.sh	2012-04-24 14:35:02 UTC (rev 18373)
@@ -112,15 +112,16 @@
 	cmd="$cmd WHERE user_name=$Euid;"
 elif (( taction == 1 )); then
 	# create new entry
-	cmd="INSERT INTO users (user_name, email, realname,"
-	cmd="$cmd firstname, lastname, shell, unix_uid, unix_gid,"
-	cmd="$cmd add_date, confirm_hash, jabber_only, ccode, unix_pw,"
-	cmd="$cmd timezone, language, mail_siteupdates, mail_va, status,"
+	cmd="INSERT INTO users (user_name, email, realname, firstname,"
+	cmd="$cmd lastname, shell, unix_uid, unix_gid, add_date,"
+	cmd="$cmd confirm_hash, jabber_only, ccode, unix_pw, timezone,"
+	cmd="$cmd language, mail_siteupdates, mail_va, status,"
 	cmd="$cmd unix_status, sys_state, type_id, theme_id) VALUES ("
-	cmd="$cmd $Euid, $EmailPrimaryAddress, $Ern,"
-	cmd="$cmd $EgivenName, $Esn, '/lib/anonsvnsh', 11, 11,"
-	cmd="$cmd $(date -u +'%s'), $EmodifyTimestamp, 0, 'DE', $Ecryptpw,"
-	cmd="$cmd 'Europe/Berlin', 1, 1, 0, 'A', 'A', 'N', 1,"
+	cmd="$cmd $Euid, $EmailPrimaryAddress, $Ern, $EgivenName,"
+	cmd="$cmd $Esn, '/lib/anonsvnsh', 11, 11, $(date -u +'%s'),"
+	cmd="$cmd $EmodifyTimestamp, 0, 'DE', $Ecryptpw, 'Europe/Berlin',"
+	cmd="$cmd (SELECT language_id FROM supported_languages WHERE name='German'),"
+	cmd="$cmd 1, 0, 'A', 'A', 'N', 1,"
 	cmd="$cmd (SELECT theme_id FROM users WHERE user_id=101));"
 
 	cmd="$cmd UPDATE users"



More information about the evolvis-commits mailing list