← Back to branch summary

~jasperge/openlp/versenumbers

« back to all changes in this revision

Viewing changes to openlp/plugins/bibles/lib/osis.py

  • Committer: Tim Bentley
  • Author(s): Tomas Groth
  • Date: 2015-03-11 18:22:23 UTC
  • mfrom: (2513.3.13 bugfixes16)
  • Revision ID: tim.bentley@gmail.com-20150311182223-jn27cio07xfqo5x9
Only update presentation thumbnails if needed. Fixes bug 1424330.
Make presentation controller save and read notes and titles in utf-8 encoding. Fixes bug 1424972.
Moved string format input outside calls to translate. Fixes bug 1425035.
Added option for check of format input strings in translation util script.
Removed tab from text since transifex cannot handle it.
Some PEP8 fixes (from pep8 1.6.1)
Use the language id when importing bibles.

Show diffs side-by-side

added added

removed removed

Lines of Context:
openlp/plugins/bibles/lib/osis.py
71
71
            if not language_id:
72
72
                log.error('Importing books from "%s" failed' % self.filename)
73
73
                return False
 
74
            self.save_meta('language_id', language_id)
74
75
            num_books = int(osis_bible_tree.xpath("count(//ns:div[@type='book'])", namespaces=namespace))
75
76
            self.wizard.increment_progress_bar(translate('BiblesPlugin.OsisImport',
76
77
                                                         'Removing unused tags (this may take a few minutes)...'))
124
125
                    break
125
126
                # Remove div-tags in the book
126
127
                etree.strip_tags(book, ('{http://www.bibletechnologies.net/2003/OSIS/namespace}div'))
127
 
                book_ref_id = self.get_book_ref_id_by_name(book.get('osisID'), num_books)
 
128
                book_ref_id = self.get_book_ref_id_by_name(book.get('osisID'), num_books, language_id)
128
129
                if not book_ref_id:
129
130
                    book_ref_id = self.get_book_ref_id_by_localised_name(book.get('osisID'))
130
131
                if not book_ref_id:
154
155
                                verse_number = verse.get("osisID").split('.')[2]
155
156
                                self.create_verse(db_book.id, chapter_number, verse_number, verse.text.strip())
156
157
                        self.wizard.increment_progress_bar(
157
 
                            translate('BiblesPlugin.OsisImport', 'Importing %(bookname)s %(chapter)s...' %
158
 
                                      {'bookname': db_book.name, 'chapter': chapter_number}))
 
158
                            translate('BiblesPlugin.OsisImport', 'Importing %(bookname)s %(chapter)s...') %
 
159
                            {'bookname': db_book.name, 'chapter': chapter_number})
159
160
                else:
160
161
                    # The chapter tags is used as milestones. For now we assume verses is also milestones
161
162
                    chapter_number = 0
164
165
                                and element.get('sID'):
165
166
                            chapter_number = element.get("osisID").split('.')[1]
166
167
                            self.wizard.increment_progress_bar(
167
 
                                translate('BiblesPlugin.OsisImport', 'Importing %(bookname)s %(chapter)s...' %
168
 
                                          {'bookname': db_book.name, 'chapter': chapter_number}))
 
168
                                translate('BiblesPlugin.OsisImport', 'Importing %(bookname)s %(chapter)s...') %
 
169
                                {'bookname': db_book.name, 'chapter': chapter_number})
169
170
                        elif element.tag == '{http://www.bibletechnologies.net/2003/OSIS/namespace}verse' \
170
171
                                and element.get('sID'):
171
172
                            # If this tag marks the start of a verse, the verse text is between this tag and