From 7b85473d2b519a6e91a9dda6b313de0dfa552e09 Mon Sep 17 00:00:00 2001
From: Thomas Piccirello <thomas@piccirello.com>
Date: Sat, 22 Sep 2018 18:11:30 -0400
Subject: [PATCH 1/2] Translate WebUI torrents Status column

Closes #9554.
---
 src/webui/www/private/scripts/dynamicTable.js | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/webui/www/private/scripts/dynamicTable.js b/src/webui/www/private/scripts/dynamicTable.js
index baf0a2560..1fbff1e47 100644
--- a/src/webui/www/private/scripts/dynamicTable.js
+++ b/src/webui/www/private/scripts/dynamicTable.js
@@ -856,58 +856,58 @@ var TorrentsTable = new Class({
             var status;
             switch (state) {
                 case "downloading":
-                    status = "Downloading";
+                    status = "QBT_TR(Downloading)QBT_TR[CONTEXT=TransferListDelegate]";
                     break;
                 case "stalledDL":
-                    status = "Stalled";
+                    status = "QBT_TR(Stalled)QBT_TR[CONTEXT=TransferListDelegate]";
                     break;
                 case "metaDL":
-                    status = "Downloading metadata";
+                    status = "QBT_TR(Downloading metadata)QBT_TR[CONTEXT=TransferListDelegate]";
                     break;
                 case "forcedDL":
-                    status = "[F] Downloading";
+                    status = "QBT_TR([F] Downloading)QBT_TR[CONTEXT=TransferListDelegate]";
                     break;
                 case "allocating":
-                    status = "Allocating";
+                    status = "QBT_TR(Allocating)QBT_TR[CONTEXT=TransferListDelegate]";
                     break;
                 case "uploading":
                 case "stalledUP":
-                    status = "Seeding";
+                    status = "QBT_TR(Seeding)QBT_TR[CONTEXT=TransferListDelegate]";
                     break;
                 case "forcedUP":
-                    status = "[F] Seeding";
+                    status = "QBT_TR([F] Seeding)QBT_TR[CONTEXT=TransferListDelegate]";
                     break;
                 case "queuedDL":
                 case "queuedUP":
-                    status = "Queued";
+                    status = "QBT_TR(Queued)QBT_TR[CONTEXT=TransferListDelegate]";
                     break;
                 case "checkingDL":
                 case "checkingUP":
-                    status = "Checking";
+                    status = "QBT_TR(Checking)QBT_TR[CONTEXT=TransferListDelegate]";
                     break;
                 case "queuedForChecking":
-                    status = "Queued for checking";
+                    status = "QBT_TR(Queued for checking)QBT_TR[CONTEXT=TransferListDelegate]";
                     break;
                 case "checkingResumeData":
-                    status = "Checking resume data";
+                    status = "QBT_TR(Checking resume data)QBT_TR[CONTEXT=TransferListDelegate]";
                     break;
                 case "pausedDL":
-                    status = "Paused";
+                    status = "QBT_TR(Paused)QBT_TR[CONTEXT=TransferListDelegate]";
                     break;
                 case "pausedUP":
-                    status = "Completed";
+                    status = "QBT_TR(Completed)QBT_TR[CONTEXT=TransferListDelegate]";
                     break;
                 case "moving":
-                    status = "Moving";
+                    status = "QBT_TR(Moving)QBT_TR[CONTEXT=TransferListDelegate]";
                     break;
                 case "missingFiles":
-                    status = "Missing Files";
+                    status = "QBT_TR(Missing Files)QBT_TR[CONTEXT=TransferListDelegate]";
                     break;
                 case "error":
-                    status = "Errored";
+                    status = "QBT_TR(Errored)QBT_TR[CONTEXT=TransferListDelegate]";
                     break;
                 default:
-                    status = "Unknown";
+                    status = "QBT_TR(Unknown)QBT_TR[CONTEXT=HttpServer]";
             }
 
             td.set('html', status);

From 65934a4c695521f2ba6fcd1b1df5eb3550d34d1a Mon Sep 17 00:00:00 2001
From: Thomas Piccirello <thomas@piccirello.com>
Date: Sun, 23 Sep 2018 16:27:47 -0400
Subject: [PATCH 2/2] Add locale to js file path

This reduces the likelihood of a cached file being used after the locale is changed.
---
 src/webui/www/private/index.html       | 10 +++++-----
 src/webui/www/private/newcategory.html |  2 +-
 src/webui/www/private/rename.html      |  2 +-
 src/webui/www/private/setlocation.html |  2 +-
 src/webui/www/private/shareratio.html  |  2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/webui/www/private/index.html b/src/webui/www/private/index.html
index de6ccbb15..6b77ce9fe 100644
--- a/src/webui/www/private/index.html
+++ b/src/webui/www/private/index.html
@@ -19,13 +19,13 @@
         <script src="scripts/lib/excanvas-compressed.js"></script>
     <![endif]-->
     <script src="scripts/lib/mocha-yc.js"></script>
-    <script src="scripts/mocha-init.js"></script>
+    <script src="scripts/mocha-init.js?locale=${LANG}"></script>
     <script src="scripts/lib/clipboard.min.js"></script>
-    <script src="scripts/misc.js"></script>
+    <script src="scripts/misc.js?locale=${LANG}"></script>
     <script src="scripts/progressbar.js"></script>
-    <script src="scripts/dynamicTable.js"></script>
-    <script src="scripts/client.js"></script>
-    <script src="scripts/contextmenu.js"></script>
+    <script src="scripts/dynamicTable.js?locale=${LANG}"></script>
+    <script src="scripts/client.js?locale=${LANG}"></script>
+    <script src="scripts/contextmenu.js?locale=${LANG}"></script>
 </head>
 
 <body>
diff --git a/src/webui/www/private/newcategory.html b/src/webui/www/private/newcategory.html
index 57fd53490..273be490e 100644
--- a/src/webui/www/private/newcategory.html
+++ b/src/webui/www/private/newcategory.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="css/style.css" type="text/css" />
     <script src="scripts/lib/mootools-1.2-core-yc.js"></script>
     <script src="scripts/lib/mootools-1.2-more.js"></script>
-    <script src="scripts/misc.js"></script>
+    <script src="scripts/misc.js?locale=${LANG}"></script>
     <script>
         var newCategoryKeyboardEvents = new Keyboard({
             defaultEventType: 'keydown',
diff --git a/src/webui/www/private/rename.html b/src/webui/www/private/rename.html
index 7d573f58e..5e200d630 100644
--- a/src/webui/www/private/rename.html
+++ b/src/webui/www/private/rename.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="css/style.css" type="text/css" />
     <script src="scripts/lib/mootools-1.2-core-yc.js"></script>
     <script src="scripts/lib/mootools-1.2-more.js"></script>
-    <script src="scripts/misc.js"></script>
+    <script src="scripts/misc.js?locale=${LANG}"></script>
     <script>
         var renameKeyboardEvents = new Keyboard({
             defaultEventType: 'keydown',
diff --git a/src/webui/www/private/setlocation.html b/src/webui/www/private/setlocation.html
index a933407f1..455224fc2 100644
--- a/src/webui/www/private/setlocation.html
+++ b/src/webui/www/private/setlocation.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="css/style.css" type="text/css" />
     <script src="scripts/lib/mootools-1.2-core-yc.js"></script>
     <script src="scripts/lib/mootools-1.2-more.js"></script>
-    <script src="scripts/misc.js"></script>
+    <script src="scripts/misc.js?locale=${LANG}"></script>
     <script>
         var setLocationKeyboardEvents = new Keyboard({
             defaultEventType: 'keydown',
diff --git a/src/webui/www/private/shareratio.html b/src/webui/www/private/shareratio.html
index 4662972dc..2c867b0bd 100644
--- a/src/webui/www/private/shareratio.html
+++ b/src/webui/www/private/shareratio.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="css/style.css" type="text/css" />
     <script src="scripts/lib/mootools-1.2-core-yc.js"></script>
     <script src="scripts/lib/mootools-1.2-more.js"></script>
-    <script src="scripts/misc.js"></script>
+    <script src="scripts/misc.js?locale=${LANG}"></script>
     <script>
         var UseGlobalLimit = -2;
         var NoLimit = -1;