From 5dc91715b1dcc3fb2b864d047868e357bda75224 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Fri, 31 May 2019 14:30:35 +0200 Subject: [PATCH] Remove old references to community list --- src/js/yunohost/controllers/tools.js | 9 +-------- src/locales/en.json | 3 --- src/views/tools/tools_appslists_list.ms | 25 +------------------------ 3 files changed, 2 insertions(+), 35 deletions(-) diff --git a/src/js/yunohost/controllers/tools.js b/src/js/yunohost/controllers/tools.js index ffee7d49..61c79b06 100644 --- a/src/js/yunohost/controllers/tools.js +++ b/src/js/yunohost/controllers/tools.js @@ -368,23 +368,16 @@ app.get('#/tools/appslists', function (c) { c.api('/appslists', function(data) { list = []; - var has_community_list = false; $.each(data, function(listname, listinfo) { list.push({ 'name': listname, 'url': listinfo['url'], 'lastUpdate': listinfo['lastUpdate'] }); - - // Check for community list - if (listname == 'community' || listinfo['url'] == 'https://app.yunohost.org/community.json') { - has_community_list = true; - } }); c.view('tools/tools_appslists_list', { - appslists: list, - has_community_list: has_community_list + appslists: list }); }, 'GET'); }); diff --git a/src/locales/en.json b/src/locales/en.json index 1d8f1461..aa9d8dcf 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -414,10 +414,7 @@ "appslists_info_remove_desc": "Applications from this list will not be available anymore.", "appslists_last_update": "Last update", "appslists_unknown_list": "Unknown apps list: %s", - "appslists_community_list": "Community applications list", "name": "Name", - "install_community_appslists_info": "Community applications list allows you to install community maintained applications.
See the full list on yunohost.org/apps.", - "install_community_appslists_warning": "Note that these applications packages are not official and not maintained by the YunoHost team.
Installing these applications is at your own risk and could break your system.", "purge_user_data_checkbox": "Purge %s's data? (This will remove the content of it's home and mail directories.)", "purge_user_data_warning": "Purging user's data is not reversible. Be sure you know what you're doing!" } diff --git a/src/views/tools/tools_appslists_list.ms b/src/views/tools/tools_appslists_list.ms index 7158ba5d..ede16f19 100644 --- a/src/views/tools/tools_appslists_list.ms +++ b/src/views/tools/tools_appslists_list.ms @@ -29,29 +29,6 @@ -{{^has_community_list}} -
-
-

{{t 'appslists_community_list'}}

-
-
-
- - -
-
-

{{t 'install_community_appslists_info'}}

-

- {{t 'install_community_appslists_warning'}} -

- -
-
-
-
-
-{{/has_community_list}} -

{{t 'appslists_custom'}}

@@ -67,7 +44,7 @@
- +