From 2dec4fde6fc0637c95a6e294244eec12d24381dd Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Sun, 25 Feb 2024 03:44:25 +0100 Subject: [PATCH 1/5] 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 6dc16a3..111e6ff 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 %} From f55381038d2a5b21d7272b602f6d32224b508507 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Sun, 25 Feb 2024 03:47:13 +0100 Subject: [PATCH 2/5] 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 24d2038..5f3af34 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 d1a0abd5eeb0e27b937b24008ed6d5f0a23f239c Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Sun, 25 Feb 2024 03:47:34 +0100 Subject: [PATCH 3/5] 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 e22369b15d08d3266ded1c4aae83e6b378e97c19 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Tue, 27 Feb 2024 19:39:39 +0100 Subject: [PATCH 4/5] 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 dc1d395..f5689fd 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 """ From 8ec9adc7f213d45c30e7c2804fae9fa80e4b8ab9 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Tue, 27 Feb 2024 19:41:43 +0100 Subject: [PATCH 5/5] 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 16d62a6..824a576 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 ""