stove/tiramisu
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: message error improvment

Browse source
This commit is contained in:
egarette@silique.fr 2025-01-04 17:39:25 +01:00
parent 4cba819e0a
commit 6181b728ad
3 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
tiramisu/option/domainnameoption.py
View file

@ -76,14 +76,20 @@ class DomainnameOption(StrOption):
regexp = r"((?!-)[a-z0-9-]{{{1},{0}}}\.){{{1},}}[a-z0-9-]{{1,{0}}}".format( regexp = r"((?!-)[a-z0-9-]{{{1},{0}}}\.){{{1},}}[a-z0-9-]{{1,{0}}}".format(
self._get_len(type), min_time self._get_len(type), min_time
) )
msg = _(
'must start with lowercase characters followed by lowercase characters, number, "-" and "." characters are allowed'
)
msg_warning = _(
'must start with lowercase characters followed by lowercase characters, number, "-" and "." characters are recommanded'
)
else: else:
regexp = r"((?!-)[a-z0-9-]{{1,{0}}})".format(self._get_len(type)) regexp = r"((?!-)[a-z0-9-]{{1,{0}}})".format(self._get_len(type))
msg = _( msg = _(
'must start with lowercase characters followed by lowercase characters, number, "-" and "." characters are allowed' 'must start with lowercase characters followed by lowercase characters, number and "-" characters are allowed'
) )
msg_warning = _( msg_warning = _(
'must start with lowercase characters followed by lowercase characters, number, "-" and "." characters are recommanded' 'must start with lowercase characters followed by lowercase characters, number and "-" characters are recommanded'
) )
if allow_ip: if allow_ip:
msg = _("could be a IP, otherwise {}").format(msg) msg = _("could be a IP, otherwise {}").format(msg)
msg_warning = _("could be a IP, otherwise {}").format(msg_warning) msg_warning = _("could be a IP, otherwise {}").format(msg_warning)

5
tiramisu/option/filenameoption.py
View file

@ -74,8 +74,9 @@ class FilenameOption(StrOption):
if not found and "directory" in types and file.is_dir(): if not found and "directory" in types and file.is_dir():
found = True found = True
if not found: if not found:
translated_types = [{"file": _("file"), "directory": _("directory")}.get(typ) for typ in types]
raise ValueError( raise ValueError(
_('cannot find {0} "{1}"').format( _('cannot find this {0}').format(
display_list(types, separator="or"), value display_list(translated_types, separator="or"), value
) )
) )

2
tiramisu/option/stroption.py
View file

@ -38,7 +38,7 @@ class StrOption(Option):
) -> None: ) -> None:
"""validation""" """validation"""
if not isinstance(value, str): if not isinstance(value, str):
raise ValueError() raise ValueError(_('which is not a string'))
class RegexpOption(StrOption): class RegexpOption(StrOption):