More replacing string concatenation with template interpolation

Author: Heliodex

twisted/common/templates/base.html

@@ -16,6 +16,6 @@
     <script>
         // Timezone settings
         const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone; // e.g. "America/New_York"
-        document.cookie = "django_timezone=" + timezone;
+        document.cookie = `django_timezone=${timezone}`;
     </script>
 </html>

twisted/twisted_site/templates/client/dashboard.html

@@ -237,7 +237,8 @@
             const container = document.getElementById("windows-container");
             const clone = template.content.cloneNode(true);
             const win = clone.querySelector(".window");
-            const id = "win-" + ++windowCounter;
+            windowCounter++
+            const id = `win-${windowCounter}`;
             win.dataset.winId = id;
 
             win.querySelector(".title-bar-text").textContent = title;
@@ -250,13 +251,13 @@
             if (y === null) y = Math.random() * (window.innerHeight - w);
 
 
-            win.style.left = x + "px";
-            win.style.top = y + "px";
-            win.style.width = w + "px";
-            win.style.height = h + "px";
+            win.style.left = `${x}px`;
+            win.style.top = `${y}px`;
+            win.style.width = `${w}px`;
+            win.style.height = `${h}px`;
             container.appendChild(clone);
 
-            const realWin = container.querySelector('[data-win-id="' + id + '"]');
+            const realWin = container.querySelector(`[data-win-id="${id}"]`);
 
             // Taskbar button with round png icon
             const taskbutton_template = document.getElementById("taskbutton-template");

twisted/twisted_site/templates/client/osbase.html

@@ -30,6 +30,6 @@
     <script>
         // Timezone settings
         const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone; // e.g. "America/New_York"
-        document.cookie = "django_timezone=" + timezone;
+        document.cookie = `django_timezone=${timezone}`;
     </script>
 </html>

twisted/twisted_site/templates/cotton/base.html

@@ -60,7 +60,7 @@
                         window.addEventListener('load', (event) => {
                             message = document.querySelector('#djangomessage{{ forloop.counter }}').dataset.message
                             setTimeout(() => {
-                                console.log("sending message " + message + "...")
+                                console.log(`sending message ${message}...`)
                                 window.dispatchEvent(new CustomEvent('toast', {
                                     detail: {
                                         message: message,