openlp-core team mailing list archive

[m2j <meinertjordan@xxxxxxxxxx>]

m2j has proposed merging lp:~m2j/openlp/smallfix into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~m2j/openlp/smallfix/+merge/58642

- fix the recreation of the song order to work with single character verse references
- rename 'type' variable to avoid the function name (and unify the naming)
- fix: remove unicode string in a translate() call
-- 
https://code.launchpad.net/~m2j/openlp/smallfix/+merge/58642
Your team OpenLP Core is requested to review the proposed merge of lp:~m2j/openlp/smallfix into lp:openlp.

=== modified file 'openlp/core/ui/printserviceform.py'
--- openlp/core/ui/printserviceform.py	2011-04-15 21:43:59 +0000
+++ openlp/core/ui/printserviceform.py	2011-04-21 09:08:34 +0000
@@ -224,7 +224,7 @@
         if self.footerTextEdit.toPlainText():
             div = self._addChildToParent(u'div', parent=html_data.body)
             self._addChildToParent(u'span', translate('OpenLP.ServiceManager',
-                u'Custom Service Notes:'), div, u'class', u'customNotesTitle')
+                'Custom Service Notes:'), div, u'class', u'customNotesTitle')
             self._addChildToParent(
                 u'span', u' %s' % self.footerTextEdit.toPlainText(), div,
                 u'class', u'customNotesText')
@@ -380,4 +380,4 @@
             QtCore.QVariant(self.metaDataCheckBox.isChecked()))
         settings.setValue(u'print notes',
             QtCore.QVariant(self.notesCheckBox.isChecked()))
-        settings.endGroup()
\ No newline at end of file
+        settings.endGroup()

=== modified file 'openlp/plugins/songs/lib/__init__.py'
--- openlp/plugins/songs/lib/__init__.py	2011-03-24 19:04:02 +0000
+++ openlp/plugins/songs/lib/__init__.py	2011-04-21 09:08:34 +0000
@@ -278,24 +278,29 @@
     # List for later comparison.
     compare_order = []
     for verse in verses:
-        type = VerseType.Tags[VerseType.from_loose_input(verse[0][u'type'])]
+        verse_type = VerseType.Tags[VerseType.from_loose_input(
+            verse[0][u'type'])]
         sxml.add_verse_to_lyrics(
-            type,
+            verse_type,
             verse[0][u'label'],
             verse[1],
             verse[0][u'lang'] if verse[0].has_key(u'lang') else None
         )
-        compare_order.append((u'%s%s' % (type, verse[0][u'label'])).upper())
+        compare_order.append((u'%s%s' % (verse_type, verse[0][u'label'])
+            ).upper())
+        if verse[0][u'label'] == u'1':
+            compare_order.append(verse_type.upper())
     song.lyrics = unicode(sxml.extract_xml(), u'utf-8')
     # Rebuild the verse order, to convert translated verse tags, which might
     # have been added prior to 1.9.5.
     order = song.verse_order.strip().split()
     new_order = []
     for verse_def in order:
-        new_order.append((u'%s%s' % (
-            VerseType.Tags[VerseType.from_loose_input(verse_def[0])],
-            verse_def[1:])).upper()
-        )
+        verse_type = VerseType.Tags[VerseType.from_loose_input(verse_def[0])]
+        if len(verse_def) > 1:
+            new_order.append((u'%s%s' % (verse_type, verse_def[1:])).upper())
+        else:
+            new_order.append(verse_type.upper())
     song.verse_order = u' '.join(new_order)
     # Check if the verse order contains tags for verses which do not exist.
     for order in new_order: