openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

Tim Bentley has proposed merging lp:~trb143/openlp/bugs into lp:openlp.

Requested reviews:
  Jon Tibble (meths)
  Raoul Snyman (raoul-snyman)
Related bugs:
  #693150 Custom Slide Display footer option
  https://bugs.launchpad.net/bugs/693150


Fix song Saving bug 691952
Fix Custom edit bug 693150
-- 
https://code.launchpad.net/~trb143/openlp/bugs/+merge/44386
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp/plugins/custom/customplugin.py'
--- openlp/plugins/custom/customplugin.py	2010-10-28 14:56:52 +0000
+++ openlp/plugins/custom/customplugin.py	2010-12-21 19:54:13 +0000
@@ -109,7 +109,7 @@
         }
         ## Name for MediaDockManager, SettingsManager ##
         self.textStrings[StringContent.VisibleName] = {
-            u'title': translate('CustomsPlugin', 'Customs')
+            u'title': translate('CustomsPlugin', 'Custom')
         }
         # Middle Header Bar
         ## Import Button ##

=== modified file 'openlp/plugins/songs/forms/editsongform.py'
--- openlp/plugins/songs/forms/editsongform.py	2010-12-18 17:11:21 +0000
+++ openlp/plugins/songs/forms/editsongform.py	2010-12-21 19:54:13 +0000
@@ -736,7 +736,7 @@
                 verseId = unicode(item.data(QtCore.Qt.UserRole).toString())
                 bits = verseId.split(u':')
                 sxml.add_verse_to_lyrics(bits[0], bits[1], unicode(item.text()))
-                text = text + whitespace.sub(u' ',
+                text = text + self.whitespace.sub(u' ',
                     unicode(self.VerseListWidget.item(i, 0).text())) + u' '
                 if (bits[1] > u'1') and (bits[0][0] not in multiple):
                     multiple.append(bits[0][0])