openlp-core team mailing list archive

[Andreas Preikschat <andreaspreikschat@xxxxxxxxxx>]

Andreas Preikschat has proposed merging lp:~googol-hush/openlp/bug-791814 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #791814 in OpenLP: "Windows: Language Menu shows wrong entries"
  https://bugs.launchpad.net/openlp/+bug/791814

For more details, see:
https://code.launchpad.net/~googol-hush/openlp/bug-791814/+merge/63239

Hello,

Fixes bug #791814 "Windows: Language Menu shows wrong entries"
-- 
https://code.launchpad.net/~googol-hush/openlp/bug-791814/+merge/63239
Your team OpenLP Core is requested to review the proposed merge of lp:~googol-hush/openlp/bug-791814 into lp:openlp.

=== modified file 'openlp/core/utils/languagemanager.py'
--- openlp/core/utils/languagemanager.py	2011-05-26 17:11:22 +0000
+++ openlp/core/utils/languagemanager.py	2011-06-02 14:06:04 +0000
@@ -77,6 +77,8 @@
             AppLocation.LanguageDir))
         file_names = trans_dir.entryList(QtCore.QStringList(u'*.qm'),
                 QtCore.QDir.Files, QtCore.QDir.Name)
+        # Remove qm files from the list which start with "qt_".
+        file_names = file_names.filter(QtCore.QRegExp("^(?!qt_)"))
         for name in file_names:
             file_names.replaceInStrings(name, trans_dir.filePath(name))
         return file_names