forked from openlp/openlp
missed some fixes
This commit is contained in:
parent
c226979f24
commit
fc2569cf83
|
@ -397,7 +397,7 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
|
||||||
name = unicode(line[1], u'utf-8')
|
name = unicode(line[1], u'utf-8')
|
||||||
self.web_bible_list[WebDownload.Bibleserver][ver] = name.strip()
|
self.web_bible_list[WebDownload.Bibleserver][ver] = name.strip()
|
||||||
except IOError, UnicodeError:
|
except IOError, UnicodeError:
|
||||||
log.exception(u'Bibelserver resources missing')
|
log.exception(u'Bibleserver resources missing')
|
||||||
finally:
|
finally:
|
||||||
if books_file:
|
if books_file:
|
||||||
books_file.close()
|
books_file.close()
|
||||||
|
|
|
@ -43,7 +43,7 @@ def get_reference_match(match_type):
|
||||||
u'sep_l_display': local_separator[4], u'sep_l': local_separator[5],
|
u'sep_l_display': local_separator[4], u'sep_l': local_separator[5],
|
||||||
u'sep_e': local_separator[6]}
|
u'sep_e': local_separator[6]}
|
||||||
|
|
||||||
# verse range match: (<chapter>:)?<verse>(-(<chapter>:)?<verse>?)?
|
# verse range match: (<chapter>:)?<verse>(-((<chapter>:)?<verse>|end)?)?
|
||||||
range_string = str(r'(?:(?P<from_chapter>[0-9]+)%(sep_v)s)?(?P<from_verse>'
|
range_string = str(r'(?:(?P<from_chapter>[0-9]+)%(sep_v)s)?(?P<from_verse>'
|
||||||
r'[0-9]+)(?P<range_to>%(sep_r)s(?:(?:(?P<to_chapter>[0-9]+)%(sep_v)s)?'
|
r'[0-9]+)(?P<range_to>%(sep_r)s(?:(?:(?P<to_chapter>[0-9]+)%(sep_v)s)?'
|
||||||
r'(?P<to_verse>[0-9]+)|%(sep_e)s)?)?') % separators
|
r'(?P<to_verse>[0-9]+)|%(sep_e)s)?)?') % separators
|
||||||
|
|
|
@ -743,7 +743,8 @@ class BibleMediaItem(MediaManagerItem):
|
||||||
second_bible = self._decodeQtObject(bitem, 'second_bible')
|
second_bible = self._decodeQtObject(bitem, 'second_bible')
|
||||||
second_version = self._decodeQtObject(bitem, 'second_version')
|
second_version = self._decodeQtObject(bitem, 'second_version')
|
||||||
second_copyright = self._decodeQtObject(bitem, 'second_copyright')
|
second_copyright = self._decodeQtObject(bitem, 'second_copyright')
|
||||||
second_permissions = self._decodeQtObject(bitem, 'second_permissions')
|
second_permissions = \
|
||||||
|
self._decodeQtObject(bitem, 'second_permissions')
|
||||||
second_text = self._decodeQtObject(bitem, 'second_text')
|
second_text = self._decodeQtObject(bitem, 'second_text')
|
||||||
verse_text = self.formatVerse(old_chapter, chapter, verse)
|
verse_text = self.formatVerse(old_chapter, chapter, verse)
|
||||||
footer = u'%s (%s %s %s)' % (book, version, copyright, permissions)
|
footer = u'%s (%s %s %s)' % (book, version, copyright, permissions)
|
||||||
|
@ -754,8 +755,8 @@ class BibleMediaItem(MediaManagerItem):
|
||||||
second_copyright, second_permissions)
|
second_copyright, second_permissions)
|
||||||
if footer not in raw_footer:
|
if footer not in raw_footer:
|
||||||
raw_footer.append(footer)
|
raw_footer.append(footer)
|
||||||
bible_text = u'%s\u00a0%s\n\n%s\u00a0%s' % (verse_text, text, verse_text,
|
bible_text = u'%s\u00a0%s\n\n%s\u00a0%s' % (verse_text, text,
|
||||||
second_text)
|
verse_text, second_text)
|
||||||
raw_slides.append(bible_text)
|
raw_slides.append(bible_text)
|
||||||
bible_text = u''
|
bible_text = u''
|
||||||
# If we are 'Verse Per Slide' then create a new slide.
|
# If we are 'Verse Per Slide' then create a new slide.
|
||||||
|
|
Loading…
Reference in New Issue