openlp-core team mailing list archive

[Andreas Preikschat <andreaspreikschat@xxxxxxxxxx>]

Andreas Preikschat has proposed merging lp:~googol-hush/openlp/bug-788770 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~googol-hush/openlp/bug-788770/+merge/63518

Hello,

- fixed bug 788770
- fixed space in the media manager " Genesis 1:1 (first bible, second bible)"
-- 
https://code.launchpad.net/~googol-hush/openlp/bug-788770/+merge/63518
Your team OpenLP Core is requested to review the proposed merge of lp:~googol-hush/openlp/bug-788770 into lp:openlp.

=== modified file 'openlp/plugins/bibles/lib/mediaitem.py'
--- openlp/plugins/bibles/lib/mediaitem.py	2011-06-03 05:43:02 +0000
+++ openlp/plugins/bibles/lib/mediaitem.py	2011-06-06 06:07:27 +0000
@@ -772,7 +772,7 @@
                     log.exception(u'The second_search_results does not have as '
                     'many verses as the search_results.')
                     break
-                bible_text = u' %s %d%s%d (%s, %s)' % (verse.book.name,
+                bible_text = u'%s %d%s%d (%s, %s)' % (verse.book.name,
                     verse.chapter, verse_separator, verse.verse, version,
                     second_version)
             else:
@@ -830,7 +830,7 @@
                 bible_text = u''
             # If we are 'Verse Per Line' then force a new line.
             elif self.settings.layout_style == LayoutStyle.VersePerLine:
-                bible_text = u'%s %s %s\n' % (bible_text, verse_text, text)
+                bible_text = u'%s%s %s\n' % (bible_text, verse_text, text)
             # We have to be 'Continuous'.
             else:
                 bible_text = u'%s %s %s\n' % (bible_text, verse_text, text)