|
42 | 42 | from . import i18n
|
43 | 43 | from .virtual_environment import venv, logger as vlogger
|
44 | 44 | from . import __version__
|
| 45 | +from .resources import load_icon, load_movie, load_pixmap |
| 46 | +from .interface.themes import NIGHT_STYLE, DAY_STYLE, CONTRAST_STYLE |
| 47 | + |
| 48 | +# HACK: Ensure that i18n settings are present before any gettext |
| 49 | +# functions are called. |
| 50 | +from . import settings |
| 51 | +# |
| 52 | +# Load settings from known locations and register them for |
| 53 | +# autosave |
| 54 | +# |
| 55 | +settings.init() |
| 56 | +old_session = settings.session |
| 57 | +if "locale" in old_session: |
| 58 | + user_locale = old_session["locale"].strip() |
| 59 | + if user_locale: |
| 60 | + i18n.set_language(user_locale) |
| 61 | + |
45 | 62 | from .logic import Editor, LOG_FILE, LOG_DIR, ENCODING
|
46 | 63 | from .interface import Window
|
47 |
| -from .resources import load_icon, load_movie, load_pixmap |
48 | 64 | from .modes import (
|
49 | 65 | PythonMode,
|
50 | 66 | CircuitPythonMode,
|
|
57 | 73 | LegoMode,
|
58 | 74 | PicoMode,
|
59 | 75 | )
|
60 |
| -from .interface.themes import NIGHT_STYLE, DAY_STYLE, CONTRAST_STYLE |
61 |
| -from . import settings |
62 | 76 |
|
63 | 77 |
|
64 | 78 | class AnimatedSplash(QSplashScreen):
|
@@ -272,11 +286,8 @@ def run():
|
272 | 286 | logging.info("Python path: {}".format(sys.path))
|
273 | 287 | logging.info("Language code: {}".format(i18n.language_code))
|
274 | 288 |
|
275 |
| - # |
276 |
| - # Load settings from known locations and register them for |
277 |
| - # autosave |
278 |
| - # |
279 |
| - settings.init() |
| 289 | + # Not loading settings here because the same has been done at the top of |
| 290 | + # the script |
280 | 291 |
|
281 | 292 | # Images (such as toolbar icons) aren't scaled nicely on retina/4k displays
|
282 | 293 | # unless this flag is set
|
|
0 commit comments