From b44046d478e751907c85426e3807122e0223e3e1 Mon Sep 17 00:00:00 2001
From: axolotle <nchesnais@mailoo.org>
Date: Fri, 1 Mar 2024 17:51:44 +0100
Subject: [PATCH] add package license link in AppInfo + AppInstall

---
 app/src/i18n/locales/en.json     | 3 ++-
 app/src/i18n/locales/fr.json     | 3 ++-
 app/src/views/app/AppInfo.vue    | 4 +++-
 app/src/views/app/AppInstall.vue | 4 +++-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/src/i18n/locales/en.json b/app/src/i18n/locales/en.json
index 3ab63223..2f975925 100644
--- a/app/src/i18n/locales/en.json
+++ b/app/src/i18n/locales/en.json
@@ -130,6 +130,7 @@
             "forum": "Topics about this app on YunoHost's forum",
             "license": "App license",
             "package": "YunoHost package repository",
+            "package_license": "YunoHost package license",
             "title": "Links",
             "userdoc": "Official User documentation",
             "website": "Official Website"
@@ -691,4 +692,4 @@
     "wrong_password_or_username": "Wrong password or username",
     "yes": "Yes",
     "yunohost_admin": "YunoHost Admin"
-}
\ No newline at end of file
+}
diff --git a/app/src/i18n/locales/fr.json b/app/src/i18n/locales/fr.json
index ed4a9609..6a7c87fe 100644
--- a/app/src/i18n/locales/fr.json
+++ b/app/src/i18n/locales/fr.json
@@ -593,6 +593,7 @@
             "admindoc": "Documentation officielle de l'administrateur",
             "forum": "Sujets concernant cette application sur le forum de YunoHost",
             "package": "Dépôt du paquet YunoHost",
+            "package_license": "Licence du paquet YunoHost",
             "title": "Liens",
             "userdoc": "Documentation officielle de l'utilisateur",
             "website": "Site officiel",
@@ -691,4 +692,4 @@
             "purge_desc": "Supprimez le répertoire de données associé à l'application (il s'agit généralement de données que vous avez téléchargées vous-même à l'aide de l'application)."
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/views/app/AppInfo.vue b/app/src/views/app/AppInfo.vue
index 1103045a..a15b1bb4 100644
--- a/app/src/views/app/AppInfo.vue
+++ b/app/src/views/app/AppInfo.vue
@@ -255,7 +255,7 @@
       <b-list-group flush>
         <yuno-list-group-item v-for="[key, link] in app.links" :key="key" no-status>
           <b-link :href="link" target="_blank">
-            <icon :iname="appLinksIcons(key)" />
+            <icon :iname="appLinksIcons(key)" class="mr-1" />
             {{ $t('app.links.' + key) }}
           </b-link>
         </yuno-list-group-item>
@@ -369,6 +369,7 @@ export default {
           userdoc: 'book',
           code: 'code',
           package: 'code',
+          package_license: 'institution',
           forum: 'comments'
         }
         return linksIcons[linkType]
@@ -423,6 +424,7 @@ export default {
           ['license', `https://spdx.org/licenses/${app.manifest.upstream.license}`],
           ...['website', 'admindoc', 'userdoc', 'code'].map((key) => ([key, app.manifest.upstream[key]])),
           ['package', app.from_catalog.git?.url],
+          ['package_license', app.from_catalog.git?.url + '/blob/master/LICENSE'],
           ['forum', `https://forum.yunohost.org/tag/${app.manifest.id}`]
         ].filter(([key, val]) => !!val),
         doc: {
diff --git a/app/src/views/app/AppInstall.vue b/app/src/views/app/AppInstall.vue
index 866872fc..c9158284 100644
--- a/app/src/views/app/AppInstall.vue
+++ b/app/src/views/app/AppInstall.vue
@@ -69,7 +69,7 @@
         <b-list-group flush>
           <yuno-list-group-item v-for="[key, link] in app.links" :key="key" no-status>
             <b-link :href="link" target="_blank">
-              <icon :iname="appLinksIcons(key)" />
+              <icon :iname="appLinksIcons(key)" class="mr-1" />
               {{ $t('app.links.' + key) }}
             </b-link>
           </yuno-list-group-item>
@@ -209,6 +209,7 @@ export default {
         userdoc: 'book',
         code: 'code',
         package: 'code',
+        package_license: 'institution',
         forum: 'comments'
       }
       return linksIcons[linkType]
@@ -267,6 +268,7 @@ export default {
           ['license', `https://spdx.org/licenses/${_app.upstream.license}`],
           ...['website', 'admindoc', 'userdoc', 'code'].map((key) => ([key, _app.upstream[key]])),
           ['package', _app.remote.url],
+          ['package_license', _app.remote.url + '/blob/master/LICENSE'],
           ['forum', `https://forum.yunohost.org/tag/${id}`]
         ].filter(([key, val]) => !!val),
         preInstall,