Merge branch 'master' into talmdal_dev

2 files changed, 4 insertions, 2 deletions

diff --git a/modules/server_add/controllers/server_add.php b/modules/server_add/controllers/server_add.php
index f68335df..4cdaa275 100644
--- a/modules/server_add/controllers/server_add.php
+++ b/modules/server_add/controllers/server_add.php
@@ -109,9 +109,11 @@ class Server_Add_Controller extends Admin_Controller {
     }
 
     $task = task::run($task_id);
+    // Prevent the JavaScript code from breaking by forcing a period as
+    // decimal separator for all locales with sprintf("%F", $value).
     print json_encode(array("done" => (bool)$task->done,
                             "status" => $task->status,
-                            "percent_complete" => $task->percent_complete));
+                            "percent_complete" => sprintf("%F", $task->percent_complete)));
   }
 
   /**
diff --git a/modules/server_add/views/admin_server_add.html.php b/modules/server_add/views/admin_server_add.html.php
index 6dbb8637..933ab7f8 100644
--- a/modules/server_add/views/admin_server_add.html.php
+++ b/modules/server_add/views/admin_server_add.html.php
@@ -1,6 +1,6 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <div class="g-block">
-  <h1> <?= t("Add from server admininstration") ?> </h1>
+  <h1> <?= t("Add from server administration") ?> </h1>
   <div class="g-block-content">
     <?= $form ?>
     <h2><?= t("Authorized paths") ?></h2>