From f197358e2f9ff75948b7ad488b2e789d9f2a387c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20H=C3=B6rist?= <philipp@hoerist.com>
Date: Thu, 4 Oct 2018 23:55:35 +0200
Subject: [PATCH] Import _() instead of using builtin namespace
- Prepare for removing the global installed _() method in builtins
- Sort some imports along the way
---
gajim/adhoc_commands.py | 1 +
gajim/application.py | 1 +
gajim/atom_window.py | 4 +++-
gajim/chat_control.py | 16 ++++++++------
gajim/chat_control_base.py | 22 +++++++++++--------
gajim/common/connection.py | 1 +
gajim/common/connection_handlers_events.py | 1 +
gajim/common/exceptions.py | 2 ++
gajim/common/jingle_rtp.py | 2 +-
gajim/common/logger.py | 1 +
gajim/common/logging_helpers.py | 2 ++
gajim/common/modules/httpupload.py | 1 +
gajim/common/modules/message.py | 1 +
gajim/common/modules/presence.py | 1 +
gajim/common/modules/roster_item_exchange.py | 1 +
gajim/common/multimedia_helpers.py | 2 ++
gajim/common/optparser.py | 1 +
.../zeroconf/connection_handlers_zeroconf.py | 1 +
gajim/common/zeroconf/connection_zeroconf.py | 1 +
gajim/common/zeroconf/zeroconf_avahi.py | 1 +
gajim/common/zeroconf/zeroconf_bonjour.py | 2 ++
gajim/config.py | 6 +++--
gajim/conversation_textview.py | 15 +++++++------
gajim/dataforms_widget.py | 1 +
gajim/filetransfers_window.py | 1 +
gajim/groupchat_control.py | 1 +
gajim/gtk/about.py | 1 +
gajim/gtk/account_wizard.py | 11 +++++++---
gajim/gtk/accounts.py | 17 +++++++++-----
gajim/gtk/add_contact.py | 1 +
gajim/gtk/advanced_config.py | 1 +
gajim/gtk/bookmarks.py | 5 ++++-
gajim/gtk/dialogs.py | 2 ++
gajim/gtk/features.py | 2 ++
gajim/gtk/filechoosers.py | 1 +
gajim/gtk/history.py | 10 +++++----
gajim/gtk/history_sync.py | 5 ++++-
gajim/gtk/join_groupchat.py | 2 ++
gajim/gtk/mam_preferences.py | 1 +
gajim/gtk/pep_config.py | 2 ++
gajim/gtk/preferences.py | 8 +++++--
gajim/gtk/privacy_list.py | 2 ++
gajim/gtk/profile.py | 10 ++++++---
gajim/gtk/server_info.py | 1 +
gajim/gtk/service_registration.py | 1 +
gajim/gtk/single_message.py | 10 +++++----
gajim/gtk/start_chat.py | 1 +
gajim/gtk/themes.py | 5 ++++-
gajim/gtk/xml_console.py | 10 +++++++--
gajim/gtkgui_helpers.py | 1 +
gajim/gui_interface.py | 1 +
gajim/gui_menu_builder.py | 1 +
gajim/message_window.py | 1 +
gajim/notify.py | 1 +
gajim/options_dialog.py | 1 +
gajim/plugins/pluginmanager.py | 1 +
gajim/roster_window.py | 1 +
gajim/search_window.py | 3 ++-
gajim/statusicon.py | 1 +
gajim/tooltips.py | 1 +
gajim/vcard.py | 1 +
61 files changed, 157 insertions(+), 55 deletions(-)
diff --git a/gajim/adhoc_commands.py b/gajim/adhoc_commands.py
index a490c873e6..b025934e0c 100644
--- a/gajim/adhoc_commands.py
+++ b/gajim/adhoc_commands.py
@@ -25,6 +25,7 @@ from gi.repository import Gtk
import nbxmpp
from gajim.common import app
+from gajim.common.i18n import _
from gajim.common.modules import dataforms
from gajim.common import ged
diff --git a/gajim/application.py b/gajim/application.py
index 9d08e8174e..d016f046c9 100644
--- a/gajim/application.py
+++ b/gajim/application.py
@@ -46,6 +46,7 @@ from gajim.common import logging_helpers
from gajim.common import exceptions
from gajim.common import caps_cache
from gajim.common import logger
+from gajim.common.i18n import _
class GajimApplication(Gtk.Application):
diff --git a/gajim/atom_window.py b/gajim/atom_window.py
index 5ab727fce8..70c8cc593e 100644
--- a/gajim/atom_window.py
+++ b/gajim/atom_window.py
@@ -23,9 +23,11 @@ from typing import Any # pylint: disable=unused-import
from gi.repository import Gdk
from gi.repository import GLib
-from gajim import gtkgui_helpers
from gajim.common import helpers
from gajim.common import i18n
+from gajim.common.i18n import _
+
+from gajim import gtkgui_helpers
class AtomWindow:
window = None
diff --git a/gajim/chat_control.py b/gajim/chat_control.py
index d78b0b317a..4500cb9cdb 100644
--- a/gajim/chat_control.py
+++ b/gajim/chat_control.py
@@ -37,22 +37,24 @@ from nbxmpp.protocol import NS_XHTML, NS_XHTML_IM, NS_FILE, NS_MUC
from nbxmpp.protocol import NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO
from nbxmpp.protocol import NS_JINGLE_ICE_UDP, NS_JINGLE_FILE_TRANSFER_5
-from gajim import gtkgui_helpers
-from gajim import gui_menu_builder
-from gajim import message_control
-from gajim import dialogs
-from gajim.gtk.dialogs import ConfirmationDialog
-from gajim.gtk.add_contact import AddNewContactWindow
-
from gajim.common import app
from gajim.common import helpers
from gajim.common import ged
from gajim.common import i18n
+from gajim.common.i18n import _
from gajim.common.contacts import GC_Contact
from gajim.common.const import AvatarSize
from gajim.common.const import KindConstant
from gajim.common.const import Chatstate
+from gajim import gtkgui_helpers
+from gajim import gui_menu_builder
+from gajim import message_control
+from gajim import dialogs
+
+from gajim.gtk.dialogs import ConfirmationDialog
+from gajim.gtk.add_contact import AddNewContactWindow
+
from gajim.command_system.implementation.hosts import ChatCommands
from gajim.command_system.framework import CommandHost # pylint: disable=unused-import
from gajim.chat_control_base import ChatControlBase
diff --git a/gajim/chat_control_base.py b/gajim/chat_control_base.py
index 6d51f4234c..794597445f 100644
--- a/gajim/chat_control_base.py
+++ b/gajim/chat_control_base.py
@@ -32,25 +32,29 @@ from gi.repository import Gdk
from gi.repository import GLib
from gi.repository import Gio
-from gajim import gtkgui_helpers
-from gajim import message_control
-from gajim.gtk.dialogs import NonModalConfirmationDialog
-from gajim.gtk.util import convert_rgb_to_hex
-from gajim import notify
-from gajim.gtk.emoji_chooser import emoji_chooser
from gajim.common import events
from gajim.common import app
from gajim.common import helpers
from gajim.common import ged
from gajim.common import i18n
-from gajim.message_control import MessageControl
-from gajim.conversation_textview import ConversationTextview
-from gajim.message_textview import MessageTextView
+from gajim.common.i18n import _
from gajim.common.contacts import GC_Contact
from gajim.common.connection_handlers_events import MessageOutgoingEvent
from gajim.common.const import StyleAttr
from gajim.common.const import Chatstate
+from gajim import notify
+from gajim import gtkgui_helpers
+from gajim import message_control
+
+from gajim.message_control import MessageControl
+from gajim.conversation_textview import ConversationTextview
+from gajim.message_textview import MessageTextView
+
+from gajim.gtk.dialogs import NonModalConfirmationDialog
+from gajim.gtk.util import convert_rgb_to_hex
+from gajim.gtk.emoji_chooser import emoji_chooser
+
from gajim.command_system.implementation.middleware import ChatCommandProcessor
from gajim.command_system.implementation.middleware import CommandTools
diff --git a/gajim/common/connection.py b/gajim/common/connection.py
index a3234d5872..2c60cb6866 100644
--- a/gajim/common/connection.py
+++ b/gajim/common/connection.py
@@ -56,6 +56,7 @@ from gajim.common import app
from gajim.common import gpg
from gajim.common import passwords
from gajim.common import idle
+from gajim.common.i18n import _
from gajim.common.connection_handlers import *
from gajim.common.contacts import GC_Contact
from gajim.common import modules
diff --git a/gajim/common/connection_handlers_events.py b/gajim/common/connection_handlers_events.py
index fa696b549c..78711cdb00 100644
--- a/gajim/common/connection_handlers_events.py
+++ b/gajim/common/connection_handlers_events.py
@@ -28,6 +28,7 @@ from gajim.common import nec
from gajim.common import helpers
from gajim.common import app
from gajim.common import i18n
+from gajim.common.i18n import _
from gajim.common.modules import dataforms
from gajim.common.const import KindConstant, SSLError
from gajim.common.pep import SUPPORTED_PERSONAL_USER_EVENTS
diff --git a/gajim/common/exceptions.py b/gajim/common/exceptions.py
index 6a0e375cd2..440a00a511 100644
--- a/gajim/common/exceptions.py
+++ b/gajim/common/exceptions.py
@@ -17,6 +17,8 @@
# You should have received a copy of the GNU General Public License
# along with Gajim. If not, see <http://www.gnu.org/licenses/>.
+from gajim.common.i18n import _
+
class PysqliteOperationalError(Exception):
"""
diff --git a/gajim/common/jingle_rtp.py b/gajim/common/jingle_rtp.py
index 9b9b73a103..404f67400a 100644
--- a/gajim/common/jingle_rtp.py
+++ b/gajim/common/jingle_rtp.py
@@ -27,7 +27,7 @@ from gi.repository import Gst
from gi.repository import GLib
from gajim.common import app
-
+from gajim.common.i18n import _
from gajim.common.jingle_transport import JingleTransportICEUDP
from gajim.common.jingle_content import contents, JingleContent, JingleContentSetupException
from gajim.common.connection_handlers_events import InformationEvent
diff --git a/gajim/common/logger.py b/gajim/common/logger.py
index c4480272b5..25a0d542e3 100644
--- a/gajim/common/logger.py
+++ b/gajim/common/logger.py
@@ -41,6 +41,7 @@ from gi.repository import GLib
from gajim.common import exceptions
from gajim.common import app
from gajim.common import configpaths
+from gajim.common.i18n import _
from gajim.common.const import (
JIDConstant, KindConstant, ShowConstant, TypeConstant,
SubscriptionConstant)
diff --git a/gajim/common/logging_helpers.py b/gajim/common/logging_helpers.py
index ffe202594a..ea6321e0b4 100644
--- a/gajim/common/logging_helpers.py
+++ b/gajim/common/logging_helpers.py
@@ -18,6 +18,8 @@ import logging
import os
import sys
+from gajim.common.i18n import _
+
def parseLogLevel(arg):
"""
Eiter numeric value or level name from logging module
diff --git a/gajim/common/modules/httpupload.py b/gajim/common/modules/httpupload.py
index 0b72338213..97f16987fd 100644
--- a/gajim/common/modules/httpupload.py
+++ b/gajim/common/modules/httpupload.py
@@ -32,6 +32,7 @@ from gi.repository import GLib
from gajim.common import app
from gajim.common import ged
+from gajim.common.i18n import _
from gajim.common.nec import NetworkIncomingEvent
from gajim.common.connection_handlers_events import InformationEvent
from gajim.common.connection_handlers_events import MessageOutgoingEvent
diff --git a/gajim/common/modules/message.py b/gajim/common/modules/message.py
index 328ea32eca..00fad4f2fc 100644
--- a/gajim/common/modules/message.py
+++ b/gajim/common/modules/message.py
@@ -21,6 +21,7 @@ import nbxmpp
from gajim.common import app
from gajim.common import helpers
+from gajim.common.i18n import _
from gajim.common.nec import NetworkIncomingEvent, NetworkEvent
from gajim.common.modules.security_labels import parse_securitylabel
from gajim.common.modules.user_nickname import parse_nickname
diff --git a/gajim/common/modules/presence.py b/gajim/common/modules/presence.py
index 623665fce3..dee33b3cbe 100644
--- a/gajim/common/modules/presence.py
+++ b/gajim/common/modules/presence.py
@@ -19,6 +19,7 @@ import logging
import nbxmpp
from gajim.common import app
+from gajim.common.i18n import _
from gajim.common.nec import NetworkEvent
from gajim.common.modules.user_nickname import parse_nickname
diff --git a/gajim/common/modules/roster_item_exchange.py b/gajim/common/modules/roster_item_exchange.py
index ef37d712b2..0d19e121be 100644
--- a/gajim/common/modules/roster_item_exchange.py
+++ b/gajim/common/modules/roster_item_exchange.py
@@ -20,6 +20,7 @@ import nbxmpp
from gajim.common import app
from gajim.common import helpers
+from gajim.common.i18n import _
from gajim.common.nec import NetworkIncomingEvent
log = logging.getLogger('gajim.c.m.roster_item_exchange')
diff --git a/gajim/common/multimedia_helpers.py b/gajim/common/multimedia_helpers.py
index d269fb8bd7..cf6372aa7c 100644
--- a/gajim/common/multimedia_helpers.py
+++ b/gajim/common/multimedia_helpers.py
@@ -19,6 +19,8 @@ import logging
gi.require_version('Gst', '1.0')
from gi.repository import Gst
+from gajim.common.i18n import _
+
log = logging.getLogger('gajim.c.multimedia_helpers')
diff --git a/gajim/common/optparser.py b/gajim/common/optparser.py
index 93bb88797c..82f6bed45e 100644
--- a/gajim/common/optparser.py
+++ b/gajim/common/optparser.py
@@ -30,6 +30,7 @@ import logging
from gajim.common import app
from gajim.common import caps_cache
+from gajim.common.i18n import _
log = logging.getLogger('gajim.c.optparser')
diff --git a/gajim/common/zeroconf/connection_handlers_zeroconf.py b/gajim/common/zeroconf/connection_handlers_zeroconf.py
index bdd5af53de..6550f0a0aa 100644
--- a/gajim/common/zeroconf/connection_handlers_zeroconf.py
+++ b/gajim/common/zeroconf/connection_handlers_zeroconf.py
@@ -29,6 +29,7 @@ from gajim.common import app
from gajim.common.protocol.bytestream import ConnectionSocks5BytestreamZeroconf
from gajim.common.zeroconf.zeroconf import Constant
from gajim.common import connection_handlers
+from gajim.common.i18n import _
from gajim.common.nec import NetworkIncomingEvent, NetworkEvent
from gajim.common.modules.user_nickname import parse_nickname
from gajim.common.modules.misc import parse_eme
diff --git a/gajim/common/zeroconf/connection_zeroconf.py b/gajim/common/zeroconf/connection_zeroconf.py
index d9f45c088f..7c310314f9 100644
--- a/gajim/common/zeroconf/connection_zeroconf.py
+++ b/gajim/common/zeroconf/connection_zeroconf.py
@@ -44,6 +44,7 @@ from gajim.common.connection import CommonConnection
from gajim.common import app
from gajim.common import ged
from gajim.common import modules
+from gajim.common.i18n import _
from gajim.common.zeroconf import client_zeroconf
from gajim.common.zeroconf import zeroconf
from gajim.common.zeroconf.connection_handlers_zeroconf import *
diff --git a/gajim/common/zeroconf/zeroconf_avahi.py b/gajim/common/zeroconf/zeroconf_avahi.py
index d5fd8bb555..530928a777 100644
--- a/gajim/common/zeroconf/zeroconf_avahi.py
+++ b/gajim/common/zeroconf/zeroconf_avahi.py
@@ -22,6 +22,7 @@ try:
except ImportError:
pass
+from gajim.common.i18n import _
from gajim.common.zeroconf.zeroconf import Constant, ConstantRI
from gajim.common.zeroconf.zeroconf_avahi_const import *
diff --git a/gajim/common/zeroconf/zeroconf_bonjour.py b/gajim/common/zeroconf/zeroconf_bonjour.py
index 29a2405fcf..5459f69a3f 100644
--- a/gajim/common/zeroconf/zeroconf_bonjour.py
+++ b/gajim/common/zeroconf/zeroconf_bonjour.py
@@ -19,6 +19,8 @@ import logging
import select
import socket
import re
+
+from gajim.common.i18n import _
from gajim.common.zeroconf.zeroconf import Constant
diff --git a/gajim/config.py b/gajim/config.py
index 8b97ab640c..db44c65e83 100644
--- a/gajim/config.py
+++ b/gajim/config.py
@@ -33,12 +33,14 @@ from gi.repository import Gtk
from gi.repository import Gdk
from gi.repository import GObject
+from gajim.common import helpers
+from gajim.common import app
+from gajim.common.i18n import _
+
from gajim import gtkgui_helpers
from gajim import dialogs
from gajim import dataforms_widget
from gajim import gui_menu_builder
-from gajim.common import helpers
-from gajim.common import app
from gajim.gtk.dialogs import ConfirmationDialog
from gajim.gtk.dialogs import ConfirmationDialogDoubleRadio
diff --git a/gajim/conversation_textview.py b/gajim/conversation_textview.py
index 773ef896cf..7c892c1a91 100644
--- a/gajim/conversation_textview.py
+++ b/gajim/conversation_textview.py
@@ -35,21 +35,22 @@ from gi.repository import Pango
from gi.repository import GObject
from gi.repository import GLib
-from gajim.gtk import util
-from gajim.gtk.util import load_icon
-from gajim.gtk.util import get_cursor
-from gajim.gtk.emoji_data import emoji_pixbufs
-from gajim.gtk.emoji_data import is_emoji
-from gajim.gtk.emoji_data import get_emoji_pixbuf
from gajim.common import app
from gajim.common import helpers
from gajim.common import i18n
-
+from gajim.common.i18n import _
from gajim.common.fuzzyclock import FuzzyClock
from gajim.common.const import StyleAttr
from gajim.htmltextview import HtmlTextView
+from gajim.gtk import util
+from gajim.gtk.util import load_icon
+from gajim.gtk.util import get_cursor
+from gajim.gtk.emoji_data import emoji_pixbufs
+from gajim.gtk.emoji_data import is_emoji
+from gajim.gtk.emoji_data import get_emoji_pixbuf
+
NOT_SHOWN = 0
ALREADY_RECEIVED = 1
SHOWN = 2
diff --git a/gajim/dataforms_widget.py b/gajim/dataforms_widget.py
index c8e313f5cb..f19d35668b 100644
--- a/gajim/dataforms_widget.py
+++ b/gajim/dataforms_widget.py
@@ -34,6 +34,7 @@ from gajim import gtkgui_helpers
from gajim.common.modules import dataforms
from gajim.common import helpers
from gajim.common import app
+from gajim.common.i18n import _
class DataFormWidget(Gtk.Alignment):
diff --git a/gajim/filetransfers_window.py b/gajim/filetransfers_window.py
index 0a3dbe6b20..0609b46d0e 100644
--- a/gajim/filetransfers_window.py
+++ b/gajim/filetransfers_window.py
@@ -37,6 +37,7 @@ from gajim import tooltips
from gajim.common import app
from gajim.common import helpers
+from gajim.common.i18n import _
from gajim.common.file_props import FilesProp
from gajim.common.protocol.bytestream import (is_transfer_active, is_transfer_paused,
is_transfer_stopped)
diff --git a/gajim/groupchat_control.py b/gajim/groupchat_control.py
index e87a5b077b..8b0f7758ea 100644
--- a/gajim/groupchat_control.py
+++ b/gajim/groupchat_control.py
@@ -57,6 +57,7 @@ from gajim.common import helpers
from gajim.common.modules import dataforms
from gajim.common import ged
from gajim.common import i18n
+from gajim.common.i18n import _
from gajim.common import contacts
from gajim.common.const import StyleAttr
from gajim.common.const import Chatstate
diff --git a/gajim/gtk/about.py b/gajim/gtk/about.py
index 5f12a6afdb..ef0d1e0cde 100644
--- a/gajim/gtk/about.py
+++ b/gajim/gtk/about.py
@@ -18,6 +18,7 @@ from gi.repository import Gtk
from gi.repository import GObject
from gajim.common import app
+from gajim.common.i18n import _
from gajim.common.const import DEVS_CURRENT
from gajim.common.const import DEVS_PAST
from gajim.common.const import ARTISTS
diff --git a/gajim/gtk/account_wizard.py b/gajim/gtk/account_wizard.py
index 28b94a10c9..0fc4984e2e 100644
--- a/gajim/gtk/account_wizard.py
+++ b/gajim/gtk/account_wizard.py
@@ -23,14 +23,19 @@ from gajim.common import ged
from gajim.common import configpaths
from gajim.common import helpers
from gajim.common import connection
+from gajim.common.i18n import _
from gajim.common.modules import dataforms
+
+from gajim import gtkgui_helpers
+from gajim import dataforms_widget
+from gajim import gui_menu_builder
+
from gajim.config import ManageProxiesWindow
from gajim.config import FakeDataForm
+
from gajim.gtk.util import get_builder
from gajim.gtk.dialogs import ErrorDialog
-from gajim import gtkgui_helpers
-from gajim import dataforms_widget
-from gajim import gui_menu_builder
+
class AccountCreationWizard:
diff --git a/gajim/gtk/accounts.py b/gajim/gtk/accounts.py
index ca8b550add..3dfea28968 100644
--- a/gajim/gtk/accounts.py
+++ b/gajim/gtk/accounts.py
@@ -18,18 +18,23 @@ from gi.repository import Gtk
from gi.repository import Gdk
from gi.repository import GLib
-from gajim import gtkgui_helpers
-from gajim import gui_menu_builder
-from gajim import config
-from gajim.options_dialog import OptionsDialog, OptionsBox
-
from gajim.common import app
from gajim.common import passwords
from gajim.common import helpers
from gajim.common import ged
+from gajim.common.i18n import _
from gajim.common.connection import Connection
from gajim.common.zeroconf.connection_zeroconf import ConnectionZeroconf
-from gajim.common.const import Option, OptionKind, OptionType
+from gajim.common.const import Option
+from gajim.common.const import OptionKind
+from gajim.common.const import OptionType
+
+from gajim import gtkgui_helpers
+from gajim import gui_menu_builder
+from gajim import config
+
+from gajim.options_dialog import OptionsDialog
+from gajim.options_dialog import OptionsBox
from gajim.gtk.dialogs import ConfirmationDialog
from gajim.gtk.dialogs import YesNoDialog
diff --git a/gajim/gtk/add_contact.py b/gajim/gtk/add_contact.py
index 4aa1ab9b37..6788915e1a 100644
--- a/gajim/gtk/add_contact.py
+++ b/gajim/gtk/add_contact.py
@@ -19,6 +19,7 @@ from gajim.common import app
from gajim.common import ged
from gajim.common import helpers
from gajim.common.i18n import _
+
from gajim.gtk.dialogs import ErrorDialog
from gajim.gtk.util import get_builder
diff --git a/gajim/gtk/advanced_config.py b/gajim/gtk/advanced_config.py
index 4711b32bd1..ea4ed3d76a 100644
--- a/gajim/gtk/advanced_config.py
+++ b/gajim/gtk/advanced_config.py
@@ -26,6 +26,7 @@ from gi.repository import GLib
from gi.repository import Pango
from gajim.common import app
+from gajim.common.i18n import _
from gajim.gtk.util import get_builder
diff --git a/gajim/gtk/bookmarks.py b/gajim/gtk/bookmarks.py
index a96828a45d..5d0859439f 100644
--- a/gajim/gtk/bookmarks.py
+++ b/gajim/gtk/bookmarks.py
@@ -15,10 +15,13 @@
from gi.repository import Gtk
from gi.repository import Gdk
-from gajim import gui_menu_builder
from gajim.common import app
from gajim.common import helpers
from gajim.common.i18n import Q_
+from gajim.common.i18n import _
+
+from gajim import gui_menu_builder
+
from gajim.gtk.dialogs import ErrorDialog
from gajim.gtk.util import get_builder
diff --git a/gajim/gtk/dialogs.py b/gajim/gtk/dialogs.py
index 5811740ec1..608030bb59 100644
--- a/gajim/gtk/dialogs.py
+++ b/gajim/gtk/dialogs.py
@@ -16,6 +16,8 @@ from gi.repository import Gtk
from gajim.common import app
from gajim.common import helpers
+from gajim.common.i18n import _
+
from gajim.gtk.util import get_builder
from gajim.gtk.util import load_icon
diff --git a/gajim/gtk/features.py b/gajim/gtk/features.py
index bbb4340ec5..03da12bfed 100644
--- a/gajim/gtk/features.py
+++ b/gajim/gtk/features.py
@@ -26,6 +26,8 @@ from gi.repository import Gtk, Gdk
from gajim.common import app
from gajim.common.i18n import Q_
+from gajim.common.i18n import _
+
from gajim.gtk.util import get_builder
diff --git a/gajim/gtk/filechoosers.py b/gajim/gtk/filechoosers.py
index 2113a3f4dc..12ad6d80c9 100644
--- a/gajim/gtk/filechoosers.py
+++ b/gajim/gtk/filechoosers.py
@@ -25,6 +25,7 @@ from gi.repository import GObject
from gajim.common import app
from gajim.common.i18n import _
+
from gajim.gtk.const import Filter
from gajim.gtk.types import FilterList # pylint: disable=unused-import
diff --git a/gajim/gtk/history.py b/gajim/gtk/history.py
index f5a0b5e7f2..46e8fc9f6f 100644
--- a/gajim/gtk/history.py
+++ b/gajim/gtk/history.py
@@ -29,15 +29,17 @@ from gi.repository import Gtk
from gi.repository import Gdk
from gi.repository import GLib
-from gajim import conversation_textview
-from gajim.gtk.dialogs import ErrorDialog
-from gajim.gtk import util
-from gajim.gtk.util import python_month, gtk_month
from gajim.common import app
from gajim.common import helpers
from gajim.common import exceptions
+from gajim.common.i18n import _
from gajim.common.const import ShowConstant, KindConstant
+from gajim import conversation_textview
+
+from gajim.gtk import util
+from gajim.gtk.util import python_month, gtk_month
+from gajim.gtk.dialogs import ErrorDialog
@unique
class InfoColumn(IntEnum):
diff --git a/gajim/gtk/history_sync.py b/gajim/gtk/history_sync.py
index c9f7a45948..1c7c17caa4 100644
--- a/gajim/gtk/history_sync.py
+++ b/gajim/gtk/history_sync.py
@@ -16,11 +16,14 @@ import logging
from enum import IntEnum
from datetime import datetime, timedelta
-from gi.repository import Gtk, GLib
+from gi.repository import Gtk
+from gi.repository import GLib
from gajim.common import app
from gajim.common import ged
+from gajim.common.i18n import _
from gajim.common.const import ArchiveState
+
from gajim.gtk.util import load_icon
log = logging.getLogger('gajim.gtk.history_sync')
diff --git a/gajim/gtk/join_groupchat.py b/gajim/gtk/join_groupchat.py
index a43e7b062b..fc4fb96f1a 100644
--- a/gajim/gtk/join_groupchat.py
+++ b/gajim/gtk/join_groupchat.py
@@ -18,8 +18,10 @@ from gi.repository import Gdk
from gajim.common import app
from gajim.common import helpers
+from gajim.common.i18n import _
from gajim.common.caps_cache import muc_caps_cache
from gajim.common.exceptions import GajimGeneralException
+
from gajim.gtk.dialogs import ErrorDialog
from gajim.gtk.util import get_builder
diff --git a/gajim/gtk/mam_preferences.py b/gajim/gtk/mam_preferences.py
index 72949ae170..ef2e45c466 100644
--- a/gajim/gtk/mam_preferences.py
+++ b/gajim/gtk/mam_preferences.py
@@ -19,6 +19,7 @@ from gi.repository import Gdk
from gajim.common import app
from gajim.common import ged
+from gajim.common.i18n import _
from gajim.gtk.util import get_builder
from gajim.gtk.dialogs import HigDialog
diff --git a/gajim/gtk/pep_config.py b/gajim/gtk/pep_config.py
index 5176865a47..491865e29c 100644
--- a/gajim/gtk/pep_config.py
+++ b/gajim/gtk/pep_config.py
@@ -16,6 +16,8 @@ from gi.repository import Gtk
from gajim.common import app
from gajim.common import ged
+from gajim.common.i18n import _
+
from gajim.gtk.dialogs import ErrorDialog
from gajim.gtk.dialogs import WarningDialog
from gajim.gtk.util import get_builder
diff --git a/gajim/gtk/preferences.py b/gajim/gtk/preferences.py
index f16f982553..b4b2f4ac7d 100644
--- a/gajim/gtk/preferences.py
+++ b/gajim/gtk/preferences.py
@@ -24,13 +24,17 @@ from gajim.common import helpers
from gajim.common import configpaths
from gajim.common import config as c_config
from gajim.common import idle
+from gajim.common.i18n import _
-from gajim.chat_control_base import ChatControlBase
-from gajim.config import ManageProxiesWindow, ManageSoundsWindow
from gajim import message_control
from gajim import cell_renderer_image
from gajim import gtkgui_helpers
+from gajim.chat_control_base import ChatControlBase
+
+from gajim.config import ManageProxiesWindow
+from gajim.config import ManageSoundsWindow
+
from gajim.gtk.util import get_builder
from gajim.gtk.dialogs import AspellDictError
from gajim.gtk.themes import Themes
diff --git a/gajim/gtk/privacy_list.py b/gajim/gtk/privacy_list.py
index b151e7ae11..2019dc0911 100644
--- a/gajim/gtk/privacy_list.py
+++ b/gajim/gtk/privacy_list.py
@@ -19,6 +19,8 @@ from gi.repository import GObject
from gajim.common import app
from gajim.common import ged
+from gajim.common.i18n import _
+
from gajim.gtk.dialogs import ErrorDialog
from gajim.gtk.util import get_builder
diff --git a/gajim/gtk/profile.py b/gajim/gtk/profile.py
index 25ef6d1ff3..a66d18ce12 100644
--- a/gajim/gtk/profile.py
+++ b/gajim/gtk/profile.py
@@ -25,14 +25,18 @@ from gi.repository import Gtk
from gi.repository import Gdk
from gi.repository import GLib
+from gajim.common import app
+from gajim.common import ged
+from gajim.common.i18n import _
+from gajim.common.const import AvatarSize
+
from gajim import gtkgui_helpers
+
from gajim.gtk.dialogs import ErrorDialog
from gajim.gtk.dialogs import InformationDialog
from gajim.gtk.util import get_builder
from gajim.gtk.filechoosers import AvatarChooserDialog
-from gajim.common.const import AvatarSize
-from gajim.common import app
-from gajim.common import ged
+
log = logging.getLogger('gajim.profile')
diff --git a/gajim/gtk/server_info.py b/gajim/gtk/server_info.py
index 8bf9fb3356..f66d6b97cb 100644
--- a/gajim/gtk/server_info.py
+++ b/gajim/gtk/server_info.py
@@ -21,6 +21,7 @@ from gi.repository import Gtk
from gajim.common import app
from gajim.common import ged
+from gajim.common.i18n import _
log = logging.getLogger('gajim.gtk.serverinfo')
diff --git a/gajim/gtk/service_registration.py b/gajim/gtk/service_registration.py
index eb4c778156..b9e5d890d4 100644
--- a/gajim/gtk/service_registration.py
+++ b/gajim/gtk/service_registration.py
@@ -20,6 +20,7 @@ from gi.repository import Gtk
from gajim.common import app
from gajim.common.modules import dataforms
from gajim.common.i18n import _
+
from gajim.gtk.dataform import DataFormWidget
log = logging.getLogger('gajim.gtk.registration')
diff --git a/gajim/gtk/single_message.py b/gajim/gtk/single_message.py
index ee5968a696..d441bbff40 100644
--- a/gajim/gtk/single_message.py
+++ b/gajim/gtk/single_message.py
@@ -18,9 +18,14 @@ from gi.repository import Gdk
from gi.repository import GLib
from gajim.common import app
-from gajim.common.modules import dataforms
from gajim.common import helpers
+from gajim.common.i18n import _
+from gajim.common.modules import dataforms
from gajim.common.connection_handlers_events import MessageOutgoingEvent
+
+from gajim.dataforms_widget import DataFormWidget
+from gajim.conversation_textview import ConversationTextview
+
from gajim.gtk.dialogs import ErrorDialog
from gajim.gtk.dialogs import AspellDictError
from gajim.gtk.util import get_builder
@@ -28,9 +33,6 @@ from gajim.gtk.util import get_iconset_name_for
from gajim.gtk.util import get_completion_liststore
from gajim.gtk.util import move_window
from gajim.gtk.util import resize_window
-from gajim.dataforms_widget import DataFormWidget
-from gajim.conversation_textview import ConversationTextview
-
if app.is_installed('GSPELL'):
from gi.repository import Gspell
diff --git a/gajim/gtk/start_chat.py b/gajim/gtk/start_chat.py
index 7ef83bb086..455aa6f22a 100644
--- a/gajim/gtk/start_chat.py
+++ b/gajim/gtk/start_chat.py
@@ -21,6 +21,7 @@ from gi.repository import Pango
from gajim.common import app
from gajim.common import helpers
+from gajim.common.i18n import _
from gajim.common.const import AvatarSize
from gajim.gtk.util import get_iconset_name_for
diff --git a/gajim/gtk/themes.py b/gajim/gtk/themes.py
index 4b0904c5be..0f1262e5ed 100644
--- a/gajim/gtk/themes.py
+++ b/gajim/gtk/themes.py
@@ -22,8 +22,11 @@ from gi.repository import Gdk
from gajim.common import app
from gajim.common.i18n import _
-from gajim.common.const import StyleAttr, DialogButton, ButtonAction
+from gajim.common.const import StyleAttr
+from gajim.common.const import DialogButton
+from gajim.common.const import ButtonAction
from gajim.common.connection_handlers_events import StyleChanged
+
from gajim.gtk.dialogs import ErrorDialog
from gajim.gtk.dialogs import NewConfirmationDialog
from gajim.gtk.util import get_builder
diff --git a/gajim/gtk/xml_console.py b/gajim/gtk/xml_console.py
index fb9bbdcbaf..d087da64d7 100644
--- a/gajim/gtk/xml_console.py
+++ b/gajim/gtk/xml_console.py
@@ -21,11 +21,17 @@ from gi.repository import GLib
from gajim.common import app
from gajim.common import ged
-from gajim.common.const import Option, OptionKind, OptionType, StyleAttr
-from gajim.gtk.dialogs import ErrorDialog
+from gajim.common.i18n import _
+from gajim.common.const import Option
+from gajim.common.const import OptionKind
+from gajim.common.const import OptionType
+from gajim.common.const import StyleAttr
+
from gajim.gtk import util
from gajim.gtk.util import get_builder
from gajim.gtk.util import get_image_button
+from gajim.gtk.dialogs import ErrorDialog
+
from gajim.options_dialog import OptionsDialog
diff --git a/gajim/gtkgui_helpers.py b/gajim/gtkgui_helpers.py
index ede427f521..f332a8a9c8 100644
--- a/gajim/gtkgui_helpers.py
+++ b/gajim/gtkgui_helpers.py
@@ -45,6 +45,7 @@ except Exception:
pass
from gajim.common import i18n
+from gajim.common.i18n import _
from gajim.common import app
from gajim.common import configpaths
from gajim.common.const import PEPEventType, ACTIVITIES, MOODS
diff --git a/gajim/gui_interface.py b/gajim/gui_interface.py
index 4e08ede69d..200f5cd29c 100644
--- a/gajim/gui_interface.py
+++ b/gajim/gui_interface.py
@@ -89,6 +89,7 @@ from gajim.common import socks5
from gajim.common import helpers
from gajim.common import passwords
from gajim.common import logging_helpers
+from gajim.common.i18n import _
from gajim.common.connection_handlers_events import (
OurShowEvent, FileRequestErrorEvent, FileTransferCompletedEvent,
UpdateRosterAvatarEvent, UpdateGCAvatarEvent, UpdateRoomAvatarEvent)
diff --git a/gajim/gui_menu_builder.py b/gajim/gui_menu_builder.py
index 05b95fec78..2644ecdbb1 100644
--- a/gajim/gui_menu_builder.py
+++ b/gajim/gui_menu_builder.py
@@ -24,6 +24,7 @@ from gajim.gtkgui_helpers import get_action
from gajim.common import app
from gajim.common import helpers
from gajim.common.i18n import ngettext
+from gajim.common.i18n import _
def build_resources_submenu(contacts, account, action, room_jid=None,
diff --git a/gajim/message_window.py b/gajim/message_window.py
index 7f38a9f26c..1dc2eac3fc 100644
--- a/gajim/message_window.py
+++ b/gajim/message_window.py
@@ -33,6 +33,7 @@ from gi.repository import GLib
from gajim import common
from gajim.common import app
from gajim.common.i18n import Q_
+from gajim.common.i18n import _
from gajim import gtkgui_helpers
from gajim import message_control
diff --git a/gajim/notify.py b/gajim/notify.py
index 691badf324..8d575b7e7e 100644
--- a/gajim/notify.py
+++ b/gajim/notify.py
@@ -36,6 +36,7 @@ from gajim import gtkgui_helpers
from gajim.common import app
from gajim.common import helpers
from gajim.common import ged
+from gajim.common.i18n import _
log = logging.getLogger('gajim.notify')
diff --git a/gajim/options_dialog.py b/gajim/options_dialog.py
index 754be84f8a..1cd2b9692b 100644
--- a/gajim/options_dialog.py
+++ b/gajim/options_dialog.py
@@ -1,6 +1,7 @@
from gi.repository import Gtk, GLib, Gdk, GObject
from gajim.common import app
from gajim.common import passwords
+from gajim.common.i18n import _
from gajim import gtkgui_helpers
from gajim.common.const import OptionKind, OptionType
from gajim.common.exceptions import GajimGeneralException
diff --git a/gajim/plugins/pluginmanager.py b/gajim/plugins/pluginmanager.py
index 72bd1a5b42..9b30bf266f 100644
--- a/gajim/plugins/pluginmanager.py
+++ b/gajim/plugins/pluginmanager.py
@@ -36,6 +36,7 @@ from gajim.common import app
from gajim.common import nec
from gajim.common import configpaths
from gajim.common import modules
+from gajim.common.i18n import _
from gajim.common.exceptions import PluginsystemError
from gajim.plugins.helpers import log, log_calls, Singleton
diff --git a/gajim/roster_window.py b/gajim/roster_window.py
index e74755016f..688eae2c38 100644
--- a/gajim/roster_window.py
+++ b/gajim/roster_window.py
@@ -59,6 +59,7 @@ from gajim.common import helpers
from gajim.common import idle
from gajim.common.exceptions import GajimGeneralException
from gajim.common import i18n
+from gajim.common.i18n import _
from gajim.common.const import PEPEventType, AvatarSize, StyleAttr
if app.is_installed('GEOCLUE'):
from gajim.common import location_listener
diff --git a/gajim/search_window.py b/gajim/search_window.py
index 8e7b9a982e..3e974bb130 100644
--- a/gajim/search_window.py
+++ b/gajim/search_window.py
@@ -20,8 +20,9 @@ from gi.repository import Gtk
from gi.repository import Gdk
from gajim.common import app
-from gajim.common.modules import dataforms
from gajim.common import ged
+from gajim.common.modules import dataforms
+from gajim.common.i18n import _
from gajim import gtkgui_helpers
from gajim import vcard
diff --git a/gajim/statusicon.py b/gajim/statusicon.py
index 0f017bd04c..343a5c66a6 100644
--- a/gajim/statusicon.py
+++ b/gajim/statusicon.py
@@ -29,6 +29,7 @@ from gajim import tooltips
from gajim import gtkgui_helpers
from gajim.common import app
from gajim.common import helpers
+from gajim.common.i18n import _
from gajim.gtk.single_message import SingleMessageWindow
diff --git a/gajim/tooltips.py b/gajim/tooltips.py
index 2dca6fd5a4..cdd84e2971 100644
--- a/gajim/tooltips.py
+++ b/gajim/tooltips.py
@@ -39,6 +39,7 @@ from gajim.common.const import AvatarSize
from gajim.common import app
from gajim.common import helpers
from gajim.common.i18n import Q_
+from gajim.common.i18n import _
log = logging.getLogger('gajim.tooltips')
diff --git a/gajim/vcard.py b/gajim/vcard.py
index cb0e094ea7..f873425b87 100644
--- a/gajim/vcard.py
+++ b/gajim/vcard.py
@@ -39,6 +39,7 @@ from gajim.common import app
from gajim.common import ged
from gajim.common import configpaths
from gajim.common.i18n import Q_
+from gajim.common.i18n import _
from gajim.common.const import AvatarSize
# log = logging.getLogger('gajim.vcard')
--
GitLab