Skip to content

Commit 0ad848d

Browse files
authored
Discourage deletion, encourage yanking (#8857)
1 parent 02fb320 commit 0ad848d

File tree

3 files changed

+40
-31
lines changed

3 files changed

+40
-31
lines changed

warehouse/locale/messages.pot

Lines changed: 34 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -305,9 +305,9 @@ msgstr ""
305305
#: warehouse/templates/manage/account/webauthn-provision.html:53
306306
#: warehouse/templates/manage/account/webauthn-provision.html:74
307307
#: warehouse/templates/manage/release.html:119
308-
#: warehouse/templates/manage/release.html:173
309-
#: warehouse/templates/manage/releases.html:138
310-
#: warehouse/templates/manage/releases.html:171
308+
#: warehouse/templates/manage/release.html:175
309+
#: warehouse/templates/manage/releases.html:140
310+
#: warehouse/templates/manage/releases.html:173
311311
#: warehouse/templates/packaging/detail.html:312
312312
#: warehouse/templates/pages/classifiers.html:25
313313
#: warehouse/templates/pages/help.html:20
@@ -1453,7 +1453,7 @@ msgstr ""
14531453
#: warehouse/templates/manage/manage_base.html:94
14541454
#: warehouse/templates/manage/manage_base.html:96
14551455
#: warehouse/templates/manage/release.html:118
1456-
#: warehouse/templates/manage/releases.html:170
1456+
#: warehouse/templates/manage/releases.html:172
14571457
#: warehouse/templates/manage/roles.html:24
14581458
#: warehouse/templates/manage/settings.html:70
14591459
#: warehouse/templates/search/results.html:199
@@ -2690,7 +2690,7 @@ msgid "No files found"
26902690
msgstr ""
26912691

26922692
#: warehouse/templates/manage/release.html:118
2693-
#: warehouse/templates/manage/releases.html:170
2693+
#: warehouse/templates/manage/releases.html:172
26942694
#: warehouse/templates/manage/roles.html:24
26952695
#: warehouse/templates/manage/settings.html:70
26962696
msgid "Dismiss"
@@ -2770,16 +2770,16 @@ msgid "Reason (optional)"
27702770
msgstr ""
27712771

27722772
#: warehouse/templates/manage/release.html:156
2773-
#: warehouse/templates/manage/release.html:178
2773+
#: warehouse/templates/manage/release.html:177
27742774
#: warehouse/templates/manage/releases.html:23
27752775
#: warehouse/templates/manage/releases.html:120
27762776
#: warehouse/templates/manage/releases.html:133
2777-
#: warehouse/templates/manage/releases.html:140
2777+
#: warehouse/templates/manage/releases.html:142
27782778
msgid "Version"
27792779
msgstr ""
27802780

27812781
#: warehouse/templates/manage/release.html:161
2782-
#: warehouse/templates/manage/release.html:178
2782+
#: warehouse/templates/manage/release.html:177
27832783
#: warehouse/templates/manage/releases.html:136
27842784
msgid "Delete release"
27852785
msgstr ""
@@ -2804,11 +2804,28 @@ msgid "Deleting will irreversibly delete this release."
28042804
msgstr ""
28052805

28062806
#: warehouse/templates/manage/release.html:173
2807+
#: warehouse/templates/manage/releases.html:138
28072808
msgid ""
28082809
"You will not be able to re-upload a new distribution of the same type "
2809-
"with the same version number. Consider yanking this release, making a new"
2810-
" release, or a <a href=\"https://www.python.org/dev/peps/pep-0440/#post-"
2811-
"releases\">post release</a> instead."
2810+
"with the same version number."
2811+
msgstr ""
2812+
2813+
#: warehouse/templates/manage/release.html:174
2814+
#: warehouse/templates/manage/releases.html:139
2815+
msgid ""
2816+
"Deletion will break any downstream projects relying on a pinned version "
2817+
"of this package. It is intended as a last resort to address legal issues "
2818+
"or remove harmful releases."
2819+
msgstr ""
2820+
2821+
#: warehouse/templates/manage/release.html:175
2822+
#: warehouse/templates/manage/releases.html:140
2823+
#, python-format
2824+
msgid ""
2825+
"Consider <a href=\"%(yank_href)s\" title=\"%(title)s\" target=\"_blank\" "
2826+
"rel=\"noopener\">yanking</a> this release, making a new release or a <a "
2827+
"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" "
2828+
"rel=\"noopener\">post release</a> instead."
28122829
msgstr ""
28132830

28142831
#: warehouse/templates/manage/releases.html:20
@@ -2884,39 +2901,30 @@ msgid ""
28842901
" "
28852902
msgstr ""
28862903

2887-
#: warehouse/templates/manage/releases.html:138
2888-
#, python-format
2889-
msgid ""
2890-
"You will not be able to re-upload a new distribution of the same type "
2891-
"with the same version number. Consider yanking this release, making a new"
2892-
" release or a <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" "
2893-
"rel=\"noopener\">post release</a> instead."
2894-
msgstr ""
2895-
2896-
#: warehouse/templates/manage/releases.html:149
2904+
#: warehouse/templates/manage/releases.html:151
28972905
#, python-format
28982906
msgid "Manage '%(project_name)s' releases"
28992907
msgstr ""
29002908

2901-
#: warehouse/templates/manage/releases.html:154
2909+
#: warehouse/templates/manage/releases.html:156
29022910
#, python-format
29032911
msgid "Releases (%(release_count)s)"
29042912
msgstr ""
29052913

2906-
#: warehouse/templates/manage/releases.html:160
2914+
#: warehouse/templates/manage/releases.html:162
29072915
#, python-format
29082916
msgid "Yanked Releases (%(release_count)s)"
29092917
msgstr ""
29102918

2911-
#: warehouse/templates/manage/releases.html:166
2919+
#: warehouse/templates/manage/releases.html:168
29122920
msgid "Creating a new release"
29132921
msgstr ""
29142922

2915-
#: warehouse/templates/manage/releases.html:168
2923+
#: warehouse/templates/manage/releases.html:170
29162924
msgid "No releases found"
29172925
msgstr ""
29182926

2919-
#: warehouse/templates/manage/releases.html:171
2927+
#: warehouse/templates/manage/releases.html:173
29202928
#, python-format
29212929
msgid ""
29222930
"Learn how to create a new release on the <a href=\"%(href)s\" "

warehouse/templates/manage/release.html

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,10 +170,9 @@ <h3>{% trans %}Delete release{% endtrans %}</h3>
170170
{% else %}
171171
{% trans %}Deleting will irreversibly delete this release.{% endtrans %}
172172
{% endif %}
173-
{% trans trimmed href='https://www.python.org/dev/peps/pep-0440/#post-releases', title=gettext('External link') %}
174-
You will not be able to re-upload a new distribution of the same type with the same version number.
175-
Consider yanking this release, making a new release, or a <a href="https://www.python.org/dev/peps/pep-0440/#post-releases">post release</a> instead.
176-
{% endtrans %}
173+
<p>{% trans %}You will not be able to re-upload a new distribution of the same type with the same version number.{% endtrans %}</p>
174+
<p>{% trans %}Deletion will break any downstream projects relying on a pinned version of this package. It is intended as a last resort to address legal issues or remove harmful releases.{% endtrans %}</p>
175+
<p>{% trans yank_href=request.help_url(_anchor='yanked'), post_href='https://www.python.org/dev/peps/pep-0440/#post-releases', title=gettext('External link') %}Consider <a href="{{ yank_href }}" title="{{ title }}" target="_blank" rel="noopener">yanking</a> this release, making a new release or a <a href="{{ href }}" title="{{ title }}" target="_blank" rel="noopener">post release</a> instead.{% endtrans %}</p>
177176
</p>
178177
{{ confirm_button(gettext("Delete release"), gettext("Version"), "delete_version", release.version) }}
179178
</div>

warehouse/templates/manage/releases.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,9 @@
135135
{% set slug = 'delete_release-modal-{}'.format(loop.index) %}
136136
{% set title = gettext("Delete release") %}
137137
{% set custom_warning_text %}
138-
<p>{% trans href='https://www.python.org/dev/peps/pep-0440/#post-releases', title=gettext('External link') %}You will not be able to re-upload a new distribution of the same type with the same version number. Consider yanking this release, making a new release or a <a href="{{ href }}" title="{{ title }}" target="_blank" rel="noopener">post release</a> instead.{% endtrans %}</p>
138+
<p>{% trans %}You will not be able to re-upload a new distribution of the same type with the same version number.{% endtrans %}</p>
139+
<p>{% trans %}Deletion will break any downstream projects relying on a pinned version of this package. It is intended as a last resort to address legal issues or remove harmful releases.{% endtrans %}</p>
140+
<p>{% trans yank_href=request.help_url(_anchor='yanked'), post_href='https://www.python.org/dev/peps/pep-0440/#post-releases', title=gettext('External link') %}Consider <a href="{{ yank_href }}" title="{{ title }}" target="_blank" rel="noopener">yanking</a> this release, making a new release or a <a href="{{ href }}" title="{{ title }}" target="_blank" rel="noopener">post release</a> instead.{% endtrans %}</p>
139141
{% endset %}
140142
{{ confirm_modal(title, gettext('Version'), 'delete_version', release.version, slug, custom_warning_text=custom_warning_text, action=action) }}
141143
{% endif %}

0 commit comments

Comments
 (0)