allow always using english wikipedia and allow custom link for dictionary
This commit is contained in:
parent
2ec1d31e11
commit
6104779bcb
1 changed files with 12 additions and 5 deletions
17
src/chat.py
17
src/chat.py
|
@ -561,16 +561,18 @@ class Chat:
|
||||||
submenu = gtk.Menu()
|
submenu = gtk.Menu()
|
||||||
item.set_submenu(submenu)
|
item.set_submenu(submenu)
|
||||||
|
|
||||||
#FIXME: via expert allow non using $LANG
|
always_use_en = gajim.config.get('always_english_wikipedia')
|
||||||
|
if always_use_en:
|
||||||
|
link = 'http://en.wikipedia.org/wiki/%s' % self.selected_phrase
|
||||||
|
else:
|
||||||
|
link = 'http://%s.wikipedia.org/wiki/%s'\
|
||||||
|
%(gajim.LANG, self.selected_phrase)
|
||||||
item = gtk.MenuItem(_('Read _Wikipedia article'))
|
item = gtk.MenuItem(_('Read _Wikipedia article'))
|
||||||
link = 'http://%s.wikipedia.org/wiki/%s'\
|
|
||||||
%(gajim.LANG, self.selected_phrase)
|
|
||||||
item.connect('activate', self.visit_url_from_menuitem, link)
|
item.connect('activate', self.visit_url_from_menuitem, link)
|
||||||
submenu.append(item)
|
submenu.append(item)
|
||||||
|
|
||||||
item = gtk.MenuItem(_('Look it up in _dictionary'))
|
item = gtk.MenuItem(_('Look it up in _dictionary'))
|
||||||
link = 'http://dictionary.reference.com/search?q=' +\
|
link = gajim.config.get('dictionary_url') + self.selected_phrase
|
||||||
self.selected_phrase
|
|
||||||
item.connect('activate', self.visit_url_from_menuitem, link)
|
item.connect('activate', self.visit_url_from_menuitem, link)
|
||||||
submenu.append(item)
|
submenu.append(item)
|
||||||
|
|
||||||
|
@ -842,10 +844,15 @@ class Chat:
|
||||||
visible_rect = textview.get_visible_rect()
|
visible_rect = textview.get_visible_rect()
|
||||||
if end_rect.y <= (visible_rect.y + visible_rect.height):
|
if end_rect.y <= (visible_rect.y + visible_rect.height):
|
||||||
at_the_end = True
|
at_the_end = True
|
||||||
|
|
||||||
|
# FIXME: who gives us text that is not a string?
|
||||||
if not text:
|
if not text:
|
||||||
text = ''
|
text = ''
|
||||||
|
|
||||||
if buffer.get_char_count() > 0:
|
if buffer.get_char_count() > 0:
|
||||||
buffer.insert(end_iter, '\n')
|
buffer.insert(end_iter, '\n')
|
||||||
|
|
||||||
|
# print the time stamp
|
||||||
if gajim.config.get('print_time') == 'always':
|
if gajim.config.get('print_time') == 'always':
|
||||||
if not tim:
|
if not tim:
|
||||||
tim = time.localtime()
|
tim = time.localtime()
|
||||||
|
|
Loading…
Add table
Reference in a new issue