Frode Woldsund has proposed merging lp:~frodus86/openlp/translate into
lp:openlp.
Requested reviews:
Raoul Snyman (raoul-snyman): approve
Jonathan Corwin (j-corwin)
Fixed the two last translate() functions in the trunk. Now all translate()
functions should be correct.
--
https://code.launchpad.net/~frodus86/openlp/translate/+merge/28484
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/plugins/songs/forms/editsongform.py'
--- openlp/plugins/songs/forms/editsongform.py 2010-06-21 18:00:21 +0000
+++ openlp/plugins/songs/forms/editsongform.py 2010-06-25 08:10:52 +0000
@@ -589,7 +589,7 @@
def onCopyrightInsertButtonTriggered(self):
text = self.CopyrightEditItem.text()
pos = self.CopyrightEditItem.cursorPosition()
- text = text[:pos] + u'\xa9' + text[pos:]
+ text = text[:pos] + '\xa9' + text[pos:]
self.CopyrightEditItem.setText(text)
self.CopyrightEditItem.setFocus()
self.CopyrightEditItem.setCursorPosition(pos + 1)
=== 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-25 08:10:52 +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,10 +63,10 @@
self.verses = []
self.versecount = 0
self.choruscount = 0
- self.copyright_string = unicode(QtGui.QApplication.translate(
- u'SongsPlugin.SongImport', u'copyright'))
- self.copyright_symbol = unicode(QtGui.QApplication.translate(
- u'SongsPlugin.SongImport', u'\xa9'))
+ self.copyright_string = unicode(translate(
+ 'SongsPlugin.SongImport', 'copyright'))
+ self.copyright_symbol = unicode(translate(
+ 'SongsPlugin.SongImport', '\xa9'))
@staticmethod
def process_songs_text(manager, text):
_______________________________________________
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help : https://help.launchpad.net/ListHelp
