diff --git a/openlp/plugins/bibles/forms/bibleimportdialog.py b/openlp/plugins/bibles/forms/bibleimportdialog.py index 8243fc72d..d5b04d795 100644 --- a/openlp/plugins/bibles/forms/bibleimportdialog.py +++ b/openlp/plugins/bibles/forms/bibleimportdialog.py @@ -250,8 +250,6 @@ class Ui_BibleImportDialog(object): self.LocationComboBox.setItemText(0, self.trUtf8(u'Crosswalk')) self.LocationComboBox.setItemText(1, self.trUtf8(u'BibleGateway')) self.BibleLabel.setText(self.trUtf8(u'Bible:')) - self.BibleComboBox.setItemText(1, self.trUtf8(u'NIV')) - self.BibleComboBox.setItemText(2, self.trUtf8(u'KJV')) self.ProxyGroupBox.setTitle(self.trUtf8(u'Proxy Settings (Optional)')) self.AddressLabel.setText(self.trUtf8(u'Proxy Address:')) self.UsernameLabel.setText(self.trUtf8(u'Username:')) diff --git a/openlp/plugins/bibles/forms/bibleimportform.py b/openlp/plugins/bibles/forms/bibleimportform.py index facd055fb..a46a7f9f6 100644 --- a/openlp/plugins/bibles/forms/bibleimportform.py +++ b/openlp/plugins/bibles/forms/bibleimportform.py @@ -58,20 +58,21 @@ class BibleImportForm(QtGui.QDialog, Ui_BibleImportDialog): filepath = os.path.abspath(os.path.join(filepath, u'..', u'resources', u'crosswalkbooks.csv')) fbibles=open(filepath, 'r') - self.cw_bible_versions = {} + self.cwBibleVersions = {} for line in fbibles: p = line.split(u',') - self.cw_bible_versions[p[0]] = p[1].replace(u'\n', u'') + self.cwBibleVersions [p[0]] = p[1].replace(u'\n', u'') #Load and store BibleGateway Bibles filepath = os.path.split(os.path.abspath(__file__))[0] filepath = os.path.abspath(os.path.join(filepath, u'..', u'resources', u'biblegateway.csv')) fbibles=open(filepath, 'r') - self.bg_bible_versions = {} + self.bgBibleVersions = {} for line in fbibles: p = line.split(u',') - self.bg_bible_versions[p[0]] = p[1].replace(u'\n', u'') - self.loadBibleCombo(self.cw_bible_versions) + self.bgBibleVersions [p[0]] = p[1].replace(u'\n', u'') + self.loadBibleCombo(self.cwBibleVersions ) + self.cwActive = True def loadBibleCombo(self, biblesList): self.BibleComboBox.clear() @@ -167,9 +168,11 @@ class BibleImportForm(QtGui.QDialog, Ui_BibleImportDialog): def onLocationComboBoxSelected(self, value): if value == 0: - self.loadBibleCombo(self.cw_bible_versions) + self.loadBibleCombo(self.cwBibleVersions ) + self.cwActive = True else: - self.loadBibleCombo(self.bg_bible_versions) + self.loadBibleCombo(self.bgBibleVersions ) + self.cwActive = False self.checkHttp() def onBibleComboBoxSelected(self, value): @@ -230,8 +233,12 @@ class BibleImportForm(QtGui.QDialog, Ui_BibleImportDialog): else: # set a value as it will not be needed self.setMax(1) - bible = self.cw_bible_versions[ - unicode(self.BibleComboBox.currentText())] + if self.cwActive: + bible = self.cwBibleVersions [ + unicode(self.BibleComboBox.currentText())] + else: + bible = self.bgBibleVersions [ + unicode(self.BibleComboBox.currentText())] loaded = self.biblemanager.register_http_bible( unicode(self.BibleComboBox.currentText()), unicode(self.LocationComboBox.currentText()), diff --git a/openlp/plugins/bibles/lib/bibleHTTPimpl.py b/openlp/plugins/bibles/lib/bibleHTTPimpl.py index 98281d26b..15537ad8f 100644 --- a/openlp/plugins/bibles/lib/bibleHTTPimpl.py +++ b/openlp/plugins/bibles/lib/bibleHTTPimpl.py @@ -50,12 +50,11 @@ class BGExtract(BibleCommon): """ log.debug(u'get_bible_chapter %s,%s,%s', version, bookname, chapter) - version=u'nasb' urlstring = \ - u'http://www.biblegateway.com/passage/?search=%s %s&version=%s' % \ - (bookname, unicode(chapter) , version) + u'http://www.biblegateway.com/passage/?search=%s+%d&version=%s' % \ + (bookname, chapter, version) + log.debug(u'BibleGateway urm = %s' % urlstring) xml_string = self._get_web_text(urlstring, self.proxyurl) - #print xml_string verseSearch = u'