From a8ae79b96307ef3cfc68ec039d83962fdeb601cd Mon Sep 17 00:00:00 2001 From: A Samuel Pottinger Date: Fri, 25 Apr 2025 18:35:01 +0000 Subject: [PATCH 1/2] Clarify that start of life is goods on details tab. Clarify that start of life is goods on details tab (after resin trade, with additives). --- js/report_stage.js | 2 +- js/strings.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/js/report_stage.js b/js/report_stage.js index 334f02ec..008ab5ad 100644 --- a/js/report_stage.js +++ b/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; } diff --git a/js/strings.js b/js/strings.js index 37156057..27e4f1ce 100644 --- a/js/strings.js +++ b/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"); From d37650a12c3602da693d0e837d65eefcaaa72b1a Mon Sep 17 00:00:00 2001 From: A Samuel Pottinger Date: Fri, 25 Apr 2025 18:37:38 +0000 Subject: [PATCH 2/2] Bump cache. --- js/version.txt | 2 +- service_worker_v2.js | 3 ++- template/base.html | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/js/version.txt b/js/version.txt index d646852d..8413311e 100644 --- a/js/version.txt +++ b/js/version.txt @@ -1 +1 @@ -20240910 \ No newline at end of file +20250425 \ No newline at end of file diff --git a/service_worker_v2.js b/service_worker_v2.js index d53844bc..f0500209 100644 --- a/service_worker_v2.js +++ b/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", diff --git a/template/base.html b/template/base.html index 8a06215e..947aac01 100644 --- a/template/base.html +++ b/template/base.html @@ -1013,7 +1013,7 @@

Table of Contents

Privacy / Terms / Open Source / Contact / Table of Contents / Accessibility / Cite Us - +