diff options
| author | Nathan Kinkade <nkinkade@nkinka.de> | 2010-02-27 14:03:01 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nkinkade@nkinka.de> | 2010-02-27 14:03:01 +0000 |
| commit | a58aa6e97b0e44adf7a878db6e276b081e202192 (patch) | |
| tree | cecc68b1222cb283a021478b822952c468d64393 /modules/server_add | |
| parent | 10e36fcf1b5acf07c5cc128105af03fb09aac89e (diff) | |
| parent | d9707ae749df2770370dc4eeeeaddda28f092d4d (diff) | |
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'modules/server_add')
| -rw-r--r-- | modules/server_add/controllers/server_add.php | 4 | ||||
| -rw-r--r-- | modules/server_add/views/admin_server_add.html.php | 2 |
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> |