From 0d2432ecc185d61820a0feecb2d0ef3a0af6f339 Mon Sep 17 00:00:00 2001 From: Olivier Gayot Date: Thu, 23 Jun 2022 12:59:51 +0200 Subject: [PATCH 1/2] identity: add leading capital letter to error messages Signed-off-by: Olivier Gayot --- subiquity/ui/views/filesystem/lvm.py | 2 +- subiquity/ui/views/identity.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/subiquity/ui/views/filesystem/lvm.py b/subiquity/ui/views/filesystem/lvm.py index 80de49ac..f24bc0fe 100644 --- a/subiquity/ui/views/filesystem/lvm.py +++ b/subiquity/ui/views/filesystem/lvm.py @@ -83,7 +83,7 @@ class VolGroupForm(CompoundDiskForm): self.deleted_vg_names = deleted_vg_names super().__init__(model, possible_components, initial) connect_signal(self.encrypt.widget, 'change', self._change_encrypt) - setup_password_validation(self, _("passphrases")) + setup_password_validation(self, _("Passphrases")) self._change_encrypt(None, self.encrypt.value) name = VGNameField(_("Name:")) diff --git a/subiquity/ui/views/identity.py b/subiquity/ui/views/identity.py index 3860e2ea..115152fe 100644 --- a/subiquity/ui/views/identity.py +++ b/subiquity/ui/views/identity.py @@ -191,7 +191,7 @@ def setup_password_validation(form, desc): password = form.password.value if not password.startswith(new_text): form.confirm_password.show_extra( - # desc is "passwords" or "passphrases" + # desc is "Passwords" or "Passphrases" ("info_error", _("{desc} do not match").format(desc=desc))) else: form.confirm_password.show_extra('') @@ -229,7 +229,7 @@ class IdentityView(BaseView): self.form = IdentityForm(controller, initial) connect_signal(self.form, 'submit', self.done) - setup_password_validation(self.form, _("passwords")) + setup_password_validation(self.form, _("Passwords")) super().__init__( screen( From bb49114b043c8f78a1473fe96d81a9f782d38efb Mon Sep 17 00:00:00 2001 From: Olivier Gayot Date: Thu, 23 Jun 2022 13:11:53 +0200 Subject: [PATCH 2/2] filesystem: use "passphrases" instead of "passwords" in error messages Signed-off-by: Olivier Gayot --- subiquity/ui/views/filesystem/guided.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/subiquity/ui/views/filesystem/guided.py b/subiquity/ui/views/filesystem/guided.py index b5d825c4..4a087999 100644 --- a/subiquity/ui/views/filesystem/guided.py +++ b/subiquity/ui/views/filesystem/guided.py @@ -64,11 +64,11 @@ class LUKSOptionsForm(SubForm): def validate_password(self): if len(self.password.value) < 1: - return _("Password must be set") + return _("Passphrase must be set") def validate_confirm_password(self): if self.password.value != self.confirm_password.value: - return _("Passwords do not match") + return _("Passphrases do not match") class LVMOptionsForm(SubForm):