From b9204fa62b650a8c2c926eb9b4ce3ff5d0e90a5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Armin=20K=C3=B6hler?= <orangeshirt@web.de>
Date: Mon, 2 May 2011 20:20:38 +0200
Subject: [PATCH] small changes

---
 openlp/plugins/bibles/lib/db.py               |  14 +++++++-------
 .../bibles/resources/bibles_resources.sqlite  | Bin 101376 -> 104448 bytes
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/openlp/plugins/bibles/lib/db.py b/openlp/plugins/bibles/lib/db.py
index a53413063..2311c7f00 100644
--- a/openlp/plugins/bibles/lib/db.py
+++ b/openlp/plugins/bibles/lib/db.py
@@ -333,13 +333,10 @@ class BibleDB(QtCore.QObject, Manager):
         if BiblesResourcesDB.get_book(book, True):
             book_temp = BiblesResourcesDB.get_book(book, True)
             book_id = book_temp[u'id']
-        elif BiblesResourcesDB.get_alternative_book_name(book, language_id):
-            book_id = BiblesResourcesDB.get_alternative_book_name(book, 
-                language_id)
-        elif AlternativeBookNamesDB.get_book_reference_id(book, 
-            language_id):
-            book_id = AlternativeBookNamesDB.get_book_reference_id(
-                book, language_id)
+        elif BiblesResourcesDB.get_alternative_book_name(book):
+            book_id = BiblesResourcesDB.get_alternative_book_name(book)
+        elif AlternativeBookNamesDB.get_book_reference_id(book):
+            book_id = AlternativeBookNamesDB.get_book_reference_id(book)
         else:
             from openlp.plugins.bibles.forms import BookNameForm
             book_ref = None
@@ -569,6 +566,9 @@ class BiblesResourcesDB(QtCore.QObject, Manager):
 
         ``name``
             The name or abbreviation of the book.
+        
+        ``lower``
+            True if the comparsion should be only lowercase
         """
         log.debug(u'BiblesResourcesDB.get_book("%s")', name)
         if not isinstance(name, unicode):
diff --git a/openlp/plugins/bibles/resources/bibles_resources.sqlite b/openlp/plugins/bibles/resources/bibles_resources.sqlite
index 302c6a1c83ff0b9b7530a7df2ddf34f2737089d9..9336918f2d187da2a2e0a96819dfc2ceda31dabe 100644
GIT binary patch
delta 2688
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
F{{iRT@`C^X

delta 87
zcmZqJz}7H>ZGtrG0|o|$<cSLQj1M*@{NQ3|IjzOY9LYG@!CP%}D|dYahdQ$)Pz6Ks
qWS$hi&5A6Cn3`qMx67n6zEEJ6U~-$z-oa=H6y{^v?$*V)ixB{B85p(z