From e037bae7ad4956dd9a5ad74c19a0b0fcd9e1a170 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Tue, 19 Dec 2017 20:11:58 +0100 Subject: [PATCH 1/2] Spelling: No ...., upgrades and email. --- settings/js/apps.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/settings/js/apps.js b/settings/js/apps.js index 6406e37cbcbcd..5167e18aac572 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -535,20 +535,20 @@ OC.Settings.Apps = OC.Settings.Apps || { showEmptyUpdates: function() { $('#apps-list').addClass('hidden'); - $('#apps-list-empty').removeClass('hidden').find('h2').text(t('settings', 'No app updates available')); + $('#apps-list-empty').removeClass('hidden').find('h2').text(t('settings', 'App up to date')); $('#app-list-empty-icon').removeClass('icon-search').addClass('icon-download'); }, updateApp:function(appId, element) { var oldButtonText = element.val(); - element.val(t('settings','Updating....')); + element.val(t('settings','Upgrading …')); OC.Settings.Apps.hideErrorMessage(appId); $.post(OC.filePath('settings','ajax','updateapp.php'),{appid:appId},function(result) { if(!result || result.status !== 'success') { if (result.data && result.data.message) { OC.Settings.Apps.showErrorMessage(appId, result.data.message); } else { - OC.Settings.Apps.showErrorMessage(appId, t('settings','Error while updating app')); + OC.Settings.Apps.showErrorMessage(appId, t('settings','Could not upgrade app')); } element.val(oldButtonText); } @@ -584,7 +584,7 @@ OC.Settings.Apps = OC.Settings.Apps || { element.val(t('settings','Removing …')); $.post(OC.filePath('settings','ajax','uninstallapp.php'),{appid:appId},function(result) { if(!result || result.status !== 'success') { - OC.Settings.Apps.showErrorMessage(appId, t('settings','Error while removing app')); + OC.Settings.Apps.showErrorMessage(appId, t('settings','Could not remove app')); element.val(t('settings','Remove')); } else { OC.Settings.Apps.rebuildNavigation(); @@ -722,9 +722,9 @@ OC.Settings.Apps = OC.Settings.Apps || { OC.dialogs.info( t( 'settings', - 'The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds.' + 'The app has been enabled but needs to be upgraded. You will be redirected to the upgrade page in 5 seconds.' ), - t('settings','App update'), + t('settings','App upgrade'), function () { window.location.reload(); }, @@ -803,8 +803,8 @@ OC.Settings.Apps = OC.Settings.Apps || { if (!_.isUndefined(app.author['@attributes']['homepage'])) { authors.push(app.author['@attributes']['homepage']); } - if (!_.isUndefined(app.author['@attributes']['mail'])) { - authors.push(app.author['@attributes']['mail']); + if (!_.isUndefined(app.author['@attributes']['email'])) { + authors.push(app.author['@attributes']['email']); } return OC.Settings.Apps._search(authors.join(' '), query); } From f801dc8a6da6f88e69ae4461f6b752587f5b7f75 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Fri, 29 Dec 2017 21:15:37 +0100 Subject: [PATCH 2/2] Fix mail attribute Signed-off-by: Roeland Jago Douma --- settings/js/apps.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/settings/js/apps.js b/settings/js/apps.js index 5167e18aac572..0a6e86ed70142 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -803,8 +803,8 @@ OC.Settings.Apps = OC.Settings.Apps || { if (!_.isUndefined(app.author['@attributes']['homepage'])) { authors.push(app.author['@attributes']['homepage']); } - if (!_.isUndefined(app.author['@attributes']['email'])) { - authors.push(app.author['@attributes']['email']); + if (!_.isUndefined(app.author['@attributes']['mail'])) { + authors.push(app.author['@attributes']['mail']); } return OC.Settings.Apps._search(authors.join(' '), query); }