Skip to content

Commit ca60f1b

Browse files
committed
IMPROVEMENT: simplify internationalization
1 parent 3ebe3ab commit ca60f1b

22 files changed

+41
-36
lines changed

MethodicConfigurator/__init__.py

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,15 @@
1-
"""ArduPilot Methodic Configurator GUI application""" # pylint: skip-file
1+
#!/usr/bin/env python3
2+
3+
"""
4+
This file is part of Ardupilot methodic configurator. https://github.com/ArduPilot/MethodicConfigurator
5+
6+
SPDX-FileCopyrightText: 2024 Amilcar do Carmo Lucas <amilcar.lucas@iav.de>
7+
8+
SPDX-License-Identifier: GPL-3.0-or-later
9+
"""
10+
# pylint: skip-file
11+
12+
from MethodicConfigurator.internationalization import load_translation
13+
14+
15+
_ = load_translation()

MethodicConfigurator/ardupilot_methodic_configurator.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
from MethodicConfigurator.frontend_tkinter_directory_selection import VehicleDirectorySelectionWindow
2828
from MethodicConfigurator.frontend_tkinter_flightcontroller_info import FlightControllerInfoWindow
2929
from MethodicConfigurator.frontend_tkinter_parameter_editor import ParameterEditorWindow
30-
from MethodicConfigurator.internationalization import _, load_translation
30+
from MethodicConfigurator import _
3131
from MethodicConfigurator.version import VERSION
3232

3333

@@ -113,10 +113,6 @@ def component_editor(args, flight_controller, vehicle_type, local_filesystem, ve
113113

114114

115115
def main():
116-
# modify the global _() function
117-
global _ # pylint: disable=global-statement
118-
119-
_ = load_translation() # done as soon as possible so that the correct language is used
120116
args = argument_parser()
121117

122118
logging_basicConfig(level=logging_getLevelName(args.loglevel), format="%(asctime)s - %(levelname)s - %(message)s")

MethodicConfigurator/argparse_check_range.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
from argparse import Action, ArgumentError
1414
from operator import ge, gt, le, lt
1515

16-
from MethodicConfigurator.internationalization import _
16+
from MethodicConfigurator import _
1717

1818

1919
class CheckRange(Action):

MethodicConfigurator/backend_filesystem.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
from MethodicConfigurator.backend_filesystem_configuration_steps import ConfigurationSteps
4141
from MethodicConfigurator.backend_filesystem_program_settings import ProgramSettings
4242
from MethodicConfigurator.backend_filesystem_vehicle_components import VehicleComponents
43-
from MethodicConfigurator.internationalization import _
43+
from MethodicConfigurator import _
4444

4545
TOOLTIP_MAX_LENGTH = 105
4646

MethodicConfigurator/backend_filesystem_configuration_steps.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
from typing import Tuple
2121

2222
from MethodicConfigurator.annotate_params import Par
23-
from MethodicConfigurator.internationalization import _
23+
from MethodicConfigurator import _
2424

2525

2626
class ConfigurationSteps:

MethodicConfigurator/backend_filesystem_program_settings.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
from platformdirs import site_config_dir, user_config_dir
2525

26-
from MethodicConfigurator.internationalization import _
26+
from MethodicConfigurator import _
2727

2828

2929
class ProgramSettings:

MethodicConfigurator/backend_filesystem_vehicle_components.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
from re import match as re_match
2424

2525
from MethodicConfigurator.backend_filesystem_program_settings import ProgramSettings
26-
from MethodicConfigurator.internationalization import _
26+
from MethodicConfigurator import _
2727
from MethodicConfigurator.middleware_template_overview import TemplateOverview
2828

2929

MethodicConfigurator/backend_flightcontroller.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
from MethodicConfigurator.argparse_check_range import CheckRange
2828
from MethodicConfigurator.backend_flightcontroller_info import BackendFlightcontrollerInfo
2929
from MethodicConfigurator.backend_mavftp import MAVFTP
30-
from MethodicConfigurator.internationalization import _
30+
from MethodicConfigurator import _
3131

3232
# adding all this allows pyinstaller to build a working windows executable
3333
# note that using --hidden-import does not work for these modules

MethodicConfigurator/common_arguments.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
SPDX-License-Identifier: GPL-3.0-or-later
99
"""
1010

11-
from MethodicConfigurator.internationalization import LANGUAGE_CHOICES, _
11+
from MethodicConfigurator import _
12+
from MethodicConfigurator.internationalization import LANGUAGE_CHOICES
1213
from MethodicConfigurator.version import VERSION
1314

1415

@@ -26,7 +27,7 @@ def add_common_arguments_and_parse(parser):
2627
parser.add_argument(
2728
"--language",
2829
type=str,
29-
default="en",
30+
default=LANGUAGE_CHOICES[0],
3031
choices=LANGUAGE_CHOICES,
3132
help=_("User interface language (default is %(default)s)."),
3233
)

MethodicConfigurator/frontend_tkinter_base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
from MethodicConfigurator.backend_filesystem import LocalFilesystem
2727
from MethodicConfigurator.backend_filesystem_program_settings import ProgramSettings
28-
from MethodicConfigurator.internationalization import _
28+
from MethodicConfigurator import _
2929

3030

3131
def show_error_message(title: str, message: str):

0 commit comments

Comments
 (0)