[game-data-packager] 01/01: scummvm: avoid giving a special meaning to ['en']

[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 eb15d0b30eb51d411ef75b9106409456b9152f60
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date:   Mon Jun 22 09:22:15 2015 +0200

    scummvm: avoid giving a special meaning to ['en']
---
 game_data_packager/games/scummvm_common.py | 4 ++--
 tools/babel.py                             | 9 ++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/game_data_packager/games/scummvm_common.py b/game_data_packager/games/scummvm_common.py
index ccd6723..6be4dc5 100644
--- a/game_data_packager/games/scummvm_common.py
+++ b/game_data_packager/games/scummvm_common.py
@@ -45,7 +45,7 @@ class ScummvmGameData(GameData):
     def _populate_package(self, package, d):
         super(ScummvmGameData, self)._populate_package(package, d)
         package.gameid = d.get('gameid')
-        package.langs = d.get('langs',['en'])
+        package.langs = d.get('langs',[package.lang])
         assert type(package.langs) is list
 
     def fill_extra_files(self, package, destdir):
@@ -67,7 +67,7 @@ class ScummvmGameData(GameData):
         entry['Terminal'] = 'false'
         entry['Categories'] = 'game'
         gameid = package.gameid or self.gameid
-        if package.langs == ['en']:
+        if len(package.langs) == 1:
             entry['Exec'] = 'scummvm -p /%s %s' % (package.install_to, gameid)
             lintiandir = os.path.join(destdir, 'usr/share/lintian/overrides')
             mkdir_p(lintiandir)
diff --git a/tools/babel.py b/tools/babel.py
index 8a0ad3c..b231cb2 100755
--- a/tools/babel.py
+++ b/tools/babel.py
@@ -32,6 +32,12 @@ for name, game in load_games().items():
         langs[lang] = langs.get(lang, 0) + 1
         langs['total'] += 1
         stats[lang] = stats.get(lang, 0) + 1
+
+    for package in game.packages.values():
+        for m_lang in getattr(package, 'langs', []):
+            if m_lang not in stats:
+                stats[m_lang] = 'm'
+
     genres[game.genre] = genres.get(game.genre, 0) + 1
     stats['genre'] = game.genre
     stats['shortname'] = name
@@ -81,7 +87,7 @@ for game in games:
     html.write('  <td>%s</td>\n' % game['longname'])
     for lang in langs_order:
         count = game.get(lang,None)
-        if lang in ('total', 'en') or count == '*':
+        if lang in ('total', 'en') or count in ('*', 'm'):
             html.write('  <td bgcolor="lightgreen">%s</td>\n' % count)
         elif lang in missing.get(game['shortname'],[]):
             assert not count
@@ -104,6 +110,7 @@ html.write('''
 <ul>
 <li>* : provided as an alternative one-file in a 'en'/'C' package</li>
 <li>! : language is missing</li>
+<li>m : multi-lang support in a single package</li>
 </ul>
 </html>
 '''

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