forked from openlp/openlp
Fix tags
This commit is contained in:
parent
332d9fa6f0
commit
9032935219
|
@ -323,9 +323,9 @@ class SongMediaItem(MediaManagerItem):
|
||||||
#no verse list or only 1 space (in error)
|
#no verse list or only 1 space (in error)
|
||||||
if not song.verse_order or not song.verse_order.strip():
|
if not song.verse_order or not song.verse_order.strip():
|
||||||
for verse in verseList:
|
for verse in verseList:
|
||||||
verseTag = u'%s:%s' % (verse[0][u'type'], verse[0][u'label'])
|
verse_tag = u'%s:%s' % (verse[0][u'type'], verse[0][u'label'])
|
||||||
service_item.add_from_text(\
|
service_item.add_from_text(\
|
||||||
verse[1][:30], unicode(verse[1]), verseTag)
|
verse[1][:30], unicode(verse[1]), verse_tag)
|
||||||
else:
|
else:
|
||||||
#Loop through the verse list and expand the song accordingly.
|
#Loop through the verse list and expand the song accordingly.
|
||||||
for order in song.verse_order.upper().split(u' '):
|
for order in song.verse_order.upper().split(u' '):
|
||||||
|
@ -337,16 +337,16 @@ class SongMediaItem(MediaManagerItem):
|
||||||
or verse[0][u'type'] == "Chorus":
|
or verse[0][u'type'] == "Chorus":
|
||||||
if verse[0][u'label'] == order[1:] and \
|
if verse[0][u'label'] == order[1:] and \
|
||||||
verse[0][u'type'][0] == order[0]:
|
verse[0][u'type'][0] == order[0]:
|
||||||
verseTag = u'%s:%s' % \
|
verse_tag = u'%s:%s' % \
|
||||||
(verse[0][u'type'], verse[0][u'label'])
|
(verse[0][u'type'], verse[0][u'label'])
|
||||||
service_item.add_from_text\
|
service_item.add_from_text\
|
||||||
(verse[1][:30], verse[1], verseTag)
|
(verse[1][:30], verse[1], verse_tag)
|
||||||
else:
|
else:
|
||||||
if verse[0][u'type'][0] == order[0]:
|
if verse[0][u'type'][0] == order[0]:
|
||||||
verseTag = u'%s:%s' % \
|
verse_tag = u'%s:%s' % \
|
||||||
(verse[0][u'type'], verse[0][u'label'])
|
(verse[0][u'type'], verse[0][u'label'])
|
||||||
service_item.add_from_text\
|
service_item.add_from_text\
|
||||||
(verse[1][:30], verse[1], verseTag)
|
(verse[1][:30], verse[1], verse_tag)
|
||||||
else:
|
else:
|
||||||
verses = song.lyrics.split(u'\n\n')
|
verses = song.lyrics.split(u'\n\n')
|
||||||
for slide in verses:
|
for slide in verses:
|
||||||
|
|
Loading…
Reference in New Issue