openlp-core team mailing list archive

[Michael Gorven <michael@xxxxxxxxxxxxx>]

Michael Gorven has proposed merging lp:~mgorven/openlp/copyright-symbol into lp:openlp.

    Requested reviews:
    OpenLP Core (openlp-core)


Fix that darn copyright symbol!
-- 
https://code.launchpad.net/~mgorven/openlp/copyright-symbol/+merge/15399
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp/core/ui/about.py'
--- openlp/core/ui/about.py	2009-11-24 19:51:41 +0000
+++ openlp/core/ui/about.py	2009-11-30 06:50:23 +0000
@@ -150,7 +150,7 @@
         """
         AboutForm.setWindowTitle(self.trUtf8('About openlp.org'))
         self.CopyrightLabel.setText(
-            self.trUtf8('Copyright \u00a9 2004-2009 openlp.org Foundation'))
+            self.trUtf8(u'Copyright \u00a9 2004-2009 openlp.org Foundation'.encode('utf8')))
         self.AboutAuthors.setText(self.trUtf8(
             'openlp.org is written and maintained by volunteers. If you would '
             'like to see more free Christian software being written, please '

=== modified file 'openlp/plugins/songs/forms/editsongdialog.py'
--- openlp/plugins/songs/forms/editsongdialog.py	2009-11-26 18:43:49 +0000
+++ openlp/plugins/songs/forms/editsongdialog.py	2009-11-30 06:50:23 +0000
@@ -441,7 +441,7 @@
         self.ThemeGroupBox.setTitle(self.trUtf8('Theme'))
         self.ThemeAddButton.setText(self.trUtf8('Add a Theme'))
         self.CopyrightGroupBox.setTitle(self.trUtf8('Copyright Information'))
-        self.CopyrightInsertButton.setText(self.trUtf8('\u00a9'))
+        self.CopyrightInsertButton.setText(self.trUtf8(u'\u00a9'.encode('utf8')))
         self.CCLILabel.setText(self.trUtf8('CCLI Number:'))
         self.CommentsGroupBox.setTitle(self.trUtf8('Comments'))
         self.SongTabWidget.setTabText(