From 006f3908ee4bcd1f1b3cde78b89213adabd0056e Mon Sep 17 00:00:00 2001
From: Simon Schampijer <simon@schampijer.de>
Date: Fri, 20 Feb 2009 16:55:13 +0000
Subject: Better language recognition

---
(limited to 'webactivity.py')

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 
          
--
cgit v0.9.1