From dfd53e562839c5beb9993d085c613a503df2bf31 Mon Sep 17 00:00:00 2001
From: andreas <andreas@andypc>
Date: Thu, 27 May 2010 18:13:25 +0200
Subject: [PATCH 1/2] - footer now displays both bible versions/copyright
 information (dual bible view) - small fix

---
 openlp/plugins/bibles/lib/mediaitem.py | 28 ++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py
index 9f0a8e00d..07186544c 100644
--- a/openlp/plugins/bibles/lib/mediaitem.py
+++ b/openlp/plugins/bibles/lib/mediaitem.py
@@ -463,7 +463,19 @@ class BibleMediaItem(MediaManagerItem):
                 bible2_verses.extend(self.parent.manager.get_verses(bible2, scripture))
             bible2_version = self.parent.manager.get_meta_data(bible2, u'Version')
             bible2_copyright = self.parent.manager.get_meta_data(bible2, u'Copyright')
-            bible2_permission = self.parent.manager.get_meta_data(bible2, u'Permission')
+            bible2_permission = self.parent.manager.get_meta_data(bible2, u'Permissions')
+            if bible2_version:
+                bible2_version = bible2_version.value
+            else:
+                bible2_version = u''            
+            if bible2_copyright:
+                bible2_copyright = bible2_copyright.value
+            else:
+                bible2_copyright = u''
+            if bible2_permission:
+                bible2_permission = bible2_permission.value
+            else:
+                bible2_permission = u''
         # Let's loop through the main lot, and assemble our verses
         for item in items:
             bitem = self.ListView.item(item.row())
@@ -487,13 +499,17 @@ class BibleMediaItem(MediaManagerItem):
             else:
                 verse_text = self.formatVerse(old_chapter, chapter, verse, u'', u'')
             old_chapter = chapter
-            footer = u'%s (%s %s)' % (book, version, copyright)
-            #If not found add to footer
+            footer = u'%s' % (book)
+            #If not found add book to footer
+            if footer not in raw_footer:
+                raw_footer.append(footer)
+            footer = u'%s %s' % (version, copyright)
+            #If not found add version and copyright to footer
             if footer not in raw_footer:
                 raw_footer.append(footer)
             if bible2:
-                footer = u'%s (%s %s)' % (book, version, copyright)
-                #If not found add to footer
+                footer = u'%s %s' % (bible2_version, bible2_copyright)
+                #If not found add second version and copyright to footer
                 if footer not in raw_footer:
                     raw_footer.append(footer)
                 bible_text = u'%s %s \n\n %s %s' % \
@@ -580,7 +596,7 @@ class BibleMediaItem(MediaManagerItem):
     def displayResults(self, bible):
         version = self.parent.manager.get_meta_data(bible, u'Version')
         copyright = self.parent.manager.get_meta_data(bible, u'Copyright')
-        permission = self.parent.manager.get_meta_data(bible, u'Permission')
+        permission = self.parent.manager.get_meta_data(bible, u'Permissions')
         if not permission:
             permission = u''
         else:

From 039792104b9f4f6dfc82d49ac9ff1e371faa2769 Mon Sep 17 00:00:00 2001
From: andreas <andreas@andypc>
Date: Thu, 27 May 2010 18:58:00 +0200
Subject: [PATCH 2/2] - again changes done to the bible footer

---
 openlp/plugins/bibles/lib/mediaitem.py | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py
index 07186544c..469d53640 100644
--- a/openlp/plugins/bibles/lib/mediaitem.py
+++ b/openlp/plugins/bibles/lib/mediaitem.py
@@ -499,16 +499,12 @@ class BibleMediaItem(MediaManagerItem):
             else:
                 verse_text = self.formatVerse(old_chapter, chapter, verse, u'', u'')
             old_chapter = chapter
-            footer = u'%s' % (book)
-            #If not found add book to footer
-            if footer not in raw_footer:
-                raw_footer.append(footer)
-            footer = u'%s %s' % (version, copyright)
-            #If not found add version and copyright to footer
+            footer = u'%s (%s %s)' % (book, version, copyright)
+            #If not found add to footer
             if footer not in raw_footer:
                 raw_footer.append(footer)
             if bible2:
-                footer = u'%s %s' % (bible2_version, bible2_copyright)
+                footer = u'%s (%s %s)' % (book, bible2_version, bible2_copyright)
                 #If not found add second version and copyright to footer
                 if footer not in raw_footer:
                     raw_footer.append(footer)