UK to US English to reduce mixed languages

lietu · May 8, 2021 · 6ad2f50 · 6ad2f50
1 parent 0e135f1
commit 6ad2f50
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 20 deletions.
diff --git a/build/chart_data_functions.py b/build/chart_data_functions.py
@@ -335,7 +335,7 @@ def get_tests_per_day_chart_data(json, dates):
 
 
 def get_cumulative_cases_chart_data(
-    json, recovered_list, deceased_list, hospitalised, intensive, on_ventilation, dates
+    json, recovered_list, deceased_list, hospitalized, intensive, on_ventilation, dates
 ):
     date_counts = defaultdict(int)
     andmed = get_tests_per_day_chart_data(json, dates)
@@ -374,7 +374,7 @@ def get_cumulative_cases_chart_data(
         "active": new_cases_14,
         "active100k": new_cases_14_per_100_k,
         "deceased": deceased_list,
-        "haiglas": hospitalised,
+        "haiglas": hospitalized,
         "intensive": intensive,
         "onventilation": on_ventilation,
     }

diff --git a/build/download_data.py b/build/download_data.py
@@ -99,7 +99,7 @@ def main():
 
     # Validate data from remote endpoints
     if not is_up_to_date(hospitalization, "LastLoadStatisticsDate"):
-        raise Exception("Hospitalisation data is not up-to-date")
+        raise Exception("Hospitalization data is not up-to-date")
 
     save_as_json(TEST_RESULTS_PATH, test_results)
     save_as_json(TEST_LOCATIONS_PATH, test_locations)

diff --git a/build/generate_data.py b/build/generate_data.py
@@ -79,12 +79,12 @@ def main():
     dates2 = pd.date_range(start=DATE_SETTINGS["dates2_start"], end=YESTERDAY_YMD)
     dates3 = pd.date_range(start=DATE_SETTINGS["dates3_start"], end=YESTERDAY_YMD)
 
-    # Set recovered, deceased, hospitalised and ICU time-series
+    # Set recovered, deceased, hospitalized and ICU time-series
     hospital = get_hospital_data(hospitalization, DATE_SETTINGS["dates2_start"])
     recovered = hospital["discharged"]
     manual_data["deceased"].update(deaths)
     deceased = list(manual_data["deceased"].values())
-    hospitalised = hospital["activehospitalizations"]
+    hospitalized = hospital["activehospitalizations"]
     # TODO: Based on cross-checking with the hospitalization data publishedby TEHIK, the data listed
     #       in the manual_data.json file with the field name "intensive" appears to show the number
     #       of patients on ventilation. We should fix the terminology and make sure that the intensive
@@ -114,7 +114,7 @@ def main():
         test_results,
         recovered,
         deceased,
-        hospitalised,
+        hospitalized,
         intensive,
         on_ventilation,
         dates2,
@@ -182,7 +182,7 @@ def main():
         "updatedOn": TODAY_DMYHM,
         "confirmedCasesNumber": str(n_confirmed_cases),
         # TODO: For consistency, we should include the change in the number of confirmed cases as well.
