copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix regression from refactoring

Browse source 
regression was introduced in e2383fd7a4
This commit is contained in:
Philipp Hörist 2018-05-02 22:37:45 +02:00
parent 497c710dd8
commit bb33e055a5
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gajim/chat_control_base.py
View file

@ -47,6 +47,7 @@ from gajim.common import events
from gajim.common import app from gajim.common import app
from gajim.common import helpers from gajim.common import helpers
from gajim.common import ged from gajim.common import ged
from gajim.common import i18n
from gajim.message_control import MessageControl from gajim.message_control import MessageControl
from gajim.conversation_textview import ConversationTextview from gajim.conversation_textview import ConversationTextview
from gajim.message_textview import MessageTextView from gajim.message_textview import MessageTextView
@ -514,7 +515,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
# use the default one # use the default one
lang = app.config.get('speller_language') lang = app.config.get('speller_language')
if not lang: if not lang:
lang = app.LANG lang = i18n.LANG
gspell_lang = Gspell.language_lookup(lang) gspell_lang = Gspell.language_lookup(lang)
if gspell_lang is None: if gspell_lang is None:
gspell_lang = Gspell.language_get_default() gspell_lang = Gspell.language_get_default()

4
gajim/conversation_textview.py
View file

@ -562,7 +562,7 @@ class ConversationTextview(GObject.GObject):
% phrase_for_url % 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'\
% (app.LANG, phrase_for_url) % (i18n.LANG, phrase_for_url)
item = Gtk.MenuItem.new_with_mnemonic(_('Read _Wikipedia Article')) item = Gtk.MenuItem.new_with_mnemonic(_('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
@ -578,7 +578,7 @@ class ConversationTextview(GObject.GObject):
% phrase_for_url % 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'\
% (app.LANG, phrase_for_url) % (i18n.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: