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

fixed stuff messed up resolvesing the conflict

Browse Source
This commit is contained in:
Andreas Preikschat 2010-08-28 19:10:14 +02:00
parent 8071a65720
commit 14dbfaa4b5
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openlp/plugins/bibles/lib/mediaitem.py
View File

@ -518,8 +518,10 @@ class BibleMediaItem(MediaManagerItem):
# If we were previously 'Verse Per Line' we have to add the old # If we were previously 'Verse Per Line' we have to add the old
# bible_text, because it was not added until now. # bible_text, because it was not added until now.
if bible_text: if bible_text:
bible_text = u'%s %s \n %s %s' % (verse_text, text, raw_slides.append(bible_text)
verse_text, dual_text) bible_text = u''
bible_text = u'%s %s \n %s %s' % (verse_text, text,
verse_text, dual_text)
raw_slides.append(bible_text) raw_slides.append(bible_text)
bible_text = u'' bible_text = u''
# If we are 'Verse Per Slide' then create a new slide. # If we are 'Verse Per Slide' then create a new slide.