diff --git a/src/js/yunohost/controllers/apps.js b/src/js/yunohost/controllers/apps.js index 09fd5ad3..10982dc7 100644 --- a/src/js/yunohost/controllers/apps.js +++ b/src/js/yunohost/controllers/apps.js @@ -143,8 +143,6 @@ app.maintainedColor = maintainedStateToColor(app.maintained); app.installColor = combineColors(app.stateColor, app.levelColor); - app.displayLicense = (app['manifest']['license'] !== undefined - && app['manifest']['license'] !== 'free'); app.updateDate = app.lastUpdate * 1000 || 0; app.isSafe = (app.installColor !== 'danger'); app.isWorking = isWorking ? "isworking" : "notFullyWorking"; @@ -542,7 +540,8 @@ app.helper('appInstallForm', function(appId, manifest, params) { var data = { id: appId, - manifest: manifest + manifest: manifest, + displayLicense: (manifest['license'] !== undefined && manifest['license'] !== 'free') }; formatYunoHostStyleArguments(data.manifest.arguments.install, params); diff --git a/src/locales/en.json b/src/locales/en.json index ca225d52..50596213 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -29,7 +29,6 @@ "app_install_cancel": "Installation cancelled.", "app_install_custom_no_manifest": "No manifest.json file", "app_list": "App list", - "app_license": "License of the app", "app_level": "App level", "app_make_default": "Make default", "app_no_actions": "This application doesn't have any actions", @@ -192,6 +191,7 @@ "label": "Label", "label_for_manifestname": "Label for %s", "level": "level", + "license": "License", "loading": "Loading …", "local_archives": "Local archives", "local_ip": "Local IP", diff --git a/src/views/app/app_install.ms b/src/views/app/app_install.ms index dce1686a..dcf8e017 100644 --- a/src/views/app/app_install.ms +++ b/src/views/app/app_install.ms @@ -19,6 +19,10 @@