Merge pull request #2055 from YunoHost/not-totally-free-rework

Enh: support for not totally free packages
This commit is contained in:
Alexandre Aubin 2024-02-27 20:00:14 +01:00 committed by GitHub
commit 7f8d32b3a5
5 changed files with 14 additions and 4 deletions

View file

@ -359,7 +359,7 @@ License: {license}
Description: {description} Description: {description}
- [ ] Confirm app is self-hostable and generally makes sense to possibly integrate in YunoHost - [ ] Confirm app is self-hostable and generally makes sense to possibly integrate in YunoHost
- [ ] Confirm app's license is opensource/free software (or not-totally-free, case by case TBD) - [ ] Confirm app's license is opensource/free software (or not-totally-free-upstream, case by case TBD)
- [ ] Description describes clearly and concisely what the app is/does - [ ] Description describes clearly and concisely what the app is/does
""" """

View file

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PROJECT VERSION\n" "Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2024-02-26 22:14+0100\n" "POT-Creation-Date: 2024-02-27 19:41+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -207,7 +207,7 @@ msgstr ""
#: templates/app.html:139 #: templates/app.html:139
#, python-format #, python-format
msgid "License: %(license)s" msgid "App license: %(license)s"
msgstr "" msgstr ""
#: templates/app.html:140 #: templates/app.html:140
@ -230,6 +230,10 @@ msgstr ""
msgid "YunoHost package repository" msgid "YunoHost package repository"
msgstr "" msgstr ""
#: templates/app.html:145
msgid "YunoHost package license"
msgstr ""
#: templates/base.html:5 #: templates/base.html:5
msgid "YunoHost app store" msgid "YunoHost app store"
msgstr "" msgstr ""

View file

@ -136,12 +136,13 @@
<h2 class="text-xl mb-2 font-semibold">{{ _("Useful links") }}</h2> <h2 class="text-xl mb-2 font-semibold">{{ _("Useful links") }}</h2>
<div> <div>
{% set upstream = infos["manifest"]["upstream"] %} {% set upstream = infos["manifest"]["upstream"] %}
<a class="block btn btn-link my-1" href="https://spdx.org/licenses/{{upstream.license}}" target="_blank"><i class="fa fa-institution fa-fw" aria-hidden="true"></i> {{ _("License: %(license)s", license=upstream.license) }}</a> <a class="block btn btn-link my-1" href="https://spdx.org/licenses/{{upstream.license}}" target="_blank"><i class="fa fa-institution fa-fw" aria-hidden="true"></i> {{ _("App license: %(license)s", license=upstream.license) }}</a>
{% if upstream.website %}<a class="block btn btn-link my-1" href="{{ upstream.website }}" target="_blank"><i class="fa fa-globe fa-fw" aria-hidden="true"></i> {{ _(" Official website") }}</a>{% endif %} {% if upstream.website %}<a class="block btn btn-link my-1" href="{{ upstream.website }}" target="_blank"><i class="fa fa-globe fa-fw" aria-hidden="true"></i> {{ _(" Official website") }}</a>{% endif %}
{% if upstream.admindoc %}<a class="block btn btn-link my-1" href="{{ upstream.admindoc }}" target="_blank"><i class="fa fa-book fa-fw" aria-hidden="true"></i> {{ _("Official admin documentation") }}</a>{% endif %} {% if upstream.admindoc %}<a class="block btn btn-link my-1" href="{{ upstream.admindoc }}" target="_blank"><i class="fa fa-book fa-fw" aria-hidden="true"></i> {{ _("Official admin documentation") }}</a>{% endif %}
{% if upstream.userdoc %}<a class="block btn btn-link my-1" href="{{ upstream.userdoc }}" target="_blank"><i class="fa fa-book fa-fw" aria-hidden="true"></i> {{ _("Official user documentation") }}</a>{% endif %} {% if upstream.userdoc %}<a class="block btn btn-link my-1" href="{{ upstream.userdoc }}" target="_blank"><i class="fa fa-book fa-fw" aria-hidden="true"></i> {{ _("Official user documentation") }}</a>{% endif %}
{% if upstream.code %}<a class="block btn btn-link my-1" href="{{ upstream.code }}" target="_blank"><i class="fa fa-code fa-fw" aria-hidden="true"></i> {{ _("Official code repository") }}</a>{% endif %} {% if upstream.code %}<a class="block btn btn-link my-1" href="{{ upstream.code }}" target="_blank"><i class="fa fa-code fa-fw" aria-hidden="true"></i> {{ _("Official code repository") }}</a>{% endif %}
<a class="block btn btn-link my-1" href="{{ infos["git"]["url"] }}" target="_blank"><i class="fa fa-code fa-fw" aria-hidden="true"></i> {{ _("YunoHost package repository") }}</a> <a class="block btn btn-link my-1" href="{{ infos["git"]["url"] }}" target="_blank"><i class="fa fa-code fa-fw" aria-hidden="true"></i> {{ _("YunoHost package repository") }}</a>
<a class="block btn btn-link my-1" href="{{ infos["git"]["url"]/blob/master/LICENSE }}" target="_blank"><i class="fa fa-institution fa-fw" aria-hidden="true"></i> {{ _("YunoHost package license") }}</a>
</div> </div>
</div> </div>
{% endblock %} {% endblock %}

View file

@ -264,6 +264,11 @@ msgstr "Dépôt de code officiel"
msgid "YunoHost package repository" msgid "YunoHost package repository"
msgstr "Dépôt de code du paquet YunoHost" msgstr "Dépôt de code du paquet YunoHost"
#: templates/app.html:145
#, fuzzy
msgid "YunoHost package license"
msgstr "License du paquet YunoHost"
#: templates/base.html:5 #: templates/base.html:5
msgid "YunoHost app store" msgid "YunoHost app store"
msgstr "Store d'apps de YunoHost" msgstr "Store d'apps de YunoHost"