[debian-edu-commits] r80027 - branches/wheezy/debian-edu-config/share/debian-edu-config/tools

[pere at alioth.debian.org]

Author: pere
Date: 2013-05-08 16:20:22 +0000 (Wed, 08 May 2013)
New Revision: 80027

Modified:
   branches/wheezy/debian-edu-config/share/debian-edu-config/tools/bless-debian
Log:
Only use hardcoded langauge settings if nothing is already set on the host.

Modified: branches/wheezy/debian-edu-config/share/debian-edu-config/tools/bless-debian
===================================================================
--- branches/wheezy/debian-edu-config/share/debian-edu-config/tools/bless-debian	2013-05-08 15:06:33 UTC (rev 80026)
+++ branches/wheezy/debian-edu-config/share/debian-edu-config/tools/bless-debian	2013-05-08 16:20:22 UTC (rev 80027)
@@ -15,8 +15,13 @@
 # Install with these settings
 PROFILE="Workstation"
 
-LANG="nb_NO.UTF-8"
-LANGUAGE="nb_NO:nb:no_NO:no:nn_NO:nn:da:sv:en"
+# Use norwegian bokmål if no language is set in the host system
+if [ -z "$LANG" ] ; then
+    LANG="nb_NO.UTF-8"
+    if [ -z "$LANGUAGE" ] ; then
+	LANGUAGE="nb_NO:nb:no_NO:no:nn_NO:nn:da:sv:en"
+    fi
+fi
 
 # Any version string will do, just use the latest one from an existing
 # installation.