Skip to content

Commit 00615ce

Browse files
didomdfcoding
authored andcommitted
Remove 'add another token' form from token creation page (pypi#11260)
* Remove 'add another token' form from token creation page * Update translations
1 parent 689f1af commit 00615ce

File tree

2 files changed

+17
-19
lines changed

2 files changed

+17
-19
lines changed

warehouse/locale/messages.pot

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -946,8 +946,8 @@ msgstr ""
946946
#: warehouse/templates/manage/publishing.html:109
947947
#: warehouse/templates/manage/roles.html:170
948948
#: warehouse/templates/manage/roles.html:182
949-
#: warehouse/templates/manage/token.html:136
950-
#: warehouse/templates/manage/token.html:153
949+
#: warehouse/templates/manage/token.html:133
950+
#: warehouse/templates/manage/token.html:150
951951
#: warehouse/templates/re-auth.html:51
952952
msgid "(required)"
953953
msgstr ""
@@ -2043,7 +2043,7 @@ msgstr ""
20432043

20442044
#: warehouse/templates/manage/account.html:143
20452045
#: warehouse/templates/manage/account.html:435
2046-
#: warehouse/templates/manage/token.html:151
2046+
#: warehouse/templates/manage/token.html:148
20472047
msgid "Scope"
20482048
msgstr ""
20492049

@@ -2537,7 +2537,7 @@ msgid ""
25372537
msgstr ""
25382538

25392539
#: warehouse/templates/manage/account.html:714
2540-
#: warehouse/templates/manage/token.html:169
2540+
#: warehouse/templates/manage/token.html:166
25412541
msgid "Proceed with caution!"
25422542
msgstr ""
25432543

@@ -3779,7 +3779,7 @@ msgid "Permissions:"
37793779
msgstr ""
37803780

37813781
#: warehouse/templates/manage/token.html:40
3782-
#: warehouse/templates/manage/token.html:147
3782+
#: warehouse/templates/manage/token.html:144
37833783
msgid "Upload packages"
37843784
msgstr ""
37853785

@@ -3789,7 +3789,7 @@ msgid "Scope:"
37893789
msgstr ""
37903790

37913791
#: warehouse/templates/manage/token.html:42
3792-
#: warehouse/templates/manage/token.html:158
3792+
#: warehouse/templates/manage/token.html:155
37933793
msgid "Entire account (all projects)"
37943794
msgstr ""
37953795

@@ -3872,37 +3872,37 @@ msgid ""
38723872
"href=\"%(href)s\">visit the PyPI help page</a>."
38733873
msgstr ""
38743874

3875-
#: warehouse/templates/manage/token.html:127
3875+
#: warehouse/templates/manage/token.html:122
38763876
msgid "Add another token"
38773877
msgstr ""
38783878

3879-
#: warehouse/templates/manage/token.html:134
3879+
#: warehouse/templates/manage/token.html:131
38803880
msgid "Token name"
38813881
msgstr ""
38823882

3883-
#: warehouse/templates/manage/token.html:143
3883+
#: warehouse/templates/manage/token.html:140
38843884
msgid "What is this token for?"
38853885
msgstr ""
38863886

3887-
#: warehouse/templates/manage/token.html:146
3887+
#: warehouse/templates/manage/token.html:143
38883888
msgid "Permissions"
38893889
msgstr ""
38903890

3891-
#: warehouse/templates/manage/token.html:157
3891+
#: warehouse/templates/manage/token.html:154
38923892
msgid "Select scope..."
38933893
msgstr ""
38943894

3895-
#: warehouse/templates/manage/token.html:161
3895+
#: warehouse/templates/manage/token.html:158
38963896
msgid "Project:"
38973897
msgstr ""
38983898

3899-
#: warehouse/templates/manage/token.html:170
3899+
#: warehouse/templates/manage/token.html:167
39003900
msgid ""
39013901
"An API token scoped to your entire account will have upload permissions "
39023902
"for all of your current and future projects."
39033903
msgstr ""
39043904

3905-
#: warehouse/templates/manage/token.html:173
3905+
#: warehouse/templates/manage/token.html:170
39063906
msgid "Add token"
39073907
msgstr ""
39083908

warehouse/templates/manage/token.html

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -119,13 +119,10 @@ <h2>{% trans %}Using this token{% endtrans %}</h2>
119119
<p>{% trans href='/help#apitoken' %}For further instructions on how to use this token, <a href="{{ href }}">visit the PyPI help page</a>.{% endtrans %}</p>
120120
</section>
121121
<hr>
122-
{% endif %}
123-
122+
<a href="." class="button">{% trans %}Add another token{% endtrans %}</a>
123+
{% else %}
124124
{{ form_error_anchor(create_macaroon_form) }}
125125
<section id="add-token">
126-
{% if serialized_macaroon %}
127-
<h2>{% trans %}Add another token{% endtrans %}</h2>
128-
{% endif %}
129126
<form method="POST">
130127
<input type="hidden" name="csrf_token" value="{{ request.session.get_csrf_token() }}">
131128
{{ form_errors(create_macaroon_form) }}
@@ -174,4 +171,5 @@ <h3 class="callout-block__heading">{% trans %}Proceed with caution!{% endtrans %
174171
</div>
175172
</form>
176173
</section>
174+
{% endif %}
177175
{% endblock %}

0 commit comments

Comments
 (0)