From df6f79fcc350d8729bc337b4a75aa2fbfddb3e5f Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Wed, 18 Apr 2012 01:04:07 +0900 Subject: [PATCH] bundle qt translations --- .gitignore | 1 + aqt/__init__.py | 16 +++++++--------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 69de3da0f..dd5037fac 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ *\# *~ /aqt/forms +/aqt/locale diff --git a/aqt/__init__.py b/aqt/__init__.py index b0c3dc63c..3c02be939 100644 --- a/aqt/__init__.py +++ b/aqt/__init__.py @@ -87,15 +87,13 @@ def run(): pm = ProfileManager(opts.base, opts.profile) # qt translations - translationPath = '' - if False: # not isWin and not isMac: - translationPath = "/usr/share/qt4/translations/" - long = conf['interfaceLang'] - short = long.split('_')[0] - qtTranslator = QTranslator() - if qtTranslator.load("qt_" + long, translationPath) or \ - qtTranslator.load("qt_" + short, translationPath): - app.installTranslator(qtTranslator) + qtTranslator = QTranslator() + languageDir = os.path.join(moduleDir, "aqt", "locale") + if not os.path.exists(languageDir): + languageDir = os.path.join( + os.path.dirname(sys.argv[0]), "locale") + if qtTranslator.load("qt_" + pm.meta['defaultLang'], languageDir): + app.installTranslator(qtTranslator) import aqt.main mw = aqt.main.AnkiQt(app, pm)