Commit bf87ad5a authored by Philipp Hörist's avatar Philipp Hörist

Import _() instead of using builtin namespace

- Prepare for removing the global installed _() method in builtins
- Sort some imports along the way
parent 990a35f9
......@@ -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
......
......@@ -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):
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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):
"""
......
......@@ -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
......
......@@ -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)
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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')
......
......@@ -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')
......
......@@ -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')
......
......@@ -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
......
......@@ -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 *
......
......@@ -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 *
......
......@@ -19,6 +19,8 @@ import logging
import select
import socket
import re
from gajim.common.i18n import _
from gajim.common.zeroconf.zeroconf import Constant
......
......@@ -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
......
......@@ -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
......
......@@ -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):
......
......@@ -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)
......
......@@ -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
......
......@@ -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
......
......@@ -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:
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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):
......
......@@ -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')
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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')
......
......@@ -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')
......
......@@ -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')
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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)
......
......@@ -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,
......
......@@ -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
......
......@@ -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')
......
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
......
......@@ -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
......
......@@ -59,6 +59,7 @@ from gajim.common import helpers