Merge pull request #1324 from umami-software/dev

v1.35.0

Author: mikecao

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"

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"

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}`;

public/intl/messages/ar-SA.json

@@ -734,7 +734,7 @@
   "metrics.filter.combined": [
     {
       "type": 0,
-      "value": "Combined"
+      "value": "مجمعة"
     }
   ],
   "metrics.filter.raw": [

public/intl/messages/ca-ES.json

@@ -734,7 +734,7 @@
   "metrics.filter.combined": [
     {
       "type": 0,
-      "value": "Combined"
+      "value": "Combinat"
     }
   ],
   "metrics.filter.raw": [

public/intl/messages/cs-CZ.json

@@ -734,7 +734,7 @@
   "metrics.filter.combined": [
     {
       "type": 0,
-      "value": "Combined"
+      "value": "Kombinace"
     }
   ],
   "metrics.filter.raw": [

public/intl/messages/da-DK.json

@@ -734,7 +734,7 @@
   "metrics.filter.combined": [
     {
       "type": 0,
-      "value": "Combined"
+      "value": "Kombineret"
     }
   ],
   "metrics.filter.raw": [

public/intl/messages/de-DE.json

@@ -734,7 +734,7 @@
   "metrics.filter.combined": [
     {
       "type": 0,
-      "value": "Combined"
+      "value": "Kombiniert"
     }
   ],
   "metrics.filter.raw": [

public/intl/messages/el-GR.json

@@ -734,7 +734,7 @@
   "metrics.filter.combined": [
     {
       "type": 0,
-      "value": "Combined"
+      "value": "Σε συνδυασμό"
     }
   ],
   "metrics.filter.raw": [

public/intl/messages/es-MX.json

@@ -734,7 +734,7 @@
   "metrics.filter.combined": [
     {
       "type": 0,
-      "value": "Combined"
+      "value": "Combinado"
     }
   ],
   "metrics.filter.raw": [