From 78c06f9f569b02721a1049bb740366ceaa01f4f5 Mon Sep 17 00:00:00 2001
From: Simon Schampijer <simon@schampijer.de>
Date: Wed, 07 Jul 2010 10:29:54 +0000
Subject: Merge branch 'master' of gitorious@git.sugarlabs.org:sugar/mainline

---
diff --git a/extensions/cpsection/language/model.py b/extensions/cpsection/language/model.py
index 6b4d2db..4f3686f 100644
--- a/extensions/cpsection/language/model.py
+++ b/extensions/cpsection/language/model.py
@@ -25,7 +25,7 @@ import locale
 from gettext import gettext as _
 import subprocess
 
-_default_lang = 'en_US.utf8'
+_default_lang = '%s.%s' % locale.getdefaultlocale()
 _standard_msg = _("Could not access ~/.i18n. Create standard settings.")
 
 def read_all_languages():
@@ -53,9 +53,6 @@ def read_all_languages():
     return locales
 
 def _initialize():      
-    global _default_lang
-    _default_lang = '%s.%s' % locale.getdefaultlocale()
-
     if set_languages.__doc__ is None:
         # when running under 'python -OO', all __doc__ fields are None,
         # so += would fail -- and this function would be unnecessary anyway.
--
cgit v0.9.1