diff options
author | Simon Schampijer <simon@schampijer.de> | 2009-02-20 16:55:13 (GMT) |
---|---|---|
committer | Simon Schampijer <simon@schampijer.de> | 2009-02-20 16:55:13 (GMT) |
commit | 006f3908ee4bcd1f1b3cde78b89213adabd0056e (patch) | |
tree | efd48550a653a4f64c222290838741de3f34f503 | |
parent | a75dd61b7b50f33faaa26461b3f2d11ea0eaf2a6 (diff) |
Better language recognition
-rw-r--r-- | webactivity.py | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/webactivity.py b/webactivity.py index cc2a424..4617a18 100644 --- a/webactivity.py +++ b/webactivity.py @@ -551,15 +551,12 @@ class WebActivity(activity.Activity): def _set_accept_languages(self): try: - lang = os.environ['LANG'] # e.g. es_UY.UTF-8 - except: - return - - if len(lang) != 11: - _logger.debug("Set_Accept_language: bad LANG length") - return + lang = os.environ['LANG'].strip('\n') # e.g. es_UY.UTF-8 + except KeyError: + return - if not lang.endswith(".UTF-8") or lang[2] != "_": + if (not lang.endswith(".utf8") or not lang.endswith(".UTF-8")) \ + and lang[2] != "_": _logger.debug("Set_Accept_language: unrecognised LANG format") return |