Skip to content

armgit / umami

Public Imported from GitHub
0

Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.

Refactor multi-script name code. Update languages.

Mike Caoedd1645babce
diff --git a/pages/_middleware.js b/pages/_middleware.js
index c1dc4ea41..0c58633b8 100644
--- a/pages/_middleware.js
+++ b/pages/_middleware.js
@@ -4,15 +4,11 @@ function customScriptName(req) {
const scriptName = process.env.TRACKER_SCRIPT_NAME;
if (scriptName) {
- const names = scriptName.split(',').map(name => name + '.js');
-
const url = req.nextUrl.clone();
const { pathname } = url;
+ const names = scriptName.split(',').map(name => (name + '.js').trim());
- const pathNameParts = pathname.split('/');
- const lastPathName = pathNameParts[pathNameParts.length - 1];
-
- if (names.indexOf(lastPathName) !== -1) {
+ if (names.find(name => pathname.endsWith(name))) {
url.pathname = '/umami.js';
return NextResponse.rewrite(url);
}
diff --git a/public/intl/messages/zh-CN.json b/public/intl/messages/zh-CN.json
index a91b79e76..a6ef879c9 100644
--- a/public/intl/messages/zh-CN.json
+++ b/public/intl/messages/zh-CN.json
@@ -734,7 +734,7 @@
"metrics.languages": [
{
"type": 0,
- "value": "语言"
+ "value": "Languages"
}
],
"metrics.operating-systems": [
diff --git a/public/intl/messages/zh-TW.json b/public/intl/messages/zh-TW.json
index 5c3eb34c1..aa77bd37b 100644
--- a/public/intl/messages/zh-TW.json
+++ b/public/intl/messages/zh-TW.json
@@ -32,13 +32,13 @@
"label.all-events": [
{
"type": 0,
- "value": "All events"
+ "value": "所有事件"
}
],
"label.all-time": [
{
"type": 0,
- "value": "All time"
+ "value": "所有時間段"
}
],
"label.all-websites": [
@@ -304,7 +304,7 @@
"label.reset-website": [
{
"type": 0,
- "value": "Reset statistics"
+ "value": "重置統計數據"
}
],
"label.save": [
@@ -428,7 +428,7 @@
"message.confirm-reset": [
{
"type": 0,
- "value": "Are your sure you want to reset "
+ "value": "您確定要重置 "
},
{
"type": 1,
@@ -436,7 +436,7 @@
},
{
"type": 0,
- "value": "'s statistics?"
+ "value": " 的數據嗎?"
}
],
"message.copied": [
@@ -564,7 +564,7 @@
"message.reset-warning": [
{
"type": 0,
- "value": "All statistics for this website will be deleted, but your tracking code will remain intact."
+ "value": "本網站的所有統計數據將被刪除,但您的跟蹤代碼將保持不變。"
}
],
"message.save-success": [
@@ -626,7 +626,7 @@
},
{
"type": 0,
- "value": " 確認"
+ "value": " 確認删除"
}
],
"message.type-reset": [
@@ -640,7 +640,7 @@
},
{
"type": 0,
- "value": " 確認"
+ "value": " 確認删除"
}
],
"metrics.actions": [