From df2670ca3c5d5c2eaee71fa4a90a3cccfce04daa Mon Sep 17 00:00:00 2001 From: Marcin Czarnecki Date: Tue, 14 Mar 2017 20:36:17 +0000 Subject: [PATCH] Update: feedback before redirect Signed-off-by: marncz --- core/js/update.js | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/core/js/update.js b/core/js/update.js index cc2b20f5c9..2b2f01e9aa 100644 --- a/core/js/update.js +++ b/core/js/update.js @@ -87,7 +87,7 @@ $('#update-progress-icon') .addClass('icon-checkmark-white') - .removeClass('icon-loading-dark'); + .removeClass('icon-loading-dark'); if (hasWarnings) { $el.find('.update-show-detailed').before( @@ -97,12 +97,14 @@ ); } else { // FIXME: use product name + + $el.find('.update-show-detailed').before( - $('

'+t('core', 'The update was successful. Redirecting you to Nextcloud in ')+'

') + $('

') ); - for(var i = 4; i >= 0; i--) { - self.updateCountdown(i); + for(var i = 0; i <= 4; i++){ + self.updateCountdown(i, 4); } setTimeout(function () { @@ -112,11 +114,10 @@ }); }, - updateCountdown: function (i) { + updateCountdown: function (i, total) { setTimeout(function(){ - $("#countdown").html(i + " second"); - if(i > 1) { $("#countdown").append("s"); } - }, (4 - i) * 1000); + $("#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)); + }, (total - i) * 1000); }, setMessage: function(message) {