Merge pull request #433 from SchmidtDSE/main

Fast forward deploy.

Author: sampottinger

js/report_stage.js

@@ -196,7 +196,7 @@ class StagePresenter {
                     } else if (labelRaw === "Net Export (Waste)" && isGlobal) {
                         return "Waste Trade";
                     } else if (isGlobal) {
-                        return labelRaw.replace(" (Dom)", "");
+                        return labelRaw.replace(" (Dom ", " (");
                     } else {
                         return labelRaw;
                     }

js/strings.js

@@ -33,8 +33,8 @@ STRINGS.set("netImportsMT", "Net Import (Good/Mat)");
 STRINGS.set("netExportsMT", "Net Export (Good/Mat)");
 STRINGS.set("netWasteImportMT", "Net Import (Waste)");
 STRINGS.set("netWasteExportMT", "Net Export (Waste)");
-STRINGS.set("primaryProductionMT", "Virgin (Dom)");
-STRINGS.set("secondaryProductionMT", "Second (Dom)");
+STRINGS.set("primaryProductionMT", "Virgin (Dom Goods)");
+STRINGS.set("secondaryProductionMT", "Second (Dom Goods)");
 STRINGS.set("ghg", "GHG");
 
 STRINGS.set(DISPLAY_TYPES.amount, "Annual Million Metric Tons");

js/version.txt

@@ -1 +1 @@
-20240910
+20250425

service_worker_v2.js

@@ -54,8 +54,9 @@ const OLD_CACHES = [
     "GlobalPlasticsTool_20240907",
     "GlobalPlasticsTool_20240908",
     "GlobalPlasticsTool_20240909",
+    "GlobalPlasticsTool_20240910"
 ];
-const CACHE_NAME = "GlobalPlasticsTool_20240910";
+const CACHE_NAME = "GlobalPlasticsTool_20250425";
 const ESSENTIAL_FILES = [
     "/css/README.md",
     "/css/base.css",

template/base.html

@@ -1013,7 +1013,7 @@ <h2>Table of Contents</h2>
             <a class="tab-trigger" href="#about-privacy">Privacy</a> / <a class="tab-trigger" href="#about-license">Terms</a> / <a class="tab-trigger" href="https://github.com/SchmidtDSE/plastics-prototype">Open Source</a> / <a class="tab-trigger" href="#about-contact">Contact</a> / <a class="tab-trigger" href="#toc">Table of Contents</a> / <a class="tab-trigger" href="#settings">Accessibility</a> / <a class="tab-trigger" href="#about-publication">Cite Us</a>
         </footer>
 
-        <input type="hidden" id="version-number" value="20240910">
+        <input type="hidden" id="version-number" value="20250425">
 
         <dialog id="add-dialog">
             <form>