From f2a3fa46f5a5cc31d251c1557f8b1cfbb6f46027 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 11 Jul 2009 07:10:05 -0700
Subject: Change 'completed' status message to be a full sentence with
 javascript placeholders.

---
 modules/gallery/views/simple_uploader.html.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'modules/gallery/views/simple_uploader.html.php')

diff --git a/modules/gallery/views/simple_uploader.html.php b/modules/gallery/views/simple_uploader.html.php
index 92155434..bf3d7c57 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();
     }
-- 
cgit v1.2.3


From 8c6c3801bb6b9f9d4d68aef0cf808abcc667d342 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 11 Jul 2009 07:12:29 -0700
Subject: Fix a typo in the last commit.  I left off a closing paren.

---
 modules/gallery/views/simple_uploader.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/gallery/views/simple_uploader.html.php')

diff --git a/modules/gallery/views/simple_uploader.html.php b/modules/gallery/views/simple_uploader.html.php
index bf3d7c57..06a2eaff 100644
--- a/modules/gallery/views/simple_uploader.html.php
+++ b/modules/gallery/views/simple_uploader.html.php
@@ -258,7 +258,7 @@
     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;
+      stats.upload_errors + stats.upload_cancelled + stats.queue_errors);
     $("#gUploadQueueInfo").text(msg);
     if (stats.files_queued === 0) {
       $("#gUploadCancel").hide();
-- 
cgit v1.2.3