From 3d06dc9ca6089fd87772de8f5a1673a24029d39f Mon Sep 17 00:00:00 2001
From: Lemonawa <lemonawa1209@gmail.com>
Date: Sun, 24 Jul 2022 08:48:00 +0800
Subject: [PATCH 1/3] Update zh-CN.json

---
 lang/zh-CN.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lang/zh-CN.json b/lang/zh-CN.json
index fd37f49a..a4c92224 100644
--- a/lang/zh-CN.json
+++ b/lang/zh-CN.json
@@ -106,12 +106,12 @@
   "metrics.referrers": "来源域名",
   "metrics.screens": "屏幕尺寸",
   "metrics.unique-visitors": "独立访客",
-  "metrics.utm": "UTM",
-  "metrics.utm_campaign": "UTM Campaign",
-  "metrics.utm_content": "UTM Content",
-  "metrics.utm_medium": "UTM Medium",
-  "metrics.utm_source": "UTM Source",
-  "metrics.utm_term": "UTM Term",
+  "metrics.utm": "流量渠道标记（UTM）",
+  "metrics.utm_campaign": "流量标识",
+  "metrics.utm_content": "搜索关键字",
+  "metrics.utm_medium": "流量来源类型",
+  "metrics.utm_source": "流量来源",
+  "metrics.utm_term": "流量搜索关键字",
   "metrics.views": "浏览量",
   "metrics.visitors": "访客"
 }

From 1ecad384fbdffdb142c17d80a3c9ae3d874782be Mon Sep 17 00:00:00 2001
From: RikoDEV <18230443+RikoDEV@users.noreply.github.com>
Date: Sun, 24 Jul 2022 09:24:12 +0200
Subject: [PATCH 2/3] Update pl-PL.json

---
 lang/pl-PL.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lang/pl-PL.json b/lang/pl-PL.json
index c4eab89e..810df54f 100644
--- a/lang/pl-PL.json
+++ b/lang/pl-PL.json
@@ -104,14 +104,14 @@
   "metrics.page-views": "Wyświetlenia strony",
   "metrics.pages": "Strony",
   "metrics.referrers": "Źródła odsyłające",
-  "metrics.screens": "Screens",
+  "metrics.screens": "Ekrany",
   "metrics.unique-visitors": "Unikalni odwiedzający",
-  "metrics.utm": "UTM",
-  "metrics.utm_campaign": "UTM Campaign",
-  "metrics.utm_content": "UTM Content",
-  "metrics.utm_medium": "UTM Medium",
-  "metrics.utm_source": "UTM Source",
-  "metrics.utm_term": "UTM Term",
+  "metrics.utm": "Kampanie UTM",
+  "metrics.utm_campaign": "Kampania",
+  "metrics.utm_content": "Treść",
+  "metrics.utm_medium": "Medium",
+  "metrics.utm_source": "Źródło",
+  "metrics.utm_term": "Słowa kluczowe",
   "metrics.views": "Wyświetlenia",
   "metrics.visitors": "Odwiedzający"
 }

From 5ef979d61d07ee14a0240e4f2ea48c884e1a4b63 Mon Sep 17 00:00:00 2001
From: Kevin Van Ryckegem <kevin@createmytech.com>
Date: Mon, 25 Jul 2022 00:44:53 +0200
Subject: [PATCH 3/3] #1340 : Fix when session received is not an array, but
 the direct object

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

diff --git a/lib/session.js b/lib/session.js
index 4e0513b1..d8b66e54 100644
--- a/lib/session.js
+++ b/lib/session.js
@@ -37,7 +37,7 @@ export async function getSession(req) {
 
   let session = await getSessionByUuid(session_uuid);
 
-  session = Array.isArray(session) && session[0] ? session[0] : null;
+  session = Array.isArray(session) && session[0] ? session[0] : session;
 
   if (!session) {
     try {