openlp-core team mailing list archive

[Andreas Preikschat <andreaspreikschat@xxxxxxxxxx>]

Andreas Preikschat has proposed merging lp:~googol-hush/openlp/bibles into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~googol-hush/openlp/bibles/+merge/50795

Hello!

Added apocrypha to osis import. (I didn't update the httpbooks.sqlite, beause I have not found any web bible which provides the apocrypha). I hope I didn't miss any importer, but to me it seemed that they were taking care of this (apart from the osis importer).

Cheers
-- 
https://code.launchpad.net/~googol-hush/openlp/bibles/+merge/50795
Your team OpenLP Core is requested to review the proposed merge of lp:~googol-hush/openlp/bibles into lp:openlp.

=== modified file 'openlp/plugins/bibles/lib/osis.py'
--- openlp/plugins/bibles/lib/osis.py	2011-02-16 17:54:31 +0000
+++ openlp/plugins/bibles/lib/osis.py	2011-02-22 18:57:04 +0000
@@ -126,7 +126,7 @@
                     verse_text = match.group(4)
                     if not db_book or db_book.name != self.books[book][0]:
                         log.debug(u'New book: "%s"', self.books[book][0])
-                        if book == u'Matt':
+                        if book == u'Matt' or book == u'Jdt':
                             testament += 1
                         db_book = self.create_book(
                             unicode(self.books[book][0]),

=== modified file 'openlp/plugins/bibles/resources/osisbooks.csv'
--- openlp/plugins/bibles/resources/osisbooks.csv	2011-01-05 18:25:40 +0000
+++ openlp/plugins/bibles/resources/osisbooks.csv	2011-02-22 18:57:04 +0000
@@ -64,3 +64,13 @@
 3John,3 John,3John
 Jude,Jude,Jude
 Rev,Revelation,Rev
+Jdt,Judith,Jdt
+Wis,Wisdom,Wis
+Tob,Tobit,Tob
+Sir,Sirach,Sir
+Bar,Baruch,Bar
+1Macc,1 Maccabees,1Macc
+2Macc,2 Maccabees,2Macc
+AddDan,Rest of Daniel,AddDan
+AddEsth,Rest of Esther,AddEsth
+PrMan,Prayer of Manasses,PrMan