diff --git a/openlp/plugins/bibles/forms/bibleimportform.py b/openlp/plugins/bibles/forms/bibleimportform.py index 6fcedc28b..2fd82ed1d 100644 --- a/openlp/plugins/bibles/forms/bibleimportform.py +++ b/openlp/plugins/bibles/forms/bibleimportform.py @@ -165,7 +165,7 @@ class BibleImportForm(QtGui.QWizard, uiBibleImportWizard): 'file to import.')) self.openSongFileEdit.setFocus() return False - elif self.field(u'source_format').toInt()[0] == BibleFormat.OLP1: + elif self.field(u'source_format').toInt()[0] == BibleFormat.OpenLP1: if not self.field(u'OLP1_location').toString(): QtGui.QMessageBox.critical(self, translate('BiblesPlugin.ImportWizardForm', @@ -472,9 +472,9 @@ class BibleImportForm(QtGui.QWizard, uiBibleImportWizard): unicode(self.field(u'proxy_username').toString()), proxy_password=unicode(self.field(u'proxy_password').toString()) ) - elif bible_type == BibleFormat.OLP1: + elif bible_type == BibleFormat.OpenLP1: # Import an openlp.org 1.x bible. - importer = self.manager.import_bible(BibleFormat.OLP1, + importer = self.manager.import_bible(BibleFormat.OpenLP1, name=license_version, filename=unicode(self.field(u'OLP1_location').toString()) ) diff --git a/openlp/plugins/bibles/lib/manager.py b/openlp/plugins/bibles/lib/manager.py index d2c281877..e2639d6ff 100644 --- a/openlp/plugins/bibles/lib/manager.py +++ b/openlp/plugins/bibles/lib/manager.py @@ -62,7 +62,7 @@ class BibleFormat(object): CSV = 1 OpenSong = 2 WebDownload = 3 - OLP1 = 4 + OpenLP1 = 4 @staticmethod def get_class(format): @@ -80,7 +80,7 @@ class BibleFormat(object): return OpenSongBible elif format == BibleFormat.WebDownload: return HTTPBible - elif format == BibleFormat.OLP1: + elif format == BibleFormat.OpenLP1: return OpenLP1Bible else: return None @@ -95,7 +95,7 @@ class BibleFormat(object): BibleFormat.CSV, BibleFormat.OpenSong, BibleFormat.WebDownload, - BibleFormat.OLP1 + BibleFormat.OpenLP1 ]