Skip to content

Commit

Permalink
Merge pull request #7583 from nextcloud/comradekingu-patch-1
Browse files Browse the repository at this point in the history
Spelling: No ...., upgrades and email.
  • Loading branch information
MorrisJobke authored Jan 2, 2018
2 parents 37ed5b5 + f801dc8 commit 99175c3
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions settings/js/apps.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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();
},
Expand Down

0 comments on commit 99175c3

Please sign in to comment.