Skip to content

Commit 101ce02

Browse files
committed
display License-Expression in project details if provided
1 parent 326bb61 commit 101ce02

File tree

2 files changed

+30
-9
lines changed

2 files changed

+30
-9
lines changed

warehouse/locale/messages.pot

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2970,14 +2970,14 @@ msgid "Meta"
29702970
msgstr ""
29712971

29722972
#: warehouse/templates/includes/packaging/project-data.html:164
2973-
#: warehouse/templates/includes/packaging/project-data.html:212
2974-
#: warehouse/templates/includes/packaging/project-data.html:218
2973+
#: warehouse/templates/includes/packaging/project-data.html:225
2974+
#: warehouse/templates/includes/packaging/project-data.html:231
29752975
msgid "Author:"
29762976
msgstr ""
29772977

29782978
#: warehouse/templates/includes/packaging/project-data.html:171
2979-
#: warehouse/templates/includes/packaging/project-data.html:225
2980-
#: warehouse/templates/includes/packaging/project-data.html:231
2979+
#: warehouse/templates/includes/packaging/project-data.html:238
2980+
#: warehouse/templates/includes/packaging/project-data.html:244
29812981
#: warehouse/templates/pages/help.html:620
29822982
msgid "Maintainer:"
29832983
msgstr ""
@@ -2991,22 +2991,30 @@ msgid "These details have <b>not</b> been verified by PyPI"
29912991
msgstr ""
29922992

29932993
#: warehouse/templates/includes/packaging/project-data.html:205
2994+
msgid "License Expression:"
2995+
msgstr ""
2996+
2997+
#: warehouse/templates/includes/packaging/project-data.html:210
2998+
msgid "License Expression"
2999+
msgstr ""
3000+
3001+
#: warehouse/templates/includes/packaging/project-data.html:218
29943002
msgid "License:"
29953003
msgstr ""
29963004

2997-
#: warehouse/templates/includes/packaging/project-data.html:239
3005+
#: warehouse/templates/includes/packaging/project-data.html:252
29983006
msgid "Tags"
29993007
msgstr ""
30003008

3001-
#: warehouse/templates/includes/packaging/project-data.html:251
3009+
#: warehouse/templates/includes/packaging/project-data.html:264
30023010
msgid "Requires:"
30033011
msgstr ""
30043012

3005-
#: warehouse/templates/includes/packaging/project-data.html:258
3013+
#: warehouse/templates/includes/packaging/project-data.html:271
30063014
msgid "Provides-Extra:"
30073015
msgstr ""
30083016

3009-
#: warehouse/templates/includes/packaging/project-data.html:268
3017+
#: warehouse/templates/includes/packaging/project-data.html:281
30103018
#: warehouse/templates/pages/classifiers.html:16
30113019
#: warehouse/templates/pages/classifiers.html:21
30123020
#: warehouse/templates/pages/sitemap.html:39

warehouse/templates/includes/packaging/project-data.html

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,20 @@ <h6>{% trans %}Project links{% endtrans %}</h6>
199199
<div class="sidebar-section unverified">
200200
<h6>{% trans %}Meta{% endtrans %}</h6>
201201
<ul>
202-
{% if license %}
202+
{% if release.license_expression %}
203+
<li>
204+
<span>
205+
<strong>{% trans %}License Expression:{% endtrans %}</strong> {{ release.license_expression }}
206+
<br>
207+
<small>
208+
<i>
209+
<a target="_blank" href="https://spdx.org/licenses/">SPDX</a>
210+
<a target="_blank" href="https://spdx.github.io/spdx-spec/v2-draft/SPDX-license-expressions/">{% trans %}License Expression{% endtrans %}</a>
211+
</i>
212+
</small>
213+
</span>
214+
</li>
215+
{% elif license %}
203216
<li>
204217
<span>
205218
<strong>{% trans %}License:{% endtrans %}</strong> {{ license }}

0 commit comments

Comments
 (0)