openlp-core team mailing list archive

[Raoul Snyman <raoul.snyman@xxxxxxxxxxxxxxxxxxxxxxxx>]

Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/bible-language-fix into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~raoul-snyman/openlp/bible-language-fix/+merge/105522

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/105522
Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/bible-language-fix into 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-11 19:17:20 +0000
@@ -332,7 +332,10 @@
             return None
         language_selection = self.get_meta_data(bible, u'book_name_language')
         if language_selection:
-            language_selection = int(language_selection.value)
+            try:
+                language_selection = int(language_selection.value)
+            except (ValueError, TypeError):
+                language_selection = 0
         if language_selection is None or language_selection == -1:
             language_selection = QtCore.QSettings().value(
                 self.settingsSection + u'/bookname language',