From 8e749e1230db0868faf5e7dfac9f2ea5fa5a922d Mon Sep 17 00:00:00 2001 From: clementb49 Date: Sun, 28 Apr 2024 20:46:22 +0200 Subject: [PATCH] fix(translation): Fix translation string which generate error --- src/account.py | 13 +++++++------ src/accountdialog.py | 24 +++++++++++++++--------- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/src/account.py b/src/account.py index 6a78931..5376f27 100644 --- a/src/account.py +++ b/src/account.py @@ -188,9 +188,10 @@ def __setitem__(self, index, value): self.root[index] = value -ACCOUNT_SOURCE_LABELS = { - # Translators: Account source label - AccountSource.ENV_VAR: _("Environment variable"), - # Translators: Account source label - AccountSource.CONFIG: _("Configuration file"), -} +def get_account_source_labels() -> dict[AccountSource, str]: + return { + # Translators: Account source label + AccountSource.ENV_VAR: _("Environment variable"), + # Translators: Account source label + AccountSource.CONFIG: _("Configuration file"), + } diff --git a/src/accountdialog.py b/src/accountdialog.py index 392609d..441d04a 100644 --- a/src/accountdialog.py +++ b/src/accountdialog.py @@ -6,7 +6,7 @@ Account, AccountOrganization, AccountSource, - ACCOUNT_SOURCE_LABELS, + get_account_source_labels, ) from config import conf from provider import providers, get_provider @@ -97,6 +97,7 @@ def __init__( self, parent: wx.Window, title: str, account: Account, size=(400, 400) ): wx.Dialog.__init__(self, parent, title=title, size=size) + self.account_source_labels = get_account_source_labels() self.parent = parent self.account = account self.init_ui() @@ -169,7 +170,7 @@ def update_data(self): ( organization.name, organization.key.get_secret_value(), - ACCOUNT_SOURCE_LABELS.get( + self.account_source_labels.get( organization.source, _("Unknown") ), ) @@ -216,9 +217,7 @@ def on_add(self, event): ( organization.name, organization.key.get_secret_value(), - ACCOUNT_SOURCE_LABELS.get( - organization.source, _("Unknown") - ), + self.account_.get(organization.source, _("Unknown")), ) ) dialog.Destroy() @@ -249,7 +248,9 @@ def on_edit(self, event): self.organization_list.SetStringItem( selected_item, 2, - ACCOUNT_SOURCE_LABELS.get(organization.source, _("Unknown")), + self.account_source_labels.get( + organization.source, _("Unknown") + ), ) dialog.Destroy() self.organization_list.SetItemState( @@ -443,6 +444,7 @@ class AccountDialog(wx.Dialog): def __init__(self, parent, title, size=(400, 400)): wx.Dialog.__init__(self, parent, title=title, size=size) + self.account_source_labels = get_account_source_labels() self.parent = parent self.init_ui() self.init_data() @@ -538,7 +540,9 @@ def update_data(self): account.name, account.provider.name, self._get_organization_name(account), - ACCOUNT_SOURCE_LABELS.get(account.source, _("Unknown")), + self.account_source_labels.get( + account.source, _("Unknown") + ), ) ) @@ -584,7 +588,9 @@ def on_add(self, event): account.name, account.provider.name, self._get_organization_name(account), - ACCOUNT_SOURCE_LABELS.get(account.source, _("Unknown")), + self.account_source_labels.get( + account.source, _("Unknown") + ), ) ) dialog.Destroy() @@ -619,7 +625,7 @@ def on_edit(self, event): self.account_list.SetStringItem( index, 3, - ACCOUNT_SOURCE_LABELS.get(account.source, _("Unknown")), + self.account_source_labels.get(account.source, _("Unknown")), ) dialog.Destroy() self.account_list.SetItemState(