From e1f104025a23306cdbb0c4b2b767a6220e3217cd Mon Sep 17 00:00:00 2001 From: William Woodruff Date: Mon, 12 Feb 2024 12:56:36 -0500 Subject: [PATCH 1/3] oidc/forms: improve project exists error Signed-off-by: William Woodruff Co-authored-by: Alex Cameron --- warehouse/locale/messages.pot | 6 +++--- warehouse/oidc/forms/_core.py | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/warehouse/locale/messages.pot b/warehouse/locale/messages.pot index b747e5f52ecf..5b75f77ea049 100644 --- a/warehouse/locale/messages.pot +++ b/warehouse/locale/messages.pot @@ -570,14 +570,14 @@ msgid "Invalid project name" msgstr "" #: warehouse/oidc/forms/_core.py:35 -msgid "This project name is already in use" +msgid "This project already exists, create an ordinary Trusted Publisher instead" msgstr "" -#: warehouse/oidc/forms/_core.py:44 +#: warehouse/oidc/forms/_core.py:46 msgid "Specify a publisher ID" msgstr "" -#: warehouse/oidc/forms/_core.py:45 +#: warehouse/oidc/forms/_core.py:47 msgid "Publisher must be specified by ID" msgstr "" diff --git a/warehouse/oidc/forms/_core.py b/warehouse/oidc/forms/_core.py index ce7659232122..75bb735f5395 100644 --- a/warehouse/oidc/forms/_core.py +++ b/warehouse/oidc/forms/_core.py @@ -32,7 +32,9 @@ def validate_project_name(self, field): if project_name in self._project_factory: raise wtforms.validators.ValidationError( - _("This project name is already in use") + _( + "This project already exists, create an ordinary Trusted Publisher instead" + ) ) From 47803f7bef22a9ddd22cfc1597325a5e0be6e93a Mon Sep 17 00:00:00 2001 From: Dustin Ingram Date: Mon, 12 Feb 2024 13:01:23 -0500 Subject: [PATCH 2/3] Update warehouse/oidc/forms/_core.py --- warehouse/oidc/forms/_core.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/warehouse/oidc/forms/_core.py b/warehouse/oidc/forms/_core.py index 75bb735f5395..e44ad59d4764 100644 --- a/warehouse/oidc/forms/_core.py +++ b/warehouse/oidc/forms/_core.py @@ -33,7 +33,8 @@ def validate_project_name(self, field): if project_name in self._project_factory: raise wtforms.validators.ValidationError( _( - "This project already exists, create an ordinary Trusted Publisher instead" + "This project already exists, create an ordinary Trusted " + "Publisher instead" ) ) From 014c6095e1f3235f04a7b9387c22baf1ac40de17 Mon Sep 17 00:00:00 2001 From: William Woodruff Date: Mon, 12 Feb 2024 13:03:07 -0500 Subject: [PATCH 3/3] `make translations` Signed-off-by: William Woodruff --- warehouse/locale/messages.pot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/warehouse/locale/messages.pot b/warehouse/locale/messages.pot index 5b75f77ea049..567b190f9bea 100644 --- a/warehouse/locale/messages.pot +++ b/warehouse/locale/messages.pot @@ -573,11 +573,11 @@ msgstr "" msgid "This project already exists, create an ordinary Trusted Publisher instead" msgstr "" -#: warehouse/oidc/forms/_core.py:46 +#: warehouse/oidc/forms/_core.py:47 msgid "Specify a publisher ID" msgstr "" -#: warehouse/oidc/forms/_core.py:47 +#: warehouse/oidc/forms/_core.py:48 msgid "Publisher must be specified by ID" msgstr ""