From 15bb52a7767d141ff10179f36ea8389f461df801 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 10 Jul 2009 14:12:13 -0700
Subject: Change the word "Done" to "Close" to make translations easier

---
 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 56b1c656..e1add7f7 100644
--- a/modules/gallery/views/simple_uploader.html.php
+++ b/modules/gallery/views/simple_uploader.html.php
@@ -51,7 +51,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>
 
-- 
cgit v1.2.3


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(-)

(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 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(-)

(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 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


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


From c4a30930112e9ab14678fe96f21741f1832c20f7 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 14 Jul 2009 12:36:57 -0700
Subject: 3rd attempt to fix localization messages.  Last time around I didn't
 dig deep enough, but now we form the complete message using t() style
 semantics to replace % placeholders with __ style JS placeholders. Also, stop
 appending the (completed) text to existing messages.. roll it together.

---
 modules/gallery/views/simple_uploader.html.php | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 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 06a2eaff..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;">
@@ -181,10 +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("(<?= t("completed") ?> " + stats.successful_uploads +
-        " <?= t("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
@@ -255,16 +253,20 @@
 
   function upload_complete(file) {
     var stats = this.getStats();
-    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);
+    $("#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__") ?>";
-- 
cgit v1.2.3