diff --git a/antifeatures.toml b/antifeatures.toml index 659df696..7872463b 100644 --- a/antifeatures.toml +++ b/antifeatures.toml @@ -106,7 +106,7 @@ 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" @@ -114,3 +114,10 @@ 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." diff --git a/apps.toml b/apps.toml index 79943a9c..5d37b5e3 100644 --- a/apps.toml +++ b/apps.toml @@ -232,7 +232,7 @@ url = "https://github.com/YunoHost-Apps/bookstack_ynh" [bookwyrm] category = "social_media" -antifeatures = [ "not-totally-free" ] +antifeatures = [ "not-totally-free-upstream" ] level = 8 potential_alternative_to = [ "Goodreads" ] state = "working" @@ -770,7 +770,7 @@ 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" @@ -778,7 +778,7 @@ 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" @@ -1033,7 +1033,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" ] @@ -1204,7 +1204,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" ] @@ -2165,7 +2165,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" @@ -2358,7 +2358,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" @@ -2437,7 +2437,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" @@ -2887,7 +2887,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" ] @@ -3754,7 +3754,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" diff --git a/store/app.py b/store/app.py index dc1d395f..f5689fd9 100644 --- a/store/app.py +++ b/store/app.py @@ -359,7 +359,7 @@ License: {license} Description: {description} - [ ] 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 """ diff --git a/store/messages.pot b/store/messages.pot index 16d62a61..824a5767 100644 --- a/store/messages.pot +++ b/store/messages.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\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" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -207,7 +207,7 @@ msgstr "" #: templates/app.html:139 #, python-format -msgid "License: %(license)s" +msgid "App license: %(license)s" msgstr "" #: templates/app.html:140 @@ -230,6 +230,10 @@ msgstr "" msgid "YunoHost package repository" msgstr "" +#: templates/app.html:145 +msgid "YunoHost package license" +msgstr "" + #: templates/base.html:5 msgid "YunoHost app store" msgstr "" diff --git a/store/templates/app.html b/store/templates/app.html index 6dc16a3b..111e6ffa 100644 --- a/store/templates/app.html +++ b/store/templates/app.html @@ -136,12 +136,13 @@

{{ _("Useful links") }}

{% set upstream = infos["manifest"]["upstream"] %} - {{ _("License: %(license)s", license=upstream.license) }} + {{ _("App license: %(license)s", license=upstream.license) }} {% if upstream.website %} {{ _(" Official website") }}{% endif %} {% if upstream.admindoc %} {{ _("Official admin documentation") }}{% endif %} {% if upstream.userdoc %} {{ _("Official user documentation") }}{% endif %} {% if upstream.code %} {{ _("Official code repository") }}{% endif %} {{ _("YunoHost package repository") }} + {{ _("YunoHost package license") }}
{% endblock %} diff --git a/store/translations/fr/LC_MESSAGES/messages.mo b/store/translations/fr/LC_MESSAGES/messages.mo index 59f9ea26..7eecf27c 100644 Binary files a/store/translations/fr/LC_MESSAGES/messages.mo and b/store/translations/fr/LC_MESSAGES/messages.mo differ diff --git a/store/translations/fr/LC_MESSAGES/messages.po b/store/translations/fr/LC_MESSAGES/messages.po index 14b8108f..913e0617 100644 --- a/store/translations/fr/LC_MESSAGES/messages.po +++ b/store/translations/fr/LC_MESSAGES/messages.po @@ -264,6 +264,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"