Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enh: support for not totally free packages #2055

Merged
merged 11 commits into from
Feb 27, 2024
9 changes: 8 additions & 1 deletion antifeatures.toml
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,18 @@ description.en = "Early development stage. May contain changing or unstable feat
description.fr = "Le logiciel est au tout début de son développement. Il pourrait contenir des fonctionnalités changeantes ou instables, des bugs, et des failles de sécurité."
description.it = "Questo software è all’inizio della sua fase di sviluppo. Potrebbe dunque essere instabile, contenere bug e vulnerabilità di sicurezza."

[not-totally-free]
[not-totally-free-upstream]
icon = "lock"
title.en = "Not totally free upstream"
title.fr = "Application sous licence libre restreinte"
title.it = "Applicazione con licenza parzialmente libera"
description.en = "The packaged app is under an overall free licence, but with clauses that restrict its use."
description.fr = "L'application packagée est sous une licence globalement libre, mais avec des clauses qui pourraient restreindre son utilisation."
description.it = "Quest’applicazione è protetta da licenza generalmente libera, ma con delle clausole che potrebbero limitare il suo utilizzo."

[not-totally-free-package]
icon = "archive"
title.en = "Not totally free package"
title.fr = "Package sous licence libre restreinte"
description.en = "The package that installs this app is under an overall free licence, but with clauses that restrict its use."
description.fr = "Le package d'installation de cette application est sous une licence globalement libre, mais avec des clauses qui pourraient restreindre son utilisation."
18 changes: 9 additions & 9 deletions apps.toml
Original file line number Diff line number Diff line change
Expand Up @@ -774,15 +774,15 @@ state = "working"
url = "https://github.com/YunoHost-Apps/elabftw_ynh"

[elasticsearch7]
antifeatures = [ "not-totally-free" ]
antifeatures = [ "not-totally-free-upstream" ]
category = "dev"
level = 6
state = "working"
subtags = [ "programming" ]
url = "https://github.com/YunoHost-Apps/elasticsearch7_ynh"

[elasticsearch8]
antifeatures = [ "not-totally-free" ]
antifeatures = [ "not-totally-free-upstream" ]
category = "dev"
level = 8
state = "working"
Expand Down Expand Up @@ -1038,7 +1038,7 @@ state = "working"
url = "https://github.com/YunoHost-Apps/framagames_ynh"

[freescout]
antifeatures = [ "not-totally-free" ]
antifeatures = [ "not-totally-free-upstream" ]
category = "productivity_and_management"
level = 6
potential_alternative_to = [ "Zendesk" ]
Expand Down Expand Up @@ -1209,7 +1209,7 @@ state = "working"
url = "https://github.com/YunoHost-Apps/gotify_ynh"

[gotosocial]
antifeatures = [ "alpha-software" ]
antifeatures = [ "alpha-software", "not-totally-free-package" ]
category = "social_media"
level = 7
potential_alternative_to = [ "X", "Threads", "Mastodon", "Pleroma", "Akkoma", "Misskey", "Calckey" ]
Expand Down Expand Up @@ -2172,7 +2172,7 @@ subtags = [ "task" ]
url = "https://github.com/YunoHost-Apps/mytinytodo_ynh"

[n8n]
antifeatures = [ "not-totally-free" ]
antifeatures = [ "not-totally-free-upstream" ]
category = "iot"
level = 6
state = "working"
Expand Down Expand Up @@ -2366,7 +2366,7 @@ state = "working"
url = "https://github.com/YunoHost-Apps/osticket_ynh"

[outline]
antifeatures = [ "not-totally-free" ]
antifeatures = [ "not-totally-free-upstream" ]
category = "publishing"
level = 8
state = "working"
Expand Down Expand Up @@ -2445,7 +2445,7 @@ subtags = [ "videos" ]
url = "https://github.com/YunoHost-Apps/peertube_ynh"

[peertube-search-index]
antifeatures = [ "not-totally-free" ]
antifeatures = [ "not-totally-free-upstream" ]
category = "social_media"
level = 6
state = "working"
Expand Down Expand Up @@ -2894,7 +2894,7 @@ subtags = [ "network" ]
url = "https://github.com/YunoHost-Apps/reverseproxy_ynh"

[rocketchat]
antifeatures = [ "not-totally-free" ]
antifeatures = [ "not-totally-free-upstream" ]
category = "communication"
level = 8
potential_alternative_to = [ "Slack" ]
Expand Down Expand Up @@ -3762,7 +3762,7 @@ state = "working"
url = "https://github.com/YunoHost-Apps/zeronet_ynh"

[zerotier]
antifeatures = [ "not-totally-free", "non-free-network" ]
antifeatures = [ "not-totally-free-upstream", "non-free-network" ]
category = "system_tools"
level = 6
state = "working"
Expand Down
3 changes: 2 additions & 1 deletion store/templates/app.html
Original file line number Diff line number Diff line change
Expand Up @@ -136,12 +136,13 @@ <h2 class="inline-block text-xl mb-2 font-semibold">{{ _("Anti-features") }}</h2
<h2 class="text-xl mb-2 font-semibold">{{ _("Useful links") }}</h2>
<div>
{% 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.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.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"]/blob/master/LICENSE }}" target="_blank"><i class="fa fa-institution fa-fw" aria-hidden="true"></i> {{ _("YunoHost package license") }}</a>
</div>
</div>
{% endblock %}
Binary file modified store/translations/fr/LC_MESSAGES/messages.mo
Binary file not shown.
13 changes: 9 additions & 4 deletions store/translations/fr/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2024-02-19 02:25+0100\n"
"POT-Creation-Date: 2024-02-25 03:45+0100\n"
"PO-Revision-Date: 2023-09-05 19:50+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: fr\n"
Expand Down Expand Up @@ -243,9 +243,9 @@ msgid "Useful links"
msgstr "Liens utiles"

#: templates/app.html:139
#, python-format
msgid "License: %(license)s"
msgstr "Licence: %(license)s"
#, fuzzy, python-format
msgid "App license: %(license)s"
msgstr "Licence de l'app : %(license)s"

#: templates/app.html:140
msgid " Official website"
Expand All @@ -267,6 +267,11 @@ msgstr "Dépôt de code officiel"
msgid "YunoHost package repository"
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
msgid "YunoHost app store"
msgstr "Store d'apps de YunoHost"
Expand Down
Loading