YunoHost/yunohost-admin
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost-admin.git synced 2024-09-03 20:06:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

[fix] add missing license info and userdoc upstream link

Browse source
This commit is contained in:
axolotle 2022-11-15 13:58:03 +01:00
parent 09df53adab
commit 4e2a92bb1d
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/i18n/locales/en.json
View file

@ -62,6 +62,7 @@
"danger": "The installation of the application will most likely lead to issues", "danger": "The installation of the application will most likely lead to issues",
"critical": "The application cannot be installed" "critical": "The application cannot be installed"
}, },
"license": "License: {license}",
"problems": { "problems": {
"arch": "It is incompatible with your system architecture", "arch": "It is incompatible with your system architecture",
"broken": "This application is broken according to YunoHost's automatic tests and it is likely to break your system! You should probably NOT install it unless you know what you are doing.", "broken": "This application is broken according to YunoHost's automatic tests and it is likely to break your system! You should probably NOT install it unless you know what you are doing.",
@ -96,11 +97,12 @@
"title": "YunoHost integration" "title": "YunoHost integration"
}, },
"links": { "links": {
"admindoc": "Official documentation", "admindoc": "Official Admin documentation",
"code": "Upstream code repository", "code": "Official code repository",
"forum": "Topics about this app on YunoHost's forum", "forum": "Topics about this app on YunoHost's forum",
"package": "YunoHost package repository", "package": "YunoHost package repository",
"title": "Links", "title": "Links",
"userdoc": "Official User documentation",
"website": "Website" "website": "Website"
}, },
"potential_alternative_to": "Potential alternative to:" "potential_alternative_to": "Potential alternative to:"

9
app/src/views/app/AppInstall.vue
View file

@ -16,7 +16,10 @@
aria-hidden="true" class="d-block mb-3" fluid aria-hidden="true" class="d-block mb-3" fluid
/> />
<p>{{ $t('app.install.version', { version: app.version }) }}</p> <p>
{{ $t('app.install.version', { version: app.version }) }}<br>
{{ $t('app.install.license', { license: app.license }) }}
</p>
<b-button <b-button
v-if="app.demo" v-if="app.demo"
@ -211,7 +214,6 @@ export default {
// ram support is non-blocking requirement and handled on its own. // ram support is non-blocking requirement and handled on its own.
return key === 'ram' || requirements[key].pass return key === 'ram' || requirements[key].pass
}) })
const app = { const app = {
id, id,
name, name,
@ -222,6 +224,7 @@ export default {
image: _app.image, image: _app.image,
demo: _app.upstream.demo, demo: _app.upstream.demo,
version, version,
license: _app.upstream.license,
integration: { integration: {
archs: Array.isArray(_archs) ? _archs.join(this.$i18n.t('words.separator')) : _archs, archs: Array.isArray(_archs) ? _archs.join(this.$i18n.t('words.separator')) : _archs,
ldap: _app.integration.ldap === 'not_relevant' ? null : _app.integration.ldap, ldap: _app.integration.ldap === 'not_relevant' ? null : _app.integration.ldap,
@ -230,7 +233,7 @@ export default {
resources: { ram: _app.integration.ram.runtime, disk: _app.integration.disk } resources: { ram: _app.integration.ram.runtime, disk: _app.integration.disk }
}, },
links: [ links: [
...['website', 'admindoc', 'code'].map((key) => ([key, _app.upstream[key]])), ...['website', 'admindoc', 'userdoc', 'code'].map((key) => ([key, _app.upstream[key]])),
['package', _app.remote.url], ['package', _app.remote.url],
['forum', `https://forum.yunohost.org/tag/${id}`] ['forum', `https://forum.yunohost.org/tag/${id}`]
].filter(([key, val]) => !!val), ].filter(([key, val]) => !!val),