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

[pere at alioth.debian.org]

Author: pere
Date: 2013-05-14 20:54:10 +0000 (Tue, 14 May 2013)
New Revision: 80062

Modified:
   branches/wheezy/debian-edu-config/share/debian-edu-config/tools/debian-edu-bless
Log:
Change default locale from nb_NO.UTF-8 to en_US.UTF-8.

Modified: branches/wheezy/debian-edu-config/share/debian-edu-config/tools/debian-edu-bless
===================================================================
--- branches/wheezy/debian-edu-config/share/debian-edu-config/tools/debian-edu-bless	2013-05-13 06:36:20 UTC (rev 80061)
+++ branches/wheezy/debian-edu-config/share/debian-edu-config/tools/debian-edu-bless	2013-05-14 20:54:10 UTC (rev 80062)
@@ -19,12 +19,16 @@
 # Valid values are currently kde, gnome, lxde
 DESKTOP="kde"
 
-# Use norwegian bokmål if no language is set in the host system
+# LANG is the locale to use (should be configured using
+# dpkg-reconfigure locales), and LANGUAGE is the ordered set of
+# languages to show when showing translated strings.  Here is how
+# nb_NO should be using both (the values used by d-i):
+# LANG="nb_NO.UTF-8"
+# LANGUAGE="nb_NO:nb:no_NO:no:nn_NO:nn:da:sv:en"
+
+# Use american english 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
+    LANG="en_US.UTF-8"
 fi
 
 # Any version string will do.  If an old and official version string