use inputs for BST just in case there's an error somewhere in the code

rust-scicomp · Jun 27, 2023 · 4e8f074 · 4e8f074
1 parent 3261a0c
commit 4e8f074
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 9 deletions.
diff --git a/files/timezones.js b/files/timezones.js
@@ -123,21 +123,33 @@ function update_timezones(){
             else if (dth == 2 ||  dth == 22) {dth += "nd"}
             else {dth += "th"}
 
-            time = time.replace(/\{YEAR\}/g, date.getUTCFullYear());
-            time = time.replace(/\{MONTH\}/g, date.getUTCMonth());
+            if (zone == "BST") {
+                time = time.replace(/\{YEAR\}/g, es[i].dataset["year"]);
+                time = time.replace(/\{MONTH\}/g, es[i].dataset["month"]);
+                time = time.replace(/\{DATE\}/g, es[i].dataset["day"]);
+                time = time.replace(/\{HOUR\}/g, es[i].dataset["hour"]);
+                time = time.replace(/\{0HOUR\}/g, zeropad(es[i].dataset["hour"], 2));
+                time = time.replace(/\{24 HOUR\}/g, es[i].dataset["hour"]);
+                time = time.replace(/\{24 0HOUR\}/g, zeropad(es[i].dataset["hour"], 2));
+                time = time.replace(/\{MINUTE\}/g, zeropad(es[i].dataset["minute"], 2));
+            } else {
+                time = time.replace(/\{YEAR\}/g, date.getUTCFullYear());
+                time = time.replace(/\{MONTH\}/g, date.getUTCMonth());
+                time = time.replace(/\{DATE\}/g, date.getUTCDate());
+                time = time.replace(/\{HOUR\}/g, date.getUTCHours());
+                time = time.replace(/\{0HOUR\}/g, zeropad(date.getUTCHours(), 2));
+                time = time.replace(/\{24 HOUR\}/g, date.getUTCHours());
+                time = time.replace(/\{24 0HOUR\}/g, zeropad(date.getUTCHours(), 2));
+                time = time.replace(/\{MINUTE\}/g, zeropad(date.getUTCMinutes(), 2));
+            }
+
             time = time.replace(/\{MONTHNAME\}/g, months[date.getUTCMonth()]);
-            time = time.replace(/\{DATE\}/g, date.getUTCDate());
             time = time.replace(/\{DATETH\}/g, dth);
             time = time.replace(/\{WEEKDAY\}/g, days[date.getUTCDay()]);
             time = time.replace(/\{AM\/PM\}/g, ampm);
             time = time.replace(/\{am\/pm\}/g, ampm.toLowerCase());
-            time = time.replace(/\{HOUR\}/g, date.getUTCHours());
-            time = time.replace(/\{0HOUR\}/g, zeropad(date.getUTCHours(), 2));
-            time = time.replace(/\{24 HOUR\}/g, date.getUTCHours());
-            time = time.replace(/\{24 0HOUR\}/g, zeropad(date.getUTCHours(), 2));
             time = time.replace(/\{12 HOUR\}/g, h12);
             time = time.replace(/\{12 0HOUR\}/g, zeropad(h12, 2));
-            time = time.replace(/\{MINUTE\}/g, zeropad(date.getUTCMinutes(), 2));
             if (date.getUTCMinutes() == 0)
             {
                 time = time.replace(/\{\?:MINUTE\}/g, "");

diff --git a/template/intro.html b/template/intro.html
@@ -29,7 +29,7 @@
 <meta name="msapplication-TileImage" content="/icons/ms-icon-144x144.png">
 <script id="MathJax-script" async src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script>
 <script src="https://kit.fontawesome.com/5506de0e1b.js" crossorigin="anonymous"></script>
-<script type='text/javascript' src='/timezones.js?v=2023-06-23'></script>
+<script type='text/javascript' src='/timezones.js?v=2023-06-27'></script>
 <meta name="theme-color" content="#ffffff">
 </head>
 <body>