openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

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

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #742636 in OpenLP: "Leading spaces in song titles are stripped"
  https://bugs.launchpad.net/openlp/+bug/742636

For more details, see:
https://code.launchpad.net/~trb143/openlp/beta1/+merge/59453

Fix the strip to remove a leading space for the song title.
-- 
https://code.launchpad.net/~trb143/openlp/beta1/+merge/59453
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/beta1 into lp:openlp.

=== modified file 'openlp/plugins/bibles/lib/mediaitem.py'
--- openlp/plugins/bibles/lib/mediaitem.py	2011-04-16 11:42:35 +0000
+++ openlp/plugins/bibles/lib/mediaitem.py	2011-04-29 06:23:23 +0000
@@ -850,4 +850,4 @@
             self.settings.layout_style)
         QtCore.QSettings().setValue(
             self.settingsSection + u'/verse layout style',
-            QtCore.QVariant(self.settings.layout_style))
\ No newline at end of file
+            QtCore.QVariant(self.settings.layout_style))

=== modified file 'openlp/plugins/songs/forms/editsongform.py'
--- openlp/plugins/songs/forms/editsongform.py	2011-04-16 11:42:35 +0000
+++ openlp/plugins/songs/forms/editsongform.py	2011-04-29 06:23:23 +0000
@@ -576,11 +576,13 @@
                     if verse_index is not None:
                         order.append(VerseType.Tags[verse_index] + u'1')
                     else:
-                        order.append(u'') # it matches no verses anyway
+                        # it matches no verses anyway
+                        order.append(u'')
                 else:
                     verse_index = VerseType.from_translated_tag(item[0])
                     if verse_index is None:
-                        order.append(u'') # same as above
+                        # it matches no verses anyway
+                        order.append(u'')
                     else:
                         verse_tag = VerseType.Tags[verse_index]
                         verse_num = item[1:].lower()
@@ -779,4 +781,4 @@
                     self.song.verse_order)
         except:
             log.exception(u'Problem processing song Lyrics \n%s',
-                sxml.dump_xml())
\ No newline at end of file
+                sxml.dump_xml())

=== modified file 'openlp/plugins/songs/lib/__init__.py'
--- openlp/plugins/songs/lib/__init__.py	2011-04-21 09:02:41 +0000
+++ openlp/plugins/songs/lib/__init__.py	2011-04-29 06:23:23 +0000
@@ -257,7 +257,7 @@
     ``song``
         The song object.
     """
-    song.title = song.title.strip() if song.title else u''
+    song.title = song.title.rstrip() if song.title else u''
     if song.alternate_title is None:
         song.alternate_title = u''
     song.alternate_title = song.alternate_title.strip()