From 47441be28a8acef72c695479b8912fd504ee1fc7 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Tue, 21 Dec 2010 19:49:02 +0000 Subject: [PATCH] Fix song edit bug Fix Custom wording 693150 Fixes: https://launchpad.net/bugs/693150, https://launchpad.net/bugs/691952 --- openlp/plugins/custom/customplugin.py | 2 +- openlp/plugins/songs/forms/editsongform.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/openlp/plugins/custom/customplugin.py b/openlp/plugins/custom/customplugin.py index c7fb38e3b..ad170ea12 100644 --- a/openlp/plugins/custom/customplugin.py +++ b/openlp/plugins/custom/customplugin.py @@ -109,7 +109,7 @@ class CustomPlugin(Plugin): } ## Name for MediaDockManager, SettingsManager ## self.textStrings[StringContent.VisibleName] = { - u'title': translate('CustomsPlugin', 'Customs') + u'title': translate('CustomsPlugin', 'Custom') } # Middle Header Bar ## Import Button ## diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py index d88f39d8f..ad4182d54 100644 --- a/openlp/plugins/songs/forms/editsongform.py +++ b/openlp/plugins/songs/forms/editsongform.py @@ -736,8 +736,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog): 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 + re.sub(r'\W+', 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])