[game-data-packager] 01/03: language detection: differentiate en_GB from en, pt_BR from pt

[Alexandre Detiste]

This is an automated email from the git hooks/post-receive script.

detiste-guest pushed a commit to branch master
in repository game-data-packager.

commit 51b1fec1bd5d04f6757bac414ca4be50a340ed19
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date:   Fri Apr 24 13:00:35 2015 +0200

    language detection: differentiate en_GB from en, pt_BR from pt
    
    needed for Dreamweb & Broken Sword addons
    http://scummvm.org/games
---
 game_data_packager/util.py | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/game_data_packager/util.py b/game_data_packager/util.py
index a493cf8..7e9606b 100644
--- a/game_data_packager/util.py
+++ b/game_data_packager/util.py
@@ -92,17 +92,22 @@ def is_installed(package):
     return os.path.isdir(os.path.join('/usr/share/doc', package))
 
 def prefered_lang():
-    lang_pref = []
+    lang_raw = []
     if 'LANGUAGE' in os.environ:
-        for lang in os.getenv('LANGUAGE').split(':'):
-            if lang and lang not in lang_pref:
-                lang_pref.append(lang.split('_')[0])
+        lang_raw = os.getenv('LANGUAGE').split(':')
     if 'LANG' in os.environ:
-        lang = os.getenv('LANG').split('_')[0]
-        if lang and lang != 'C' and lang not in lang_pref:
+        lang_raw.append(os.getenv('LANG'))
+    lang_raw.append('en')
+
+    lang_pref = []
+    for lang in lang_raw:
+        lang = lang.split('.')[0]
+        if not lang or lang == 'C':
+            continue
+        if lang in ('en_GB', 'pt_BR'):
             lang_pref.append(lang)
-    if 'en' not in lang_pref:
-        lang_pref.append('en')
+        else:
+            lang_pref.append(lang[0:2])
     return lang_pref
 
 def lang_score(lang):

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git