correctly encode strings in URL
This commit is contained in:
parent
457f75c945
commit
0fcb1f7096
|
@ -38,6 +38,7 @@ import tooltips
|
||||||
import dialogs
|
import dialogs
|
||||||
import locale
|
import locale
|
||||||
import Queue
|
import Queue
|
||||||
|
import urllib
|
||||||
|
|
||||||
import gtkgui_helpers
|
import gtkgui_helpers
|
||||||
from common import gajim
|
from common import gajim
|
||||||
|
@ -747,14 +748,15 @@ class ConversationTextview(gobject.GObject):
|
||||||
menu.prepend(item)
|
menu.prepend(item)
|
||||||
submenu = gtk.Menu()
|
submenu = gtk.Menu()
|
||||||
item.set_submenu(submenu)
|
item.set_submenu(submenu)
|
||||||
|
phrase_for_url = urllib.quote(self.selected_phrase)
|
||||||
|
|
||||||
always_use_en = gajim.config.get('always_english_wikipedia')
|
always_use_en = gajim.config.get('always_english_wikipedia')
|
||||||
if always_use_en:
|
if always_use_en:
|
||||||
link = 'http://en.wikipedia.org/wiki/Special:Search?search=%s'\
|
link = 'http://en.wikipedia.org/wiki/Special:Search?search=%s'\
|
||||||
% self.selected_phrase
|
% phrase_for_url
|
||||||
else:
|
else:
|
||||||
link = 'http://%s.wikipedia.org/wiki/Special:Search?search=%s'\
|
link = 'http://%s.wikipedia.org/wiki/Special:Search?search=%s'\
|
||||||
% (gajim.LANG, self.selected_phrase)
|
% (gajim.LANG, phrase_for_url)
|
||||||
item = gtk.MenuItem(_('Read _Wikipedia Article'))
|
item = gtk.MenuItem(_('Read _Wikipedia Article'))
|
||||||
id_ = item.connect('activate', self.visit_url_from_menuitem, link)
|
id_ = item.connect('activate', self.visit_url_from_menuitem, link)
|
||||||
self.handlers[id_] = item
|
self.handlers[id_] = item
|
||||||
|
@ -767,10 +769,10 @@ class ConversationTextview(gobject.GObject):
|
||||||
always_use_en = gajim.config.get('always_english_wiktionary')
|
always_use_en = gajim.config.get('always_english_wiktionary')
|
||||||
if always_use_en:
|
if always_use_en:
|
||||||
link = 'http://en.wiktionary.org/wiki/Special:Search?search=%s'\
|
link = 'http://en.wiktionary.org/wiki/Special:Search?search=%s'\
|
||||||
% self.selected_phrase
|
% phrase_for_url
|
||||||
else:
|
else:
|
||||||
link = 'http://%s.wiktionary.org/wiki/Special:Search?search=%s'\
|
link = 'http://%s.wiktionary.org/wiki/Special:Search?search=%s'\
|
||||||
% (gajim.LANG, self.selected_phrase)
|
% (gajim.LANG, phrase_for_url)
|
||||||
id_ = item.connect('activate', self.visit_url_from_menuitem, link)
|
id_ = item.connect('activate', self.visit_url_from_menuitem, link)
|
||||||
self.handlers[id_] = item
|
self.handlers[id_] = item
|
||||||
else:
|
else:
|
||||||
|
@ -780,7 +782,7 @@ class ConversationTextview(gobject.GObject):
|
||||||
'Dictionary URL is missing an "%s" and it is not WIKTIONARY'))
|
'Dictionary URL is missing an "%s" and it is not WIKTIONARY'))
|
||||||
item.set_property('sensitive', False)
|
item.set_property('sensitive', False)
|
||||||
else:
|
else:
|
||||||
link = dict_link % self.selected_phrase
|
link = dict_link % phrase_for_url
|
||||||
id_ = item.connect('activate', self.visit_url_from_menuitem,
|
id_ = item.connect('activate', self.visit_url_from_menuitem,
|
||||||
link)
|
link)
|
||||||
self.handlers[id_] = item
|
self.handlers[id_] = item
|
||||||
|
@ -794,7 +796,7 @@ class ConversationTextview(gobject.GObject):
|
||||||
item.set_property('sensitive', False)
|
item.set_property('sensitive', False)
|
||||||
else:
|
else:
|
||||||
item = gtk.MenuItem(_('Web _Search for it'))
|
item = gtk.MenuItem(_('Web _Search for it'))
|
||||||
link = search_link % self.selected_phrase
|
link = search_link % phrase_for_url
|
||||||
id_ = item.connect('activate', self.visit_url_from_menuitem, link)
|
id_ = item.connect('activate', self.visit_url_from_menuitem, link)
|
||||||
self.handlers[id_] = item
|
self.handlers[id_] = item
|
||||||
submenu.append(item)
|
submenu.append(item)
|
||||||
|
|
Loading…
Reference in New Issue