Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/bible-language-fix into lp:openlp.
Requested reviews: Andreas Preikschat (googol) Tim Bentley (trb143) Related bugs: Bug #997174 in OpenLP: "Webbible search causes traceback" https://bugs.launchpad.net/openlp/+bug/997174 For more details, see: https://code.launchpad.net/~raoul-snyman/openlp/bible-language-fix/+merge/105901 Fixed a super-annoying bug where any newly imported Bibles would throw an exception. -- https://code.launchpad.net/~raoul-snyman/openlp/bible-language-fix/+merge/105901 Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/plugins/bibles/lib/manager.py' --- openlp/plugins/bibles/lib/manager.py 2012-04-22 18:19:36 +0000 +++ openlp/plugins/bibles/lib/manager.py 2012-05-15 21:11:18 +0000 @@ -330,13 +330,7 @@ '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 = QtCore.QSettings().value( - self.settingsSection + u'/bookname language', - QtCore.QVariant(0)).toInt()[0] + language_selection = self.get_language_selection(bible) reflist = parse_reference(versetext, self.db_cache[bible], language_selection, book_ref_id) if reflist: @@ -378,12 +372,16 @@ """ 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 QtCore.QSettings().value( + 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 = QtCore.QSettings().value( self.settingsSection + u'/bookname language', QtCore.QVariant(0)).toInt()[0] + return language_selection def verse_search(self, bible, second_bible, text): """
_______________________________________________ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp