From f4d10ff3533b69e2a08e736d1625ee3f0137dde7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Radenac?=
 <47008408+clem3109@users.noreply.github.com>
Date: Thu, 21 Jul 2022 13:15:11 +0200
Subject: [PATCH 1/6] Update fr-FR.json

Some french language updates
---
 lang/fr-FR.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lang/fr-FR.json b/lang/fr-FR.json
index 8655eefc..04c2f4e8 100644
--- a/lang/fr-FR.json
+++ b/lang/fr-FR.json
@@ -37,7 +37,7 @@
   "label.more": "Plus",
   "label.name": "Nom",
   "label.new-password": "Nouveau mot de passe",
-  "label.none": "None",
+  "label.none": "Aucun·e",
   "label.owner": "Propriétaire",
   "label.password": "Mot de passe",
   "label.passwords-dont-match": "Les mots de passe ne correspondent pas",
@@ -104,7 +104,7 @@
   "metrics.page-views": "Pages vues",
   "metrics.pages": "Pages",
   "metrics.referrers": "Sources",
-  "metrics.screens": "Screens",
+  "metrics.screens": "Tailles d'écran",
   "metrics.unique-visitors": "Visiteurs uniques",
   "metrics.views": "Vues",
   "metrics.visitors": "Visiteurs"

From e949da347fe561d78317fa81e3d4312cabb5030e Mon Sep 17 00:00:00 2001
From: Jens Pots <jens@jenspots.com>
Date: Thu, 21 Jul 2022 13:49:48 +0200
Subject: [PATCH 2/6] Update nl-NL.json

Some missing translations have been added.
---
 lang/nl-NL.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lang/nl-NL.json b/lang/nl-NL.json
index fff2cea6..888d62f2 100644
--- a/lang/nl-NL.json
+++ b/lang/nl-NL.json
@@ -37,7 +37,7 @@
   "label.more": "Toon meer",
   "label.name": "Naam",
   "label.new-password": "Nieuw wachtwoord",
-  "label.none": "None",
+  "label.none": "Geen",
   "label.owner": "Eigenaar",
   "label.password": "Wachtwoord",
   "label.passwords-dont-match": "Wachtwoorden komen niet overeen",
@@ -79,7 +79,7 @@
   "message.no-websites-configured": "Je hebt geen websites ingesteld.",
   "message.page-not-found": "Pagina niet gevonden.",
   "message.powered-by": "mogelijk gemaakt door {name}",
-  "message.reset-warning": "All statistics for this website will be deleted, but your tracking code will remain intact.",
+  "message.reset-warning": "Alle bijhorende statistieken van deze website worden verwijderd, maar jouw volgcode blijft gelden.",
   "message.save-success": "Opslaan succesvol.",
   "message.share-url": "Met deze URL kan {target} openbaar gedeeld worden.",
   "message.toggle-charts": "Grafieken tonen/verbergen",
@@ -104,7 +104,7 @@
   "metrics.page-views": "Paginaweergaven",
   "metrics.pages": "Pagina's",
   "metrics.referrers": "Verwijzers",
-  "metrics.screens": "Screens",
+  "metrics.screens": "Schermen",
   "metrics.unique-visitors": "Unieke bezoekers",
   "metrics.views": "Weergaven",
   "metrics.visitors": "Bezoekers"

From 250cdce306660ce5b46a0684c65e4605102ef0f3 Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Thu, 21 Jul 2022 13:21:33 -0700
Subject: [PATCH 3/6] Reverted getDateQuery logic.

---
 lib/queries.js                                 | 16 ++--------------
 queries/analytics/event/getEventMetrics.js     |  4 ++--
 queries/analytics/pageview/getPageviewStats.js |  4 ++--
 3 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/lib/queries.js b/lib/queries.js
index 4317d5f4..b44487c0 100644
--- a/lib/queries.js
+++ b/lib/queries.js
@@ -14,24 +14,12 @@ export function getDatabase() {
   return type;
 }
 
-export function getDateStringQuery(data, unit) {
-  const db = getDatabase();
-
-  if (db === POSTGRESQL) {
-    return `to_char(${data}, '${POSTGRESQL_DATE_FORMATS[unit]}')`;
-  }
-
-  if (db === MYSQL) {
-    return `DATE_FORMAT(${data}, '${MYSQL_DATE_FORMATS[unit]}')`;
-  }
-}
-
 export function getDateQuery(field, unit, timezone) {
   const db = getDatabase();
 
   if (db === POSTGRESQL) {
     if (timezone) {
-      return `date_trunc('${unit}', ${field} at time zone '${timezone}')`;
+      return `to_char(date_trunc('${unit}', ${field} at time zone '${timezone}'), '${POSTGRESQL_DATE_FORMATS[unit]}')`;
     }
     return `date_trunc('${unit}', ${field})`;
   }
@@ -40,7 +28,7 @@ export function getDateQuery(field, unit, timezone) {
     if (timezone) {
       const tz = moment.tz(timezone).format('Z');
 
-      return `convert_tz(${field},'+00:00','${tz}')`;
+      return `date_format(convert_tz(${field},'+00:00','${tz}', '${MYSQL_DATE_FORMATS[unit]}')`;
     }
 
     return `${field}`;
diff --git a/queries/analytics/event/getEventMetrics.js b/queries/analytics/event/getEventMetrics.js
index 1bbc3cac..b0ec87b4 100644
--- a/queries/analytics/event/getEventMetrics.js
+++ b/queries/analytics/event/getEventMetrics.js
@@ -1,4 +1,4 @@
-import { getDateQuery, getDateStringQuery, getFilterQuery, rawQuery } from 'lib/queries';
+import { getDateQuery, getFilterQuery, rawQuery } from 'lib/queries';
 
 export function getEventMetrics(
   website_id,
@@ -14,7 +14,7 @@ export function getEventMetrics(
     `
     select
       event_value x,
-      ${getDateStringQuery(getDateQuery('created_at', unit, timezone), unit)} t,
+      ${getDateQuery('created_at', unit, timezone)} t,
       count(*) y
     from event
     where website_id=$1
diff --git a/queries/analytics/pageview/getPageviewStats.js b/queries/analytics/pageview/getPageviewStats.js
index 1ddcd6f8..c4b9ef23 100644
--- a/queries/analytics/pageview/getPageviewStats.js
+++ b/queries/analytics/pageview/getPageviewStats.js
@@ -1,4 +1,4 @@
-import { parseFilters, rawQuery, getDateQuery, getDateStringQuery } from 'lib/queries';
+import { parseFilters, rawQuery, getDateQuery } from 'lib/queries';
 
 export function getPageviewStats(
   website_id,
@@ -20,7 +20,7 @@ export function getPageviewStats(
   return rawQuery(
     `
     select
-      ${getDateStringQuery('g.t', unit)} as t, 
+      g.t as t, 
       g.y as y
     from
       (select ${getDateQuery('pageview.created_at', unit, timezone)} t,

From c47b244dc505c282648b75a69eb1b744a4786b57 Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Thu, 21 Jul 2022 19:38:24 -0700
Subject: [PATCH 4/6] Fix tracker build for COLLECT_API_ENDPOINT.

---
 rollup.tracker.config.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/rollup.tracker.config.js b/rollup.tracker.config.js
index 9af92092..5bc09610 100644
--- a/rollup.tracker.config.js
+++ b/rollup.tracker.config.js
@@ -1,3 +1,4 @@
+import 'dotenv/config';
 import buble from '@rollup/plugin-buble';
 import replace from '@rollup/plugin-replace';
 import { terser } from 'rollup-plugin-terser';
@@ -12,6 +13,7 @@ export default {
     replace({
       '/api/collect': process.env.COLLECT_API_ENDPOINT || '/api/collect',
       delimiters: ['', ''],
+      preventAssignment: true,
     }),
     buble({ objectAssign: true }),
     terser({ compress: { evaluate: false } }),

From 34bdea8a4f37fdf225c1221c63b1536bab866c13 Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Thu, 21 Jul 2022 21:04:04 -0700
Subject: [PATCH 5/6] Update language bundles.

---
 public/intl/messages/ar-SA.json | 2 +-
 public/intl/messages/ca-ES.json | 2 +-
 public/intl/messages/cs-CZ.json | 2 +-
 public/intl/messages/da-DK.json | 2 +-
 public/intl/messages/de-DE.json | 2 +-
 public/intl/messages/el-GR.json | 2 +-
 public/intl/messages/es-MX.json | 2 +-
 public/intl/messages/fa-IR.json | 2 +-
 public/intl/messages/fi-FI.json | 2 +-
 public/intl/messages/fo-FO.json | 2 +-
 public/intl/messages/fr-FR.json | 6 +++---
 public/intl/messages/ga-ES.json | 2 +-
 public/intl/messages/he-IL.json | 2 +-
 public/intl/messages/hi-IN.json | 2 +-
 public/intl/messages/hu-HU.json | 2 +-
 public/intl/messages/id-ID.json | 2 +-
 public/intl/messages/it-IT.json | 2 +-
 public/intl/messages/ja-JP.json | 2 +-
 public/intl/messages/ko-KR.json | 2 +-
 public/intl/messages/lt-LT.json | 2 +-
 public/intl/messages/mn-MN.json | 2 +-
 public/intl/messages/ms-MY.json | 2 +-
 public/intl/messages/nb-NO.json | 2 +-
 public/intl/messages/nl-NL.json | 8 ++++----
 public/intl/messages/pl-PL.json | 2 +-
 public/intl/messages/pt-BR.json | 2 +-
 public/intl/messages/pt-PT.json | 2 +-
 public/intl/messages/ro-RO.json | 2 +-
 public/intl/messages/ru-RU.json | 2 +-
 public/intl/messages/sk-SK.json | 2 +-
 public/intl/messages/sl-SI.json | 2 +-
 public/intl/messages/sv-SE.json | 2 +-
 public/intl/messages/ta-IN.json | 2 +-
 public/intl/messages/tr-TR.json | 2 +-
 public/intl/messages/uk-UA.json | 2 +-
 public/intl/messages/ur-PK.json | 2 +-
 public/intl/messages/vi-VN.json | 2 +-
 public/intl/messages/zh-CN.json | 2 +-
 public/intl/messages/zh-TW.json | 2 +-
 39 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/public/intl/messages/ar-SA.json b/public/intl/messages/ar-SA.json
index 39942898..5fd596e1 100644
--- a/public/intl/messages/ar-SA.json
+++ b/public/intl/messages/ar-SA.json
@@ -734,7 +734,7 @@
   "metrics.filter.combined": [
     {
       "type": 0,
-      "value": "Combined"
+      "value": "مجمعة"
     }
   ],
   "metrics.filter.raw": [
diff --git a/public/intl/messages/ca-ES.json b/public/intl/messages/ca-ES.json
index eaccffe5..6a0a85d4 100644
--- a/public/intl/messages/ca-ES.json
+++ b/public/intl/messages/ca-ES.json
@@ -734,7 +734,7 @@
   "metrics.filter.combined": [
     {
       "type": 0,
-      "value": "Combined"
+      "value": "Combinat"
     }
   ],
   "metrics.filter.raw": [
diff --git a/public/intl/messages/cs-CZ.json b/public/intl/messages/cs-CZ.json
index 8b07a05a..967261ab 100644
--- a/public/intl/messages/cs-CZ.json
+++ b/public/intl/messages/cs-CZ.json
@@ -734,7 +734,7 @@
   "metrics.filter.combined": [
     {
       "type": 0,
-      "value": "Combined"
+      "value": "Kombinace"
     }
   ],
   "metrics.filter.raw": [
diff --git a/public/intl/messages/da-DK.json b/public/intl/messages/da-DK.json
index 49fad782..9a478456 100644
--- a/public/intl/messages/da-DK.json
+++ b/public/intl/messages/da-DK.json
@@ -734,7 +734,7 @@
   "metrics.filter.combined": [
     {
       "type": 0,
-      "value": "Combined"
+      "value": "Kombineret"
     }
   ],
   "metrics.filter.raw": [
diff --git a/public/intl/messages/de-DE.json b/public/intl/messages/de-DE.json
index 63feeaaf..a332fd5f 100644
--- a/public/intl/messages/de-DE.json
+++ b/public/intl/messages/de-DE.json
@@ -734,7 +734,7 @@
   "metrics.filter.combined": [
     {
       "type": 0,
-      "value": "Combined"
+      "value": "Kombiniert"
     }
   ],
   "metrics.filter.raw": [
diff --git a/public/intl/messages/el-GR.json b/public/intl/messages/el-GR.json
index f570d120..77ded169 100644
--- a/public/intl/messages/el-GR.json
+++ b/public/intl/messages/el-GR.json
@@ -734,7 +734,7 @@
   "metrics.filter.combined": [
     {
       "type": 0,
-      "value": "Combined"
+      "value": "Σε συνδυασμό"
     }
   ],
   "metrics.filter.raw": [
diff --git a/public/intl/messages/es-MX.json b/public/intl/messages/es-MX.json
index be8ddb34..c2d82805 100644
--- a/public/intl/messages/es-MX.json
+++ b/public/intl/messages/es-MX.json
@@ -734,7 +734,7 @@
   "metrics.filter.combined": [
     {
       "type": 0,
-      "value": "Combined"
+      "value": "Combinado"
     }
   ],
   "metrics.filter.raw": [
diff --git a/public/intl/messages/fa-IR.json b/public/intl/messages/fa-IR.json
index e29343ef..ed470e75 100644
--- a/public/intl/messages/fa-IR.json
+++ b/public/intl/messages/fa-IR.json
@@ -718,7 +718,7 @@
   "metrics.filter.combined": [
     {
       "type": 0,
-      "value": "Combined"
+      "value": "ترکیب شده"
     }
   ],
   "metrics.filter.raw": [
diff --git a/public/intl/messages/fi-FI.json b/public/intl/messages/fi-FI.json
index 2b4ebd01..a2010b5a 100644
--- a/public/intl/messages/fi-FI.json
+++ b/public/intl/messages/fi-FI.json
@@ -734,7 +734,7 @@
   "metrics.filter.combined": [
     {
       "type": 0,
-      "value": "Combined"
+      "value": "Yhdistetty"
     }
   ],
   "metrics.filter.raw": [
diff --git a/public/intl/messages/fo-FO.json b/public/intl/messages/fo-FO.json
index ca909f25..43da4b36 100644
--- a/public/intl/messages/fo-FO.json
+++ b/public/intl/messages/fo-FO.json
@@ -734,7 +734,7 @@
   "metrics.filter.combined": [
     {
       "type": 0,
-      "value": "Combined"
+      "value": "Samansett"
     }
   ],
   "metrics.filter.raw": [
diff --git a/public/intl/messages/fr-FR.json b/public/intl/messages/fr-FR.json
index f408278f..7368fddf 100644
--- a/public/intl/messages/fr-FR.json
+++ b/public/intl/messages/fr-FR.json
@@ -242,7 +242,7 @@
   "label.none": [
     {
       "type": 0,
-      "value": "None"
+      "value": "Aucun·e"
     }
   ],
   "label.owner": [
@@ -730,7 +730,7 @@
   "metrics.filter.combined": [
     {
       "type": 0,
-      "value": "Combined"
+      "value": "Combiné"
     }
   ],
   "metrics.filter.raw": [
@@ -772,7 +772,7 @@
   "metrics.screens": [
     {
       "type": 0,
-      "value": "Screens"
+      "value": "Tailles d'écran"
     }
   ],
   "metrics.unique-visitors": [
diff --git a/public/intl/messages/ga-ES.json b/public/intl/messages/ga-ES.json
index 4c692742..67bfff79 100644
--- a/public/intl/messages/ga-ES.json
+++ b/public/intl/messages/ga-ES.json
@@ -734,7 +734,7 @@
   "metrics.filter.combined": [
     {
       "type": 0,
-      "value": "Combined"
+      "value": "Combinado"
     }
   ],
   "metrics.filter.raw": [
diff --git a/public/intl/messages/he-IL.json b/public/intl/messages/he-IL.json
index 46f6c04d..315bc718 100644
--- a/public/intl/messages/he-IL.json
+++ b/public/intl/messages/he-IL.json
@@ -714,7 +714,7 @@
   "metrics.filter.combined": [
     {
       "type": 0,
-      "value": "Combined"
+      "value": "משותף"
     }
   ],
   "metrics.filter.raw": [
diff --git a/public/intl/messages/hi-IN.json b/public/intl/messages/hi-IN.json
index cd81e789..f7475741 100644
--- a/public/intl/messages/hi-IN.json
+++ b/public/intl/messages/hi-IN.json
@@ -722,7 +722,7 @@
   "metrics.filter.combined": [
     {
       "type": 0,
-      "value": "Combined"
+      "value": "संयुक्त"
     }
   ],
   "metrics.filter.raw": [
diff --git a/public/intl/messages/hu-HU.json b/public/intl/messages/hu-HU.json
index 83ba4421..d66b060a 100644
--- a/public/intl/messages/hu-HU.json
+++ b/public/intl/messages/hu-HU.json
@@ -734,7 +734,7 @@
   "metrics.filter.combined": [
     {
       "type": 0,
-      "value": "Combined"
+      "value": "Összevont"
     }
   ],
   "metrics.filter.raw": [
diff --git a/public/intl/messages/id-ID.json b/public/intl/messages/id-ID.json
index db251adc..e6508c7b 100644
--- a/public/intl/messages/id-ID.json
+++ b/public/intl/messages/id-ID.json
@@ -702,7 +702,7 @@
   "metrics.filter.combined": [
     {
       "type": 0,
-      "value": "Combined"
+      "value": "Gabungan"
     }
   ],
   "metrics.filter.raw": [
diff --git a/public/intl/messages/it-IT.json b/public/intl/messages/it-IT.json
index 61033a8d..908b4953 100644
--- a/public/intl/messages/it-IT.json
+++ b/public/intl/messages/it-IT.json
@@ -738,7 +738,7 @@
   "metrics.filter.combined": [
     {
       "type": 0,
-      "value": "Combined"
+      "value": "Aggregati"
     }
   ],
   "metrics.filter.raw": [
diff --git a/public/intl/messages/ja-JP.json b/public/intl/messages/ja-JP.json
index 6d3083f2..f44adea4 100644
--- a/public/intl/messages/ja-JP.json
+++ b/public/intl/messages/ja-JP.json
@@ -706,7 +706,7 @@
   "metrics.filter.combined": [
     {
       "type": 0,
-      "value": "Combined"
+      "value": "パスまで"
     }
   ],
   "metrics.filter.raw": [
diff --git a/public/intl/messages/ko-KR.json b/public/intl/messages/ko-KR.json
index 7354f9bb..7702d1b8 100644
--- a/public/intl/messages/ko-KR.json
+++ b/public/intl/messages/ko-KR.json
@@ -706,7 +706,7 @@
   "metrics.filter.combined": [
     {
       "type": 0,
-      "value": "Combined"
+      "value": "합쳐서 보기"
     }
   ],
   "metrics.filter.raw": [
diff --git a/public/intl/messages/lt-LT.json b/public/intl/messages/lt-LT.json
index fade699d..74ca9861 100644
--- a/public/intl/messages/lt-LT.json
+++ b/public/intl/messages/lt-LT.json
@@ -859,7 +859,7 @@
   "metrics.filter.combined": [
     {
       "type": 0,
-      "value": "Combined"
+      "value": "Kombinuoti"
     }
   ],
   "metrics.filter.raw": [
diff --git a/public/intl/messages/mn-MN.json b/public/intl/messages/mn-MN.json
index 584fe32c..0f8a7a68 100644
--- a/public/intl/messages/mn-MN.json
+++ b/public/intl/messages/mn-MN.json
@@ -734,7 +734,7 @@
   "metrics.filter.combined": [
     {
       "type": 0,
-      "value": "Combined"
+      "value": "Нэгтгэсэн"
     }
   ],
   "metrics.filter.raw": [
diff --git a/public/intl/messages/ms-MY.json b/public/intl/messages/ms-MY.json
index 29d025ef..c0c758ef 100644
--- a/public/intl/messages/ms-MY.json
+++ b/public/intl/messages/ms-MY.json
@@ -726,7 +726,7 @@
   "metrics.filter.combined": [
     {
       "type": 0,
-      "value": "Combined"
+      "value": "Digabungkan"
     }
   ],
   "metrics.filter.raw": [
diff --git a/public/intl/messages/nb-NO.json b/public/intl/messages/nb-NO.json
index 860e0133..6477160f 100644
--- a/public/intl/messages/nb-NO.json
+++ b/public/intl/messages/nb-NO.json
@@ -738,7 +738,7 @@
   "metrics.filter.combined": [
     {
       "type": 0,
-      "value": "Combined"
+      "value": "Kombinert"
     }
   ],
   "metrics.filter.raw": [
diff --git a/public/intl/messages/nl-NL.json b/public/intl/messages/nl-NL.json
index afd2d1d5..2151139d 100644
--- a/public/intl/messages/nl-NL.json
+++ b/public/intl/messages/nl-NL.json
@@ -250,7 +250,7 @@
   "label.none": [
     {
       "type": 0,
-      "value": "None"
+      "value": "Geen"
     }
   ],
   "label.owner": [
@@ -586,7 +586,7 @@
   "message.reset-warning": [
     {
       "type": 0,
-      "value": "All statistics for this website will be deleted, but your tracking code will remain intact."
+      "value": "Alle bijhorende statistieken van deze website worden verwijderd, maar jouw volgcode blijft gelden."
     }
   ],
   "message.save-success": [
@@ -734,7 +734,7 @@
   "metrics.filter.combined": [
     {
       "type": 0,
-      "value": "Combined"
+      "value": "Gecombineerd"
     }
   ],
   "metrics.filter.raw": [
@@ -776,7 +776,7 @@
   "metrics.screens": [
     {
       "type": 0,
-      "value": "Screens"
+      "value": "Schermen"
     }
   ],
   "metrics.unique-visitors": [
diff --git a/public/intl/messages/pl-PL.json b/public/intl/messages/pl-PL.json
index 7d85c96c..17273722 100644
--- a/public/intl/messages/pl-PL.json
+++ b/public/intl/messages/pl-PL.json
@@ -734,7 +734,7 @@
   "metrics.filter.combined": [
     {
       "type": 0,
-      "value": "Combined"
+      "value": "Połączone"
     }
   ],
   "metrics.filter.raw": [
diff --git a/public/intl/messages/pt-BR.json b/public/intl/messages/pt-BR.json
index f723474e..6e3c5276 100644
--- a/public/intl/messages/pt-BR.json
+++ b/public/intl/messages/pt-BR.json
@@ -738,7 +738,7 @@
   "metrics.filter.combined": [
     {
       "type": 0,
-      "value": "Combined"
+      "value": "Combinado"
     }
   ],
   "metrics.filter.raw": [
diff --git a/public/intl/messages/pt-PT.json b/public/intl/messages/pt-PT.json
index e50354dc..7c4aa48c 100644
--- a/public/intl/messages/pt-PT.json
+++ b/public/intl/messages/pt-PT.json
@@ -738,7 +738,7 @@
   "metrics.filter.combined": [
     {
       "type": 0,
-      "value": "Combined"
+      "value": "Combinado"
     }
   ],
   "metrics.filter.raw": [
diff --git a/public/intl/messages/ro-RO.json b/public/intl/messages/ro-RO.json
index 9dbda703..ff9b4914 100644
--- a/public/intl/messages/ro-RO.json
+++ b/public/intl/messages/ro-RO.json
@@ -734,7 +734,7 @@
   "metrics.filter.combined": [
     {
       "type": 0,
-      "value": "Combined"
+      "value": "Combinat"
     }
   ],
   "metrics.filter.raw": [
diff --git a/public/intl/messages/ru-RU.json b/public/intl/messages/ru-RU.json
index 6a1af3c0..a9aa6300 100644
--- a/public/intl/messages/ru-RU.json
+++ b/public/intl/messages/ru-RU.json
@@ -706,7 +706,7 @@
   "metrics.filter.combined": [
     {
       "type": 0,
-      "value": "Combined"
+      "value": "Объединенные"
     }
   ],
   "metrics.filter.raw": [
diff --git a/public/intl/messages/sk-SK.json b/public/intl/messages/sk-SK.json
index ae4c1517..99fde365 100644
--- a/public/intl/messages/sk-SK.json
+++ b/public/intl/messages/sk-SK.json
@@ -734,7 +734,7 @@
   "metrics.filter.combined": [
     {
       "type": 0,
-      "value": "Combined"
+      "value": "Kombinácie"
     }
   ],
   "metrics.filter.raw": [
diff --git a/public/intl/messages/sl-SI.json b/public/intl/messages/sl-SI.json
index ebf2c2f8..4f0f1fdf 100644
--- a/public/intl/messages/sl-SI.json
+++ b/public/intl/messages/sl-SI.json
@@ -734,7 +734,7 @@
   "metrics.filter.combined": [
     {
       "type": 0,
-      "value": "Combined"
+      "value": "Skupno"
     }
   ],
   "metrics.filter.raw": [
diff --git a/public/intl/messages/sv-SE.json b/public/intl/messages/sv-SE.json
index dea602e8..9a78d24a 100644
--- a/public/intl/messages/sv-SE.json
+++ b/public/intl/messages/sv-SE.json
@@ -738,7 +738,7 @@
   "metrics.filter.combined": [
     {
       "type": 0,
-      "value": "Combined"
+      "value": "Kombinerade"
     }
   ],
   "metrics.filter.raw": [
diff --git a/public/intl/messages/ta-IN.json b/public/intl/messages/ta-IN.json
index f8079c12..df22a56c 100644
--- a/public/intl/messages/ta-IN.json
+++ b/public/intl/messages/ta-IN.json
@@ -726,7 +726,7 @@
   "metrics.filter.combined": [
     {
       "type": 0,
-      "value": "Combined"
+      "value": "ஒருங்கிணைந்த"
     }
   ],
   "metrics.filter.raw": [
diff --git a/public/intl/messages/tr-TR.json b/public/intl/messages/tr-TR.json
index 734dcbd8..ab02cf6a 100644
--- a/public/intl/messages/tr-TR.json
+++ b/public/intl/messages/tr-TR.json
@@ -698,7 +698,7 @@
   "metrics.filter.combined": [
     {
       "type": 0,
-      "value": "Combined"
+      "value": "Birleşik"
     }
   ],
   "metrics.filter.raw": [
diff --git a/public/intl/messages/uk-UA.json b/public/intl/messages/uk-UA.json
index ed1eeeb3..9e7daccf 100644
--- a/public/intl/messages/uk-UA.json
+++ b/public/intl/messages/uk-UA.json
@@ -710,7 +710,7 @@
   "metrics.filter.combined": [
     {
       "type": 0,
-      "value": "Combined"
+      "value": "Об'єднані"
     }
   ],
   "metrics.filter.raw": [
diff --git a/public/intl/messages/ur-PK.json b/public/intl/messages/ur-PK.json
index 627ec206..dbafa683 100644
--- a/public/intl/messages/ur-PK.json
+++ b/public/intl/messages/ur-PK.json
@@ -734,7 +734,7 @@
   "metrics.filter.combined": [
     {
       "type": 0,
-      "value": "Combined"
+      "value": "مشترکہ"
     }
   ],
   "metrics.filter.raw": [
diff --git a/public/intl/messages/vi-VN.json b/public/intl/messages/vi-VN.json
index e8bb2e90..8c6e3152 100644
--- a/public/intl/messages/vi-VN.json
+++ b/public/intl/messages/vi-VN.json
@@ -718,7 +718,7 @@
   "metrics.filter.combined": [
     {
       "type": 0,
-      "value": "Combined"
+      "value": "Kết hợp"
     }
   ],
   "metrics.filter.raw": [
diff --git a/public/intl/messages/zh-CN.json b/public/intl/messages/zh-CN.json
index da01c8c2..9e825fc7 100644
--- a/public/intl/messages/zh-CN.json
+++ b/public/intl/messages/zh-CN.json
@@ -722,7 +722,7 @@
   "metrics.filter.combined": [
     {
       "type": 0,
-      "value": "Combined"
+      "value": "总和"
     }
   ],
   "metrics.filter.raw": [
diff --git a/public/intl/messages/zh-TW.json b/public/intl/messages/zh-TW.json
index a5c857fb..dc669b8a 100644
--- a/public/intl/messages/zh-TW.json
+++ b/public/intl/messages/zh-TW.json
@@ -718,7 +718,7 @@
   "metrics.filter.combined": [
     {
       "type": 0,
-      "value": "Combined"
+      "value": "總和"
     }
   ],
   "metrics.filter.raw": [

From 07d276106ea386966d80864a4b10a1c95ca0322f Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Thu, 21 Jul 2022 21:21:48 -0700
Subject: [PATCH 6/6] Fixed date query for MySQL.

---
 lib/queries.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/queries.js b/lib/queries.js
index b44487c0..b296d308 100644
--- a/lib/queries.js
+++ b/lib/queries.js
@@ -28,7 +28,7 @@ export function getDateQuery(field, unit, timezone) {
     if (timezone) {
       const tz = moment.tz(timezone).format('Z');
 
-      return `date_format(convert_tz(${field},'+00:00','${tz}', '${MYSQL_DATE_FORMATS[unit]}')`;
+      return `date_format(convert_tz(${field},'+00:00','${tz}'), '${MYSQL_DATE_FORMATS[unit]}')`;
     }
 
     return `${field}`;