openlp-core team mailing list archive

[Frode Woldsund <frodus86@xxxxxxxxx>]

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/28299
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp/core/ui/aboutdialog.py'
--- openlp/core/ui/aboutdialog.py	2010-06-18 23:48:16 +0000
+++ openlp/core/ui/aboutdialog.py	2010-06-23 14:14:27 +0000
@@ -169,8 +169,9 @@
             self.AboutNotebook.indexOf(self.CreditsTab),
             translate('AboutForm', 'Credits'))
         self.LicenseTextEdit.setPlainText(translate('AboutForm', 
-            'Copyright \xa9 2004-2010 Raoul Snyman\n'
-            'Portions copyright \xa9 2004-2010 '
+            'Copyright ' + u'\u00a9'.encode('utf8') + 
+            ' 2004-2010 Raoul Snyman\n'
+            'Portions copyright ' + u'\u00a9'.encode('utf8') +  '2004-2010 '
             'Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri, '
             'Christian Richter, Maikel Stuivenberg, Martin Thompson, Jon '
             'Tibble, Carsten Tinggaard\n'

=== modified file 'openlp/plugins/songs/forms/editsongdialog.py'
--- openlp/plugins/songs/forms/editsongdialog.py	2010-06-21 16:43:59 +0000
+++ openlp/plugins/songs/forms/editsongdialog.py	2010-06-23 14:14:27 +0000
@@ -482,7 +482,7 @@
         self.CopyrightGroupBox.setTitle(
             translate('SongsPlugin.EditSongForm', 'Copyright Information'))
         self.CopyrightInsertButton.setText(
-            translate('SongsPlugin.EditSongForm', '\xa9'))
+            translate('SongsPlugin.EditSongForm', u'\u00a9'.encode('utf8')))
         self.CCLILabel.setText(
             translate('SongsPlugin.EditSongForm', 'CCLI Number:'))
         self.CommentsGroupBox.setTitle(

=== 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-23 14:14:27 +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] + u'\u00a9'.encode('utf8') + 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-23 14:14: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,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', u'\u00a9'.encode('utf8')))
 
     @staticmethod
     def process_songs_text(manager, text):