-        "hospitalisedNumber": str(hospital["activehospitalizations"][-1]),
+        "hospitalizedNumber": str(hospital["activehospitalizations"][-1]),
         "hospitalChanged": str(
             hospital["activehospitalizations"][-1]
             - hospital["activehospitalizations"][-2]

diff --git a/koroonakaart/src/components/Statsbar.vue b/koroonakaart/src/components/Statsbar.vue
@@ -80,19 +80,19 @@
     <b-row>
       <b-col class="statsbar-item" md>
         <div class="statsbar-heading">
-          <h5>{{ $t("hospitalised") }}</h5>
+          <h5>{{ $t("hospitalized") }}</h5>
         </div>
-        <h1>{{ hospitalisedNumber | formatNumber(currentLocale) }}</h1>
+        <h1>{{ hospitalizedNumber | formatNumber(currentLocale) }}</h1>
         <h5
           :class="
-            rawHospitalisedChanged === 0
+            rawHospitalizedChanged === 0
               ? 'neutral'
-              : rawHospitalisedChanged > 0
+              : rawHospitalizedChanged > 0
               ? 'positive'
               : 'negative'
           "
         >
-          {{ hospitalisedChanged | formatNumber(currentLocale) }}
+          {{ hospitalizedChanged | formatNumber(currentLocale) }}
         </h5>
       </b-col>
 
@@ -219,7 +219,7 @@ export default {
         data.dataCumulativeCasesChart.active100k[
           data.dataCumulativeCasesChart.active100k.length - 1
         ],
-      hospitalisedNumber:
+      hospitalizedNumber:
         data.hospital.activehospitalizations[
           data.hospital.activehospitalizations.length - 1
         ],
@@ -251,7 +251,7 @@ export default {
         ).toFixed(2)
       ),
       rawDeceasedChanged: Number(data.deceasedChanged),
-      rawHospitalisedChanged: Number(data.hospitalChanged),
+      rawHospitalizedChanged: Number(data.hospitalChanged),
       rawRecoveredChanged: Number(data.recoveredChanged),
       rawTestsChanged: Number(
         data.dataCumulativeTestsChart.testsAdministered[
@@ -269,7 +269,7 @@ export default {
           data.dataNewCasesPerDayChart.confirmedCases.length - 1
         ]
       ),
-      hospitalisedChanged: positiveSign(data.hospitalChanged),
+      hospitalizedChanged: positiveSign(data.hospitalChanged),
       recoveredChanged: positiveSign(data.recoveredChanged),
       testsChanged: positiveSign(
         data.dataCumulativeTestsChart.testsAdministered[

diff --git a/koroonakaart/src/components/charts/CumulativeCasesChart.vue b/koroonakaart/src/components/charts/CumulativeCasesChart.vue
@@ -261,7 +261,7 @@ export default {
             },
           },
           {
-            name: this.$t("hospitalised"),
+            name: this.$t("hospitalized"),
             color: "#7cb5ec",
             pointStart: Date.parse(data.dates2[0]), // data.dates2 first entry to UTC
             pointInterval: 24 * 3600 * 1000, // one day
@@ -347,7 +347,7 @@ export default {
       this.chartOptions.series[1].name = this.$t("recovered");
       this.chartOptions.series[2].name = this.$t("active");
       this.chartOptions.series[3].name = this.$t("deceased");
-      this.chartOptions.series[4].name = this.$t("hospitalised");
+      this.chartOptions.series[4].name = this.$t("hospitalized");
       this.chartOptions.series[5].name = this.$t("intensive");
       this.chartOptions.series[6].name = this.$t("onventilation");
       this.chartOptions.exporting.buttons.customButton.text = this.$t("linear");

diff --git a/koroonakaart/src/locales/en.json b/koroonakaart/src/locales/en.json
@@ -27,7 +27,7 @@
   "distributionOfAgeSexTests": "Distribution of tests by age and sex",
   "distributionOfPositiveTests": "Distribution of tests by age",
   "genderChart": "Positive and negative tests by sex",
-  "hospitalised": "In hospital",
+  "hospitalized": "In hospital",
   "intensive": "In intensive care",
   "onventilation": "On ventilation",
   "method": "Change in method",

diff --git a/koroonakaart/src/locales/et.json b/koroonakaart/src/locales/et.json
@@ -27,7 +27,7 @@
   "distributionOfAgeSexTests": "Testide vanuseline ja sooline jaotus",
   "distributionOfPositiveTests": "Testide vanuseline jaotus",
   "genderChart": "Positiivsete ja negatiivsete testide sooline jaotus",
-  "hospitalised": "Haiglaravil",
+  "hospitalized": "Haiglaravil",
   "intensive": "Intensiivravil",
   "onventilation": "Juhitaval hingamisel",
   "method": "Muutus metoodikas",

diff --git a/koroonakaart/src/locales/ru.json b/koroonakaart/src/locales/ru.json
@@ -27,7 +27,7 @@
   "distributionOfAgeSexTests": "Распределение тестов по возрасту",
   "distributionOfPositiveTests": "Распределение тестов по возрасту",
   "genderChart": "Положительные и отрицательные тесты по распределение полов",
-  "hospitalised": "Госпитализированных",
+  "hospitalized": "Госпитализированных",
   "intensive": "В интенсивнoй терапии",
   "onventilation": "На искусственной вентиляции легких",
   "method": "Изменение в методике",