Merge branch 'master' of git@github.com:gallery/gallery3

1 files changed, 5 insertions, 3 deletions

diff --git a/modules/gallery/views/simple_uploader.html.php b/modules/gallery/views/simple_uploader.html.php
index 92155434..06a2eaff 100644
--- a/modules/gallery/views/simple_uploader.html.php
+++ b/modules/gallery/views/simple_uploader.html.php
@@ -255,9 +255,11 @@
 
   function upload_complete(file) {
     var stats = this.getStats();
-    $("#gUploadQueueInfo").text("(<?= t("completed") ?> " + stats.successful_uploads +
-      " <?= t("of") ?> " + (stats.files_queued + stats.successful_uploads +
-      stats.upload_errors + stats.upload_cancelled + stats.queue_errors) + ")");
+    var msg = "(<?= t("completed __COMPLETED__ of __TOTAL__") ?>)";
+    msg = msg.replace("__COMPLETED__", stats.successful_uploads);
+    msg = msg.replace("__TOTAL__", stats.files_queued + stats.successful_uploads +
+      stats.upload_errors + stats.upload_cancelled + stats.queue_errors);
+    $("#gUploadQueueInfo").text(msg);
     if (stats.files_queued === 0) {
       $("#gUploadCancel").hide();
     }