From 245f4d39a731b60ac31a755ab4678bb83f211720 Mon Sep 17 00:00:00 2001
From: Shai Ben-Naphtali <shai@shaibn.com>
Date: Sun, 12 Jul 2009 01:37:20 +0800
Subject: This fixes ticket #513

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
---
 modules/gallery/views/simple_uploader.html.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/modules/gallery/views/simple_uploader.html.php b/modules/gallery/views/simple_uploader.html.php
index e1add7f7..8178ace2 100644
--- a/modules/gallery/views/simple_uploader.html.php
+++ b/modules/gallery/views/simple_uploader.html.php
@@ -182,8 +182,9 @@
     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("(<?= t("completed") ?> " + stats.successful_uploads +
+		" <?= t("of") ?> " + (stats.files_queued + stats.successful_uploads +
+		stats.upload_errors + stats.upload_cancelled + stats.queue_errors) + ")");
     }
 
     // Auto start the upload
@@ -254,8 +255,9 @@
 
   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("(<?= t("completed") ?> " + stats.successful_uploads +
+	  " <?= t("of") ?> " + (stats.files_queued + stats.successful_uploads +
+	  stats.upload_errors + stats.upload_cancelled + stats.queue_errors) + ")");
     if (stats.files_queued === 0) {
       $("#gUploadCancel").hide();
     }
-- 
cgit v1.2.3


From 30346ec84214027e5e192020ce60608e48cb9530 Mon Sep 17 00:00:00 2001
From: Shai Ben-Naphtali <shai@shaibn.com>
Date: Sun, 12 Jul 2009 01:41:24 +0800
Subject: Fixed indentation of commit 2760e119bbfc3e2d436c404de194dbeea738a735

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
---
 modules/gallery/views/simple_uploader.html.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/gallery/views/simple_uploader.html.php b/modules/gallery/views/simple_uploader.html.php
index 8178ace2..92155434 100644
--- a/modules/gallery/views/simple_uploader.html.php
+++ b/modules/gallery/views/simple_uploader.html.php
@@ -183,8 +183,8 @@
       $("#gUploadCancel").show();
       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) + ")");
+        " <?= t("of") ?> " + (stats.files_queued + stats.successful_uploads +
+        stats.upload_errors + stats.upload_cancelled + stats.queue_errors) + ")");
     }
 
     // Auto start the upload
@@ -256,8 +256,8 @@
   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) + ")");
+      " <?= t("of") ?> " + (stats.files_queued + stats.successful_uploads +
+      stats.upload_errors + stats.upload_cancelled + stats.queue_errors) + ")");
     if (stats.files_queued === 0) {
       $("#gUploadCancel").hide();
     }
-- 
cgit v1.2.3