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

Merge branches 'stretch-unstable' and 'featured_apps' of https://github.com/YunoHost/yunohost-admin into featured_apps

Browse source
This commit is contained in:
Maniack Crudelis 2019-02-20 18:29:05 +01:00
commit 89a0d06a74
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/js/yunohost/controllers/tools.js
View file

@ -55,7 +55,7 @@
data.packages[i].changelog = data.packages[i].changelog.replace(/\n/g, '<br />');
// Check for special packages that need delayed upgrade.
if (["moulinette", "moulinette-yunohost", "yunohost-admin", "yunohost-config-nginx", "ssowat", "python"].indexOf(data.packages[i].name) != -1) {
if (["moulinette", "yunohost", "yunohost-admin", "ssowat", "python"].indexOf(data.packages[i].name) != -1) {
c.flash('warning', y18n.t('system_delayed_upgrade_warning', [data.packages[i].name]));
data.packages[i].delayed = true;
}

2
src/locales/en.json
View file

@ -138,7 +138,7 @@
"enabled": "Enabled",
"error_modify_something": "You should modify something",
"error_occured": "An error occurred, try again",
"error_retrieve_feed": "Could not retrieve feed: %s",
"error_retrieve_feed": "Could not retrieve feed: %s. You might have a plugin prevent your browser from performing this request (or the website is down).",
"error_select_domain": "You should indicate a domain",
"error_server": "Server error",
"error_server_unexpected": "Unexpected server error (%s)",