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

r1971 + conflict

Browse Source
This commit is contained in:
Andreas Preikschat 2012-05-17 23:57:00 +02:00
commit d15bb74b73
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
openlp/plugins/bibles/lib/manager.py
View File

@ -329,12 +329,7 @@ class BibleManager(object):
'Import Wizard to install one or more Bibles.')
})
return None
language_selection = self.get_meta_data(bible, u'book_name_language')
if language_selection:
language_selection = int(language_selection.value)
if language_selection is None or language_selection == -1:
language_selection = Settings().value(
self.settingsSection + u'/bookname language', 0)
language_selection = self.get_language_selection(bible)
reflist = parse_reference(versetext, self.db_cache[bible],
language_selection, book_ref_id)
if reflist:
@ -376,11 +371,15 @@ class BibleManager(object):
"""
log.debug(u'BibleManager.get_language_selection("%s")', bible)
language_selection = self.get_meta_data(bible, u'book_name_language')
if language_selection and language_selection.value != u'None':
return int(language_selection.value)
if language_selection is None or language_selection.value == u'None':
return Settings().value(
self.settingsSection + u'/bookname language', 0)
if language_selection:
try:
language_selection = int(language_selection.value)
except (ValueError, TypeError):
language_selection = LanguageSelection.Application
if language_selection is None or language_selection == -1:
language_selection = Settings().value(self.settingsSection +
u'/bookname language', LanguageSelection.Bible)
return language_selection
def verse_search(self, bible, second_bible, text):
"""

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

@ -839,10 +839,11 @@ class BibleMediaItem(MediaManagerItem):
items = []
language_selection = self.plugin.manager.get_language_selection(bible)
for count, verse in enumerate(search_results):
book = None
if language_selection == LanguageSelection.Bible:
book = verse.book.name
elif language_selection == LanguageSelection.Application:
book_names = BibleStrings().Booknames
book_names = BibleStrings().BookNames
data = BiblesResourcesDB.get_book_by_id(
verse.book.book_reference_id)
book = unicode(book_names[data[u'abbreviation']])