1 files changed, 14 insertions, 8 deletions
diff --git a/modules/gallery/views/simple_uploader.html.php b/modules/gallery/views/simple_uploader.html.php
index 56b1c656..38ac518c 100644
--- a/modules/gallery/views/simple_uploader.html.php
+++ b/modules/gallery/views/simple_uploader.html.php
@@ -32,8 +32,9 @@
   </ul>
 
   <p>
-    <?= t("Upload Queue") ?>
-    <span id="gUploadQueueInfo"></span>
+    <span id="gUploadQueueInfo">
+      <?= t("Upload Queue") ?>
+    </span>
     <a id="gUploadCancel" title="<?= t("Cancel all the pending uploads") ?>" onclick="swfu.cancelQueue();"><?= t("cancel") ?></a>
   </p>
   <div id="gAddPhotosCanvas" style="text-align: center;">
@@ -51,7 +52,7 @@
 
   <!-- Proxy the done request back to our form, since its been ajaxified -->
   <button class="ui-state-default ui-corner-all" onclick="$('#gAddPhotosForm').submit()">
-    <?= t("Done") ?>
+    <?= t("Close") ?>
   </button>
 </div>
 
@@ -181,9 +182,7 @@
   function file_dialog_complete(num_files_selected, num_files_queued) {
     if (num_files_selected > 0) {
       $("#gUploadCancel").show();
-      var stats = this.getStats();
-      $("#gUploadQueueInfo").text("(completed " + stats.successful_uploads +
-                                  " of " + (stats.files_queued + stats.successful_uploads + stats.upload_errors + stats.upload_cancelled + stats.queue_errors) + ")");
+      $("#gUploadQueueInfo").text(get_completed_status_msg(this.getStats()));
     }
 
     // Auto start the upload
@@ -254,13 +253,20 @@
 
   function upload_complete(file) {
     var stats = this.getStats();
-    $("#gUploadQueueInfo").text("(completed " + stats.successful_uploads +
-                                " of " + (stats.files_queued + stats.successful_uploads + stats.upload_errors + stats.upload_cancelled + stats.queue_errors) + ")");
+    $("#gUploadQueueInfo").text(get_completed_status_msg(stats));
     if (stats.files_queued === 0) {
       $("#gUploadCancel").hide();
     }
   }
 
+  function get_completed_status_msg(stats) {
+    var msg = "<?= t("Upload Queue (completed %completed of %total)", array("completed" => "__COMPLETED__", "total" => "__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);
+    return msg;
+  }
+
   // This event comes from the Queue Plugin
   function queue_complete(num_files_uploaded) {
     var status_msg = "<?= t("Uploaded: __COUNT__") ?>";