diff options
author | Joas Schilling <coding@schilljs.com> | 2021-03-22 16:31:50 +0100 |
---|---|---|
committer | Joas Schilling <coding@schilljs.com> | 2021-03-22 16:31:50 +0100 |
commit | 7f3a5de20cacf86b42d80846cc1407c8b8fdfe8b (patch) | |
tree | f03bc9e2fe00e8ceab19e439d5a3b890f9a01cc6 | |
parent | 6b4cfc580588b459fb3ca6053f645633241fdd7a (diff) | |
download | nextcloud-server-7f3a5de20cacf86b42d80846cc1407c8b8fdfe8b.tar.gz nextcloud-server-7f3a5de20cacf86b42d80846cc1407c8b8fdfe8b.zip |
Use the product name in the updater screen
Signed-off-by: Joas Schilling <coding@schilljs.com>
-rw-r--r-- | core/js/update.js | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/core/js/update.js b/core/js/update.js index c5f8b09d682..5c1054adcb4 100644 --- a/core/js/update.js +++ b/core/js/update.js @@ -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); }, |