mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #26247 from nextcloud/bugfix/noid/product-name-on-updater 

Bugfix/noid/product name on updater
This commit is contained in:
Roeland Jago Douma 2021-03-22 19:44:06 +01:00 committed by GitHub
parent 6b4cfc5805 f35d7adf7d
commit 51823ade26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/js/update.js
View File

@ -11,6 +11,7 @@
(function() {
OC.Update = {
_started : false,
options: {},
/**
* Start the update process.
@ -22,6 +23,7 @@
return;
}
this.options = options;
var hasWarnings = false;
this.$el = $el;
@ -72,7 +74,7 @@
var updateUnsuccessful = $('<p>');
if(message === 'Exception: Updates between multiple major versions and downgrades are unsupported.') {
updateUnsuccessful.append(t('core', 'The update was unsuccessful. For more information <a href="{url}">check our forum post</a> covering this issue.', {'url': 'https://help.nextcloud.com/t/updates-between-multiple-major-versions-are-unsupported/7094'}));
} else {
} else if (OC.Update.options.productName === 'Nextcloud') {
updateUnsuccessful.append(t('core', 'The update was unsuccessful. ' +
'Please report this issue to the ' +
'<a href="https://github.com/nextcloud/server/issues" target="_blank">Nextcloud community</a>.'));
@ -86,18 +88,15 @@
$('#update-progress-icon')
.addClass('icon-checkmark-white')
.removeClass('icon-loading-dark');
.removeClass('icon-loading-dark');
if (hasWarnings) {
$el.find('.update-show-detailed').before(
$('<input type="button" class="update-continue" value="'+t('core', 'Continue to Nextcloud')+'">').on('click', function() {
$('<input type="button" class="update-continue" value="'+t('core', 'Continue to {productName}', OC.Update.options)+'">').on('click', function() {
window.location.reload();
})
);
} else {
// FIXME: use product name
$el.find('.update-show-detailed').before(
$('<p id="redirect-countdown"></p>')
);
@ -115,7 +114,9 @@
updateCountdown: function (i, total) {
setTimeout(function(){
$("#redirect-countdown").text(n('core', 'The update was successful. Redirecting you to Nextcloud in %n second.', 'The update was successful. Redirecting you to Nextcloud in %n seconds.', i));
$("#redirect-countdown").text(
n('core', 'The update was successful. Redirecting you to {productName} in %n second.', 'The update was successful. Redirecting you to {productName} in %n seconds.', i, OC.Update.options)
);
}, (total - i) * 1000);
},

7
lib/base.php
View File

@ -392,7 +392,12 @@ class OC {
$tmpl->assign('appsToUpgrade', $appManager->getAppsNeedingUpgrade($ocVersion));
$tmpl->assign('incompatibleAppsList', $incompatibleApps);
$tmpl->assign('productName', 'Nextcloud'); // for now
try {
$defaults = new \OC_Defaults();
$tmpl->assign('productName', $defaults->getName());
} catch (Throwable $error) {
$tmpl->assign('productName', 'Nextcloud');
}
$tmpl->assign('oldTheme', $oldTheme);
$tmpl->printPage();
}