openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

Tim Bentley has proposed merging lp:~trb143/openlp/bugfixes into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)


Change the executable flag set in error.
-- 
https://code.launchpad.net/~trb143/openlp/bugfixes/+merge/35189
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/bugfixes into lp:openlp.

=== modified file 'openlp/core/utils/languagemanager.py'
--- openlp/core/utils/languagemanager.py	2010-07-28 13:15:39 +0000
+++ openlp/core/utils/languagemanager.py	2010-09-11 14:13:44 +0000
@@ -66,7 +66,7 @@
         Find all available language files in this OpenLP install
         """
         trans_dir = AppLocation.get_directory(AppLocation.AppDir)
-        trans_dir = QtCore.QDir(os.path.join(trans_dir, u'resources', u'i18n'))
+        trans_dir = QtCore.QDir(os.path.join(trans_dir,u'openlp', u'i18n'))
         file_names = trans_dir.entryList(QtCore.QStringList("*.qm"),
                 QtCore.QDir.Files, QtCore.QDir.Name)
         for name in file_names:

=== modified file 'openlp/plugins/remotes/html/jquery.js' (properties changed: +x to -x)