forked from openlp/openlp
fixes from merge
This commit is contained in:
parent
6904ac2145
commit
fa6cb6020a
@ -239,7 +239,7 @@ class MediaManagerItem(QtGui.QWidget):
|
|||||||
if self.hasDeleteIcon:
|
if self.hasDeleteIcon:
|
||||||
self.addToolbarButton(
|
self.addToolbarButton(
|
||||||
translate(
|
translate(
|
||||||
self.TranslationContext, u'Delete %s ' % self.PluginTextShort),
|
self.TranslationContext, u'Delete %s' % self.PluginTextShort),
|
||||||
translate(self.TranslationContext, u'Delete the selected item'),
|
translate(self.TranslationContext, u'Delete the selected item'),
|
||||||
u':%s_delete.png' % self.IconPath,
|
u':%s_delete.png' % self.IconPath,
|
||||||
self.onDeleteClick,
|
self.onDeleteClick,
|
||||||
|
@ -40,7 +40,7 @@ def check_latest_version(config, current_version):
|
|||||||
if lastTest != thisTest:
|
if lastTest != thisTest:
|
||||||
version_string = u''
|
version_string = u''
|
||||||
req = urllib2.Request(u'http://www.openlp.org/files/version.txt')
|
req = urllib2.Request(u'http://www.openlp.org/files/version.txt')
|
||||||
req.add_header(u'User-Agent', u'OpenLP Version Checker')
|
req.add_header(u'User-Agent', u'OpenLP%s' % current_version)
|
||||||
try:
|
try:
|
||||||
handle = urllib2.urlopen(req, None, 1)
|
handle = urllib2.urlopen(req, None, 1)
|
||||||
html = handle.read()
|
html = handle.read()
|
||||||
|
@ -104,7 +104,7 @@ class BibleCommon(object):
|
|||||||
urllib2.install_opener(opener)
|
urllib2.install_opener(opener)
|
||||||
xml_string = u''
|
xml_string = u''
|
||||||
req = urllib2.Request(urlstring)
|
req = urllib2.Request(urlstring)
|
||||||
#May us look like an IE Browser on XP to stop blocking by web site
|
#Make us look like an IE Browser on XP to stop blocking by web site
|
||||||
req.add_header(u'User-Agent', u'Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1)')
|
req.add_header(u'User-Agent', u'Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1)')
|
||||||
try:
|
try:
|
||||||
handle = urllib2.urlopen(req)
|
handle = urllib2.urlopen(req)
|
||||||
|
Loading…
Reference in New Issue
Block a user