summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Beaver <sbeaver@netgate.com>2016-01-26 10:33:35 -0500
committerStephen Beaver <sbeaver@netgate.com>2016-01-26 10:34:05 -0500
commit7fadef46ffe9c6bedbcb624630b321ac009a8640 (patch)
tree12c982eaca58ad155ef4da9ed0ae7f38c77aa094
parentecef6a27b2422be7b3951176e2937f963bdefb9c (diff)
downloadpfsense-7fadef46ffe9c6bedbcb624630b321ac009a8640.zip
pfsense-7fadef46ffe9c6bedbcb624630b321ac009a8640.tar.gz
Revise countdown message for internationalization
-rw-r--r--src/usr/local/www/pkg_mgr_install.php11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/usr/local/www/pkg_mgr_install.php b/src/usr/local/www/pkg_mgr_install.php
index 951f3cb..a3d3352 100644
--- a/src/usr/local/www/pkg_mgr_install.php
+++ b/src/usr/local/www/pkg_mgr_install.php
@@ -646,7 +646,6 @@ function scrollToBottom() {
$('#output').scrollTop($('#output')[0].scrollHeight);
}
-var timeoutmsg = '<h4><?=gettext("Rebooting");?><br /><?=gettext("Page will automatically reload in ");?>';
var time = 0;
function checkonline() {
@@ -661,17 +660,23 @@ function checkonline() {
function startCountdown() {
setInterval(function() {
+ if (time == "<?=$guitimeout?>") {
+ $('#countdown').html('<h4><?=sprintf(gettext("Rebooting%sPage will automatically reload in %s seconds"), "<br />", "<span id=\"secs\"></span>");?></h4>');
+ }
+
if (time > 0) {
- $('#countdown').html(timeoutmsg + time + ' <?=gettext("seconds");?>.</h4>');
+ $('#secs').html(time);
time--;
} else {
time = "<?=$guiretry?>";
- timeoutmsg = '<h4><?=gettext("Not yet ready");?><br /><?=gettext("Retrying in another ");?>';
+ $('#countdown').html('<h4><?=sprintf(gettext("Not yet ready%s Retrying in another %s seconds"), "<br />", "<span id=\"secs\"></span>");?></h4>');
+ $('#secs').html(time);
checkonline();
}
}, 1000);
}
+
events.push(function() {
if ("<?=$start_polling?>") {
setTimeout(getLogsStatus, 1000);
OpenPOWER on IntegriCloud