openlp-core team mailing list archive

[Frode Woldsund <frodus86@xxxxxxxxx>]

Frode Woldsund has proposed merging lp:~frodus86/openlp/translate into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)


Fixed the two last translate() functions in the trunk. Now all translate() functions should be correct.
-- 
https://code.launchpad.net/~frodus86/openlp/translate/+merge/28272
Your team OpenLP Core is requested to review the proposed merge of lp:~frodus86/openlp/translate into lp:openlp.

=== modified file 'openlp/plugins/songs/lib/songimport.py'
--- openlp/plugins/songs/lib/songimport.py	2010-06-21 20:52:25 +0000
+++ openlp/plugins/songs/lib/songimport.py	2010-06-23 07:16:27 +0000
@@ -27,7 +27,7 @@
 
 from PyQt4 import QtGui
 
-from openlp.core.lib import SongXMLBuilder
+from openlp.core.lib import SongXMLBuilder, translate
 from openlp.plugins.songs.lib import VerseType
 from openlp.plugins.songs.lib.models import Song, Author, Topic, Book
 
@@ -63,9 +63,9 @@
         self.verses = []
         self.versecount = 0
         self.choruscount = 0
-        self.copyright_string = unicode(QtGui.QApplication.translate(
+        self.copyright_string = unicode(translate(
             u'SongsPlugin.SongImport', u'copyright'))
-        self.copyright_symbol = unicode(QtGui.QApplication.translate(
+        self.copyright_symbol = unicode(translate(
             u'SongsPlugin.SongImport', u'\xa9'))
 
     @staticmethod