From 84636d11c11c61bfbf59a4beb318d14d539f219a Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Sun, 25 Feb 2024 03:16:52 +0100 Subject: [PATCH 01/10] rename 'not-totally-free' to 'not-totally-free-upstream' & create 'not-totally-free-package' --- antifeatures.toml | 7 ++++++- apps.toml | 16 ++++++++-------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/antifeatures.toml b/antifeatures.toml index 659df69663..44ba517842 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,8 @@ 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 = "lock" +title.en = "Not totally free package" +title.fr = "Package sous licence libre restreinte" diff --git a/apps.toml b/apps.toml index a0f92e0eb1..f1cc6cd711 100644 --- a/apps.toml +++ b/apps.toml @@ -774,7 +774,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" @@ -782,7 +782,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" @@ -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" ] @@ -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" @@ -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" @@ -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" @@ -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" ] @@ -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" From 91104388115c35d326e7ebb6a3bb4c4a3cf9cdeb Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Sun, 25 Feb 2024 03:18:06 +0100 Subject: [PATCH 02/10] tag gotosocial as a not-totally-free-package --- apps.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps.toml b/apps.toml index f1cc6cd711..30db142e38 100644 --- a/apps.toml +++ b/apps.toml @@ -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" ] From a0ab48106a127d2ae1c6790af9b336ec8586ead1 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Sun, 25 Feb 2024 03:20:52 +0100 Subject: [PATCH 03/10] add not-totally-free-package descriptions --- antifeatures.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/antifeatures.toml b/antifeatures.toml index 44ba517842..857d6fcf86 100644 --- a/antifeatures.toml +++ b/antifeatures.toml @@ -119,3 +119,5 @@ description.it = "Quest’applicazione è protetta da licenza generalmente liber icon = "lock" 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." From 9dc49a388cc8842d4f0c1560229d3a5b97f4f1aa Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Sun, 25 Feb 2024 03:44:25 +0100 Subject: [PATCH 04/10] add package license link to the store --- store/templates/app.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/store/templates/app.html b/store/templates/app.html index 6dc16a3ba0..111e6ffa57 100644 --- a/store/templates/app.html +++ b/store/templates/app.html @@ -136,12 +136,13 @@

{{ _("Anti-features") }}

{{ _("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 %} From 84755b540e14e12cc73e22716945f3d029b5ed77 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Sun, 25 Feb 2024 03:47:13 +0100 Subject: [PATCH 05/10] update french translation --- store/translations/fr/LC_MESSAGES/messages.po | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/store/translations/fr/LC_MESSAGES/messages.po b/store/translations/fr/LC_MESSAGES/messages.po index 24d2038b5b..5f3af34824 100644 --- a/store/translations/fr/LC_MESSAGES/messages.po +++ b/store/translations/fr/LC_MESSAGES/messages.po @@ -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 \n" "Language: fr\n" @@ -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" @@ -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" From 91e823686a591bb6810e4ada836c2fbeaa8dd126 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Sun, 25 Feb 2024 03:47:34 +0100 Subject: [PATCH 06/10] compile updated french translation --- store/translations/fr/LC_MESSAGES/messages.mo | Bin 11390 -> 11332 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/store/translations/fr/LC_MESSAGES/messages.mo b/store/translations/fr/LC_MESSAGES/messages.mo index e691ce8574019b603cf6de80032c79f6101bf3f1..7eecf27cdd027cfed51a4d86a9b1ccf4d995d5ef 100644 GIT binary patch delta 1440 zcmYM!Uuc$97y$6cwdH31S#vGjvc6^6X3Nd_uW~GAL{V)9))ECn3q@0-F#Lyp8PrX+ zy4Y?iDF~tzs`F%TD6uYZL(Vb=6w;g$3keSR9)&pF)14Ezu)`8KcPd%T~=r^bI{ zv;JSafeo@)VE<^-$ORr|Ew|C$v5)(w36Z(*)tX{_l9%+WW)zi~;O+X=c5Qe666SiF zlxH3fvWbJt^*`eQe#NEsk1q8)!rio1Tw<2!A7)7x%`P(S<~IF4=E7g_5Wi(sq*pmI z@MmahJj+Jzr=(+WYW!X1eaBcfH-cH% zzm43&Ed3}Y7h^2(2d?53-op;(o7Z>LtN#*>y#`b{K4d#Td6#L=Sgh_IlUTz$_$YJU9xmV;^n%3kvPPC{m|J*~c~&K9-NhE> zg8j^hck@;bF<;9snHi4pB^5ZwYxFnTC7-3IQsX$=9|o;sB12cqMsS~AIv}}nH#i;F6TYK0j}dM{FO&pv9PGX`&6NFjB4bB zZzz@+FD}I2%(MQNS&=&bMKa??u3;NL;d4AW&0OzbxBgGc)Xye$-^&;H7%%d1u9od# zzQx*n|L3$8?`4Vk@GWHzH#0Z-fcdmu;A;NK45ZyV+QlCB^6->rIj-M$XHk*g>A8#< xZNZr%R$_RS-&RGp|8Sy%o1?CG5=N*&AYT|RQAVXSiGSkw2l{{eHMnP~t3 delta 1483 zcmZA1ZD`e17y$6&y6UpBIp?zOHm~nRQ?>4QpdWVA01>4T8q8|sHr)arv#eN0S5DAeEMe-L!py}xtLJ^yo_=Q-!@hmPAF z#b3*Fdy>~m?<(&zCDHruwP|=tV|4pi%bhIc5kAOce28cH2!CcHZ?K6|MtE}-NHV zeopk`IE@wdPc0hN29`4xdXr_`MzN$%`QEUU4lp*T8I_Gs<~98~MuqZroyrC_n*S1G zz0Jxro}V$#LB{$&@qPQJKQ!iWjXHkB-Lz&JH##d-fl+}M85wtS9eWrHUtu3_FeI#?kEJW86|vsWfxakl>Sa_7hnw((mo;vKef zk#k(lt&Ai1jdDwWvA}=%6sw(YGgn0YW5P}Yv$&6{oKCZmKk`ZD99W#?)7;APz1qJ#tQSVRqBJrh!A1 Qr*bi=^M8|G&tELN3sLf-iU0rr From cb8580ec53f2a534402856ec12ec596e257133c9 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Sun, 25 Feb 2024 05:51:07 +0100 Subject: [PATCH 07/10] change icon for not-totally-free-package --- antifeatures.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/antifeatures.toml b/antifeatures.toml index 857d6fcf86..7872463b12 100644 --- a/antifeatures.toml +++ b/antifeatures.toml @@ -116,7 +116,7 @@ description.fr = "L'application packagée est sous une licence globalement libre description.it = "Quest’applicazione è protetta da licenza generalmente libera, ma con delle clausole che potrebbero limitare il suo utilizzo." [not-totally-free-package] -icon = "lock" +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." From 33a8f9f4a087b1b5ba595d4d74dafbc5350f35d1 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Tue, 27 Feb 2024 19:39:39 +0100 Subject: [PATCH 08/10] fix in the wishlist PR message --- store/app.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/store/app.py b/store/app.py index dc1d395fc5..f5689fd991 100644 --- a/store/app.py +++ b/store/app.py @@ -359,7 +359,7 @@ def add_to_wishlist(): 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 """ From 0a4bf14b8af686506c079929dae95bc9eab51aa3 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Tue, 27 Feb 2024 19:41:43 +0100 Subject: [PATCH 09/10] update message.pot for weblate --- store/messages.pot | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/store/messages.pot b/store/messages.pot index 16d62a6161..824a5767a0 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 "" From d164c69a884baa4970a238b4fb85ca87ab640558 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Tue, 27 Feb 2024 19:44:14 +0100 Subject: [PATCH 10/10] fix bookwyrm "not-totally-free-upstream" antifeature --- apps.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps.toml b/apps.toml index db3e7b69ea..5d37b5e36d 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"