openlp-core team mailing list archive

[Andreas Preikschat <andreaspreikschat@xxxxxxxxxx>]

Andreas Preikschat has proposed merging lp:~googol/openlp/song-test-fix into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~googol/openlp/song-test-fix/+merge/173330

Hello,

- Fixed a song test, returning a translated string (causing the test to fail)
-- 
https://code.launchpad.net/~googol/openlp/song-test-fix/+merge/173330
Your team OpenLP Core is requested to review the proposed merge of lp:~googol/openlp/song-test-fix into lp:openlp.

=== modified file 'tests/functional/openlp_plugins/songs/test_mediaitem.py'
--- tests/functional/openlp_plugins/songs/test_mediaitem.py	2013-05-19 07:35:07 +0000
+++ tests/functional/openlp_plugins/songs/test_mediaitem.py	2013-07-06 20:23:25 +0000
@@ -7,7 +7,7 @@
 
 from mock import patch, MagicMock
 
-from PyQt4 import QtGui
+from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import Registry, ServiceItem, Settings
 
@@ -32,6 +32,7 @@
         fd, self.ini_file = mkstemp(u'.ini')
         Settings().set_filename(self.ini_file)
         self.application = QtGui.QApplication.instance()
+        QtCore.QLocale.setDefault(QtCore.QLocale('en_GB'))
 
     def tearDown(self):
         """