raoul
/
openlp
forked from openlp/openlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- 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

bzr-revno: 1489
This commit is contained in:
Meinert Jordan 2011-04-26 19:16:13 +01:00 committed by Jonathan Corwin
parent f1f8a7a4d7 2582b33768
commit 62d55814d2
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp/core/ui/printserviceform.py
View File

@ -191,7 +191,7 @@ class PrintServiceForm(QtGui.QDialog, Ui_PrintServiceDialog):
div = self._addElement(u'div', parent=html_data.body, div = self._addElement(u'div', parent=html_data.body,
classId=u'customNotes') classId=u'customNotes')
self._addElement(u'span', translate('OpenLP.ServiceManager', self._addElement(u'span', translate('OpenLP.ServiceManager',
u'Custom Service Notes: '), div, classId=u'customNotesTitle') 'Custom Service Notes: '), div, classId=u'customNotesTitle')
self._addElement(u'span', self.footerTextEdit.toPlainText(), div, self._addElement(u'span', self.footerTextEdit.toPlainText(), div,
classId=u'customNotesText') classId=u'customNotesText')
self.document.setHtml(html.tostring(html_data)) self.document.setHtml(html.tostring(html_data))

19
openlp/plugins/songs/lib/__init__.py
View File

@ -278,24 +278,29 @@ def clean_song(manager, song):
# List for later comparison. # List for later comparison.
compare_order = [] compare_order = []
for verse in verses: 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( sxml.add_verse_to_lyrics(
type, verse_type,
verse[0][u'label'], verse[0][u'label'],
verse[1], verse[1],
verse[0][u'lang'] if verse[0].has_key(u'lang') else None 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') song.lyrics = unicode(sxml.extract_xml(), u'utf-8')
# Rebuild the verse order, to convert translated verse tags, which might # Rebuild the verse order, to convert translated verse tags, which might
# have been added prior to 1.9.5. # have been added prior to 1.9.5.
order = song.verse_order.strip().split() order = song.verse_order.strip().split()
new_order = [] new_order = []
for verse_def in order: for verse_def in order:
new_order.append((u'%s%s' % ( verse_type = VerseType.Tags[VerseType.from_loose_input(verse_def[0])]
VerseType.Tags[VerseType.from_loose_input(verse_def[0])], if len(verse_def) > 1:
verse_def[1:])).upper() 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) song.verse_order = u' '.join(new_order)
# Check if the verse order contains tags for verses which do not exist. # Check if the verse order contains tags for verses which do not exist.
for order in new_order: for order in new_order: