forked from openlp/openlp
Moved string format input outside calls to translate. Fixes bug 1425035.
Fixes: https://launchpad.net/bugs/1425035
This commit is contained in:
parent
98b2be5bc7
commit
84a0fa0ecd
|
@ -146,7 +146,7 @@ class FormattingTagController(object):
|
||||||
end = self.start_html_to_end_html(start_html)
|
end = self.start_html_to_end_html(start_html)
|
||||||
if not end_html:
|
if not end_html:
|
||||||
if not end:
|
if not end:
|
||||||
return translate('OpenLP.FormattingTagForm', 'Start tag %s is not valid HTML' % start_html), None
|
return translate('OpenLP.FormattingTagForm', 'Start tag %s is not valid HTML') % start_html, None
|
||||||
return None, end
|
return None, end
|
||||||
return None, None
|
return None, None
|
||||||
|
|
||||||
|
@ -166,5 +166,5 @@ class FormattingTagController(object):
|
||||||
return None, end
|
return None, end
|
||||||
if end and end != end_html:
|
if end and end != end_html:
|
||||||
return translate('OpenLP.FormattingTagForm',
|
return translate('OpenLP.FormattingTagForm',
|
||||||
'End tag %s does not match end tag for start tag %s' % (end, start_html)), None
|
'End tag %s does not match end tag for start tag %s') % (end, start_html), None
|
||||||
return None, None
|
return None, None
|
||||||
|
|
|
@ -123,8 +123,8 @@ class OpenSongBible(BibleDB):
|
||||||
verse_number += 1
|
verse_number += 1
|
||||||
self.create_verse(db_book.id, chapter_number, verse_number, self.get_text(verse))
|
self.create_verse(db_book.id, chapter_number, verse_number, self.get_text(verse))
|
||||||
self.wizard.increment_progress_bar(
|
self.wizard.increment_progress_bar(
|
||||||
translate('BiblesPlugin.Opensong', 'Importing %(bookname)s %(chapter)s...' %
|
translate('BiblesPlugin.Opensong', 'Importing %(bookname)s %(chapter)s...') %
|
||||||
{'bookname': db_book.name, 'chapter': chapter_number}))
|
{'bookname': db_book.name, 'chapter': chapter_number})
|
||||||
self.session.commit()
|
self.session.commit()
|
||||||
self.application.process_events()
|
self.application.process_events()
|
||||||
except etree.XMLSyntaxError as inst:
|
except etree.XMLSyntaxError as inst:
|
||||||
|
|
|
@ -154,8 +154,8 @@ class OSISBible(BibleDB):
|
||||||
verse_number = verse.get("osisID").split('.')[2]
|
verse_number = verse.get("osisID").split('.')[2]
|
||||||
self.create_verse(db_book.id, chapter_number, verse_number, verse.text.strip())
|
self.create_verse(db_book.id, chapter_number, verse_number, verse.text.strip())
|
||||||
self.wizard.increment_progress_bar(
|
self.wizard.increment_progress_bar(
|
||||||
translate('BiblesPlugin.OsisImport', 'Importing %(bookname)s %(chapter)s...' %
|
translate('BiblesPlugin.OsisImport', 'Importing %(bookname)s %(chapter)s...') %
|
||||||
{'bookname': db_book.name, 'chapter': chapter_number}))
|
{'bookname': db_book.name, 'chapter': chapter_number})
|
||||||
else:
|
else:
|
||||||
# The chapter tags is used as milestones. For now we assume verses is also milestones
|
# The chapter tags is used as milestones. For now we assume verses is also milestones
|
||||||
chapter_number = 0
|
chapter_number = 0
|
||||||
|
@ -164,8 +164,8 @@ class OSISBible(BibleDB):
|
||||||
and element.get('sID'):
|
and element.get('sID'):
|
||||||
chapter_number = element.get("osisID").split('.')[1]
|
chapter_number = element.get("osisID").split('.')[1]
|
||||||
self.wizard.increment_progress_bar(
|
self.wizard.increment_progress_bar(
|
||||||
translate('BiblesPlugin.OsisImport', 'Importing %(bookname)s %(chapter)s...' %
|
translate('BiblesPlugin.OsisImport', 'Importing %(bookname)s %(chapter)s...') %
|
||||||
{'bookname': db_book.name, 'chapter': chapter_number}))
|
{'bookname': db_book.name, 'chapter': chapter_number})
|
||||||
elif element.tag == '{http://www.bibletechnologies.net/2003/OSIS/namespace}verse' \
|
elif element.tag == '{http://www.bibletechnologies.net/2003/OSIS/namespace}verse' \
|
||||||
and element.get('sID'):
|
and element.get('sID'):
|
||||||
# If this tag marks the start of a verse, the verse text is between this tag and
|
# If this tag marks the start of a verse, the verse text is between this tag and
|
||||||
|
|
|
@ -102,8 +102,8 @@ class ZefaniaBible(BibleDB):
|
||||||
verse_number = VERS.get("vnumber")
|
verse_number = VERS.get("vnumber")
|
||||||
self.create_verse(db_book.id, chapter_number, verse_number, VERS.text.replace('<BR/>', '\n'))
|
self.create_verse(db_book.id, chapter_number, verse_number, VERS.text.replace('<BR/>', '\n'))
|
||||||
self.wizard.increment_progress_bar(
|
self.wizard.increment_progress_bar(
|
||||||
translate('BiblesPlugin.Zefnia', 'Importing %(bookname)s %(chapter)s...' %
|
translate('BiblesPlugin.Zefnia', 'Importing %(bookname)s %(chapter)s...') %
|
||||||
{'bookname': db_book.name, 'chapter': chapter_number}))
|
{'bookname': db_book.name, 'chapter': chapter_number})
|
||||||
self.session.commit()
|
self.session.commit()
|
||||||
self.application.process_events()
|
self.application.process_events()
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
|
|
Loading…
Reference in New Issue