core, frontends: fix invalid translatable strings.

Some f-strings where used in translatable text, this has been fixed by using explicit
`format()` call (using a script based on `tokenize`).

As tokenize messes with spaces, a reformating tool (`black`) has been applied to some
files afterwards.
This commit is contained in:
Goffi 2021-06-14 18:35:12 +02:00
commit 7adbf3ead8

View file

@ -22,23 +22,31 @@
from . import base
from sat.core.i18n import _
from .constants import Const as C
__commands__ = ["Param"]
class Get(base.CommandBase):
def __init__(self, host):
super(Get, self).__init__(
host, 'get', need_connect=False, help=_('get a parameter value'))
host, "get", need_connect=False, help=_("get a parameter value")
)
def add_parser_options(self):
self.parser.add_argument(
"category", nargs='?', help=_("category of the parameter"))
self.parser.add_argument("name", nargs='?', help=_("name of the parameter"))
"category", nargs="?", help=_("category of the parameter")
)
self.parser.add_argument("name", nargs="?", help=_("name of the parameter"))
self.parser.add_argument(
"-a", "--attribute", type=str, default="value",
help=_("name of the attribute to get"))
"-a",
"--attribute",
type=str,
default="value",
help=_("name of the attribute to get"),
)
self.parser.add_argument(
"--security-limit", type=int, default=-1, help=_("security limit"))
"--security-limit", type=int, default=-1, help=_("security limit")
)
async def start(self):
if self.args.category is None:
@ -47,9 +55,12 @@ class Get(base.CommandBase):
elif self.args.name is None:
try:
values_dict = await self.host.bridge.asyncGetParamsValuesFromCategory(
self.args.category, self.args.security_limit, "", "", self.profile)
self.args.category, self.args.security_limit, "", "", self.profile
)
except Exception as e:
self.disp(_(f"can't find requested parameters: {e}"), error=True)
self.disp(
_("can't find requested parameters: {e}").format(e=e), error=True
)
self.host.quit(C.EXIT_NOT_FOUND)
else:
for name, value in values_dict.items():
@ -57,10 +68,16 @@ class Get(base.CommandBase):
else:
try:
value = await self.host.bridge.asyncGetParamA(
self.args.name, self.args.category, self.args.attribute,
self.args.security_limit, self.profile)
self.args.name,
self.args.category,
self.args.attribute,
self.args.security_limit,
self.profile,
)
except Exception as e:
self.disp(_(f"can't find requested parameter: {e}"), error=True)
self.disp(
_("can't find requested parameter: {e}").format(e=e), error=True
)
self.host.quit(C.EXIT_NOT_FOUND)
else:
print(value)
@ -69,21 +86,29 @@ class Get(base.CommandBase):
class Set(base.CommandBase):
def __init__(self, host):
super(Set, self).__init__(host, 'set', need_connect=False, help=_('set a parameter value'))
super(Set, self).__init__(
host, "set", need_connect=False, help=_("set a parameter value")
)
def add_parser_options(self):
self.parser.add_argument("category", help=_("category of the parameter"))
self.parser.add_argument("name", help=_("name of the parameter"))
self.parser.add_argument("value", help=_("name of the parameter"))
self.parser.add_argument("--security-limit", type=int, default=-1, help=_("security limit"))
self.parser.add_argument(
"--security-limit", type=int, default=-1, help=_("security limit")
)
async def start(self):
try:
await self.host.bridge.setParam(
self.args.name, self.args.value, self.args.category,
self.args.security_limit, self.profile)
self.args.name,
self.args.value,
self.args.category,
self.args.security_limit,
self.profile,
)
except Exception as e:
self.disp(_(f"can't set requested parameter: {e}"), error=True)
self.disp(_("can't set requested parameter: {e}").format(e=e), error=True)
self.host.quit(C.EXIT_BRIDGE_ERRBACK)
else:
self.host.quit()
@ -94,8 +119,11 @@ class SaveTemplate(base.CommandBase):
def __init__(self, host):
super(SaveTemplate, self).__init__(
host, 'save', use_profile=False,
help=_('save parameters template to xml file'))
host,
"save",
use_profile=False,
help=_("save parameters template to xml file"),
)
def add_parser_options(self):
self.parser.add_argument("filename", type=str, help=_("output file"))
@ -105,10 +133,14 @@ class SaveTemplate(base.CommandBase):
try:
await self.host.bridge.saveParamsTemplate(self.args.filename)
except Exception as e:
self.disp(_(f"can't save parameters to file: {e}"), error=True)
self.disp(_("can't save parameters to file: {e}").format(e=e), error=True)
self.host.quit(C.EXIT_BRIDGE_ERRBACK)
else:
self.disp(_(f"parameters saved to file {self.args.filename}"))
self.disp(
_("parameters saved to file {filename}").format(
filename=self.args.filename
)
)
self.host.quit()
@ -117,8 +149,11 @@ class LoadTemplate(base.CommandBase):
def __init__(self, host):
super(LoadTemplate, self).__init__(
host, 'load', use_profile=False,
help=_('load parameters template from xml file'))
host,
"load",
use_profile=False,
help=_("load parameters template from xml file"),
)
def add_parser_options(self):
self.parser.add_argument("filename", type=str, help=_("input file"))
@ -128,10 +163,14 @@ class LoadTemplate(base.CommandBase):
try:
self.host.bridge.loadParamsTemplate(self.args.filename)
except Exception as e:
self.disp(_(f"can't load parameters from file: {e}"), error=True)
self.disp(_("can't load parameters from file: {e}").format(e=e), error=True)
self.host.quit(C.EXIT_BRIDGE_ERRBACK)
else:
self.disp(_(f"parameters loaded from file {self.args.filename}"))
self.disp(
_("parameters loaded from file {filename}").format(
filename=self.args.filename
)
)
self.host.quit()
@ -139,4 +178,6 @@ class Param(base.CommandBase):
subcommands = (Get, Set, SaveTemplate, LoadTemplate)
def __init__(self, host):
super(Param, self).__init__(host, 'param', use_profile=False, help=_('Save/load parameters template'))
super(Param, self).__init__(
host, "param", use_profile=False, help=_("Save/load parameters template")
)