From 41b879716f0a27bda98f3901bbe62244dde83f03 Mon Sep 17 00:00:00 2001 From: David Sangrey Date: Thu, 4 Jan 2024 13:02:39 -0500 Subject: [PATCH 1/3] [2140] Translate Newver Str --- EDMC.py | 5 ++++- L10n/en.template | 2 ++ update.py | 4 +++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/EDMC.py b/EDMC.py index 072b0492..651536e9 100755 --- a/EDMC.py +++ b/EDMC.py @@ -26,6 +26,7 @@ from EDMCLogging import edmclogger, logger, logging if TYPE_CHECKING: from logging import TRACE # type: ignore # noqa: F401 # needed to make mypy happy + def _(x): return x edmclogger.set_channels_loglevel(logging.INFO) @@ -162,7 +163,9 @@ def main(): # noqa: C901, CCR001 updater = Updater() newversion: EDMCVersion | None = updater.check_appcast() if newversion: - print(f'{appversion()} ({newversion.title!r} is available)') + # LANG: Updater Available Text + newverstr = _("{NEWVER} is available").format(NEWVER=newversion.title) + print(f'{appversion()} ({newverstr})') else: print(appversion()) return diff --git a/L10n/en.template b/L10n/en.template index 3aed0952..c41681dd 100644 --- a/L10n/en.template +++ b/L10n/en.template @@ -789,3 +789,5 @@ /* stats.py: Status dialog title; In files: stats.py:418; */ "Ships" = "Ships"; +/* update.py: Updater Available Text; In files: update.py:229; */ +"{NEWVER} is available" = "{NEWVER} is available"; \ No newline at end of file diff --git a/update.py b/update.py index f88daa38..f2aa1420 100644 --- a/update.py +++ b/update.py @@ -21,6 +21,7 @@ from EDMCLogging import get_main_logger if TYPE_CHECKING: import tkinter as tk + def _(x): return x logger = get_main_logger() @@ -225,7 +226,8 @@ class Updater: if newversion and self.root: status = self.root.nametowidget(f'.{appname.lower()}.status') - status['text'] = newversion.title + ' is available' + # LANG: Updater Available Text + status['text'] = _("{NEWVER} is available").format(NEWVER=newversion.title) self.root.update_idletasks() else: From 881c94a619be3089d187bf8569ca7739199448f4 Mon Sep 17 00:00:00 2001 From: David Sangrey Date: Thu, 4 Jan 2024 14:07:18 -0500 Subject: [PATCH 2/3] [Lang] Update Lang Comment --- EDMC.py | 2 +- L10n/en.template | 2 +- update.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/EDMC.py b/EDMC.py index 651536e9..81c4ddc8 100755 --- a/EDMC.py +++ b/EDMC.py @@ -163,7 +163,7 @@ def main(): # noqa: C901, CCR001 updater = Updater() newversion: EDMCVersion | None = updater.check_appcast() if newversion: - # LANG: Updater Available Text + # LANG: Update Available Text newverstr = _("{NEWVER} is available").format(NEWVER=newversion.title) print(f'{appversion()} ({newverstr})') else: diff --git a/L10n/en.template b/L10n/en.template index c41681dd..de607eb4 100644 --- a/L10n/en.template +++ b/L10n/en.template @@ -789,5 +789,5 @@ /* stats.py: Status dialog title; In files: stats.py:418; */ "Ships" = "Ships"; -/* update.py: Updater Available Text; In files: update.py:229; */ +/* update.py: Update Available Text; In files: update.py:229; */ "{NEWVER} is available" = "{NEWVER} is available"; \ No newline at end of file diff --git a/update.py b/update.py index f2aa1420..5e780a37 100644 --- a/update.py +++ b/update.py @@ -226,7 +226,7 @@ class Updater: if newversion and self.root: status = self.root.nametowidget(f'.{appname.lower()}.status') - # LANG: Updater Available Text + # LANG: Update Available Text status['text'] = _("{NEWVER} is available").format(NEWVER=newversion.title) self.root.update_idletasks() From e531db8d488c3cda33bec22c26343e95b1109aae Mon Sep 17 00:00:00 2001 From: David Sangrey Date: Thu, 4 Jan 2024 15:30:02 -0500 Subject: [PATCH 3/3] [Flake8] Ignore Type Hint Missing It's not missing. They're there. --- EDMC.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/EDMC.py b/EDMC.py index 81c4ddc8..a237f4ea 100755 --- a/EDMC.py +++ b/EDMC.py @@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# flake8: noqa TAE001 """ EDMC.py - Command-line interface. Requires prior setup through the GUI. @@ -164,7 +165,7 @@ def main(): # noqa: C901, CCR001 newversion: EDMCVersion | None = updater.check_appcast() if newversion: # LANG: Update Available Text - newverstr = _("{NEWVER} is available").format(NEWVER=newversion.title) + newverstr: str = _("{NEWVER} is available").format(NEWVER=newversion.title) print(f'{appversion()} ({newverstr})') else: print(appversion())