Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Schampijer <simon@schampijer.de>2009-08-20 16:21:37 (GMT)
committer Simon Schampijer <simon@schampijer.de>2009-08-20 16:21:37 (GMT)
commitf6ba0a67999c7140b1398796aa6364ca1914f2eb (patch)
tree6bc116f3f93597c2a761681b58edba80527d0569
parent9cac83dae9eea3074b96095be10dad37cfd0f7e1 (diff)
Don't choke on Lang=C #979
-rw-r--r--webactivity.py14
1 files changed, 6 insertions, 8 deletions
diff --git a/webactivity.py b/webactivity.py
index f5657c7..9cbe31e 100644
--- a/webactivity.py
+++ b/webactivity.py
@@ -30,6 +30,7 @@ import shutil
import sqlite3
import cjson
import gconf
+import locale
# HACK: Needed by http://dev.sugarlabs.org/ticket/456
import gnome
@@ -135,18 +136,15 @@ from xpcom import components
def _set_accept_languages():
''' Set intl.accept_languages based on the locale
'''
- try:
- lang = os.environ['LANG'].strip('\n') # e.g. es_UY.UTF-8
- except KeyError:
- return
- if (not lang.endswith(".utf8") or not lang.endswith(".UTF-8")) \
- and lang[2] != "_":
+ lang = locale.getdefaultlocale()[0]
+ if not lang:
_logger.debug("Set_Accept_language: unrecognised LANG format")
- return
+ return
+ lang = lang.split('_')
# e.g. es-uy, es
- pref = lang[0:2] + "-" + lang[3:5].lower() + ", " + lang[0:2]
+ pref = lang[0] + "-" + lang[1].lower() + ", " + lang[0]
cls = components.classes["@mozilla.org/preferences-service;1"]
prefService = cls.getService(components.interfaces.nsIPrefService)
branch = prefService.getBranch('')