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

@@ -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
 

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):

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

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

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
 

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

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

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):
     """

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

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)

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

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

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

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
 

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')

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')
 
 

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')

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

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 *

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 *
 

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
 
 

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

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

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):

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)

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

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

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:

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

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
 

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
 

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
 

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
 

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
 
 

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
 

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):

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')

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
 

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

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

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

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
 

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')
 

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')
 

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')

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