diff --git a/lib/logitech_receiver/base_usb.py b/lib/logitech_receiver/base_usb.py index 451f0977..5460cf3a 100644 --- a/lib/logitech_receiver/base_usb.py +++ b/lib/logitech_receiver/base_usb.py @@ -24,7 +24,7 @@ # USB ids of Logitech wireless receivers. # Only receivers supporting the HID++ protocol can go in here. -from .i18n import _ +from solaar.i18n import _ # max_devices is only used for receivers that do not support reading from _R.receiver_info offset 0x03, default to 1 # may_unpair is only used for receivers that do not support reading from _R.receiver_info offset 0x03, default to False diff --git a/lib/logitech_receiver/common.py b/lib/logitech_receiver/common.py index 83d76c44..4876b117 100644 --- a/lib/logitech_receiver/common.py +++ b/lib/logitech_receiver/common.py @@ -25,7 +25,7 @@ from typing import Union import yaml as _yaml -from .i18n import _ +from solaar.i18n import _ def is_string(d): diff --git a/lib/logitech_receiver/hidpp20.py b/lib/logitech_receiver/hidpp20.py index 5449f051..1acb30a8 100644 --- a/lib/logitech_receiver/hidpp20.py +++ b/lib/logitech_receiver/hidpp20.py @@ -26,6 +26,8 @@ from typing import Optional import yaml as _yaml +from solaar.i18n import _ + from . import exceptions from . import hidpp10_constants as _hidpp10_constants from . import special_keys @@ -45,7 +47,6 @@ from .hidpp20_constants import ERROR from .hidpp20_constants import FEATURE from .hidpp20_constants import FIRMWARE_KIND from .hidpp20_constants import GESTURE -from .i18n import _ logger = logging.getLogger(__name__) diff --git a/lib/logitech_receiver/notifications.py b/lib/logitech_receiver/notifications.py index 0ef2e90e..b75ef61c 100644 --- a/lib/logitech_receiver/notifications.py +++ b/lib/logitech_receiver/notifications.py @@ -22,6 +22,8 @@ import threading as _threading from struct import unpack as _unpack +from solaar.i18n import _ + from . import diversion as _diversion from . import hidpp10 from . import hidpp10_constants as _hidpp10_constants @@ -32,7 +34,6 @@ from .base import DJ_MESSAGE_ID as _DJ_MESSAGE_ID from .common import ALERT as _ALERT from .common import Battery as _Battery from .common import strhex as _strhex -from .i18n import _ logger = logging.getLogger(__name__) diff --git a/lib/logitech_receiver/receiver.py b/lib/logitech_receiver/receiver.py index 5fa0fe00..629dd528 100644 --- a/lib/logitech_receiver/receiver.py +++ b/lib/logitech_receiver/receiver.py @@ -24,14 +24,15 @@ from typing import Optional import hidapi as _hid +from solaar.i18n import _ +from solaar.i18n import ngettext + from . import base as _base from . import exceptions from . import hidpp10 from . import hidpp10_constants from .common import ALERT from .device import Device -from .i18n import _ -from .i18n import ngettext logger = logging.getLogger(__name__) diff --git a/lib/logitech_receiver/settings.py b/lib/logitech_receiver/settings.py index 9bec5a01..b8cd447a 100644 --- a/lib/logitech_receiver/settings.py +++ b/lib/logitech_receiver/settings.py @@ -20,12 +20,13 @@ import math from struct import unpack as _unpack from time import sleep as _sleep +from solaar.i18n import _ + from . import hidpp20_constants as _hidpp20_constants from .common import NamedInt as _NamedInt from .common import NamedInts as _NamedInts from .common import bytes2int as _bytes2int from .common import int2bytes as _int2bytes -from .i18n import _ logger = logging.getLogger(__name__) diff --git a/lib/logitech_receiver/settings_templates.py b/lib/logitech_receiver/settings_templates.py index 7bdf1e4f..c474d149 100644 --- a/lib/logitech_receiver/settings_templates.py +++ b/lib/logitech_receiver/settings_templates.py @@ -23,6 +23,8 @@ from struct import unpack as _unpack from time import time as _time from traceback import format_exc as _format_exc +from solaar.i18n import _ + from . import descriptors as _descriptors from . import hidpp10_constants as _hidpp10_constants from . import hidpp20 @@ -35,7 +37,6 @@ from .common import NamedInts as _NamedInts from .common import bytes2int as _bytes2int from .common import int2bytes as _int2bytes from .diversion import process_notification as _process_notification -from .i18n import _ from .settings import KIND as _KIND from .settings import ActionSettingRW as _ActionSettingRW from .settings import BitFieldSetting as _BitFieldSetting