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

Changed the requested python2 stuff into python 3 stuff.

Browse Source
This commit is contained in:
suutari-olli 2016-05-02 11:06:05 +03:00
parent f5e7e932d1
commit 7721b853af
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -703,8 +703,9 @@ class BibleMediaItem(MediaManagerItem):
for verse in self.search_results:
db_book = bibles[second_bible].get_book_by_book_ref_id(verse.book.book_reference_id)
if not db_book:
log.debug('Passage "%s %d:%d" not found in Second Bible' %
(verse.book.name, verse.chapter, verse.verse))
log.debug('Passage ("{versebookname}","{versechapter}","{verseverse}") not found in Second Bible'
.format(versebookname=verse.book.name, versechapter='verse.chapter',
verseverse=verse.verse))
passage_not_found = True
count += 1
continue
@ -715,9 +716,9 @@ class BibleMediaItem(MediaManagerItem):
self.main_window.information_message(
translate('BiblesPlugin.MediaItem', 'Information'),
translate('BiblesPlugin.MediaItem', 'The second Bible does not contain all the verses '
'that are in the main Bible. Only verses found in both Bibles '
'will be shown. %d verses have not been included '
'in the results.') % count)
'that are in the main Bible.\nOnly verses found in both Bibles'
' will be shown.\n\n {count} verses have not been included '
'in the results.').format(count=count))
# Join the searches so only verses that are found on both Bibles are shown.
self.search_results = new_search_results
self.second_search_results = bibles[second_bible].get_verses(text)