From 174404af61b9b910b7a6090770231c03845927c8 Mon Sep 17 00:00:00 2001 From: Mike Cao Date: Wed, 6 Mar 2024 14:14:07 -0800 Subject: [PATCH 1/3] Updated version. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ea1ad8c3..35cdd730 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "umami", - "version": "2.11.0", + "version": "2.10.2", "description": "A simple, fast, privacy-focused alternative to Google Analytics.", "author": "Umami Software, Inc. ", "license": "MIT", From ba86716a821e0dcd7d4444e94351f83126667027 Mon Sep 17 00:00:00 2001 From: mobeicanyue <81098819+mobeicanyue@users.noreply.github.com> Date: Thu, 14 Mar 2024 11:14:20 +0800 Subject: [PATCH 2/3] Update Chinese translations --- src/lang/zh-CN.json | 58 ++++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/src/lang/zh-CN.json b/src/lang/zh-CN.json index 93b29b7c..08ec5b0a 100644 --- a/src/lang/zh-CN.json +++ b/src/lang/zh-CN.json @@ -4,7 +4,7 @@ "label.activity-log": "活动日志", "label.add": "添加", "label.add-description": "添加描述", - "label.add-member": "Add member", + "label.add-member": "添加成员", "label.add-website": "添加网站", "label.administrator": "管理员", "label.after": "之后", @@ -35,7 +35,7 @@ "label.create-team": "创建团队", "label.create-user": "创建用户", "label.created": "已创建", - "label.created-by": "Created By", + "label.created-by": "创建者", "label.current-password": "目前密码", "label.custom-range": "自定义时间段", "label.dashboard": "仪表板", @@ -45,7 +45,7 @@ "label.day": "日", "label.default-date-range": "默认时间段", "label.delete": "删除", - "label.delete-report": "Delete report", + "label.delete-report": "删除报告", "label.delete-team": "删除团队", "label.delete-user": "删除用户", "label.delete-website": "删除网站", @@ -60,7 +60,7 @@ "label.dropoff": "丢弃", "label.edit": "编辑", "label.edit-dashboard": "编辑仪表板", - "label.edit-member": "Edit member", + "label.edit-member": "编辑成员", "label.enable-share-url": "启用共享链接", "label.event": "事件", "label.event-data": "事件数据", @@ -95,24 +95,24 @@ "label.less-than-equals": "少于等于", "label.login": "登录", "label.logout": "退出", - "label.manage": "Manage", + "label.manage": "管理", "label.max": "最大", - "label.member": "Member", + "label.member": "成员", "label.members": "成员", "label.min": "最小", "label.mobile": "手机", "label.more": "更多", - "label.my-account": "My account", + "label.my-account": "我的账户", "label.my-websites": "我的网站", "label.name": "名字", "label.new-password": "新密码", "label.none": "无", "label.number-of-records": "{x} {x, plural, one {record} other {records}}", "label.ok": "OK", - "label.os": "OS", + "label.os": "操作系统", "label.overview": "概览", "label.owner": "所有者", - "label.page-of": "总{total}中的第{current}页", + "label.page-of": "总 {total} 中的第 {current} 页", "label.page-views": "页面浏览量", "label.pageTitle": "标题", "label.pages": "网页", @@ -130,7 +130,7 @@ "label.region": "州/省", "label.regions": "州/省", "label.remove": "移除", - "label.remove-member": "Remove member", + "label.remove-member": "移除成员", "label.reports": "报告", "label.required": "必填", "label.reset": "重置", @@ -142,9 +142,9 @@ "label.save": "保存", "label.screens": "屏幕尺寸", "label.search": "搜索", - "label.select": "Select", + "label.select": "选择", "label.select-date": "选择数据", - "label.select-role": "Select role", + "label.select-role": "选择角色", "label.select-website": "选择网站", "label.sessions": "会话", "label.settings": "设置", @@ -157,7 +157,7 @@ "label.team-member": "团队成员", "label.team-name": "团队名称", "label.team-owner": "团队所有者", - "label.team-view-only": "Team view only", + "label.team-view-only": "仅团队视图", "label.team-websites": "团队网站", "label.teams": "团队", "label.theme": "主题", @@ -171,8 +171,8 @@ "label.total": "总数", "label.total-records": "总记录数", "label.tracking-code": "跟踪代码", - "label.transfer": "Transfer", - "label.transfer-website": "Transfer website", + "label.transfer": "转移", + "label.transfer-website": "转移网站", "label.true": "是", "label.type": "类型", "label.unique": "独立", @@ -195,21 +195,21 @@ "label.websites": "网站", "label.window": "窗口", "label.yesterday": "昨天", - "message.action-confirmation": "Type {confirmation} in the box below to confirm.", + "message.action-confirmation": "在下面的框中输入 {confirmation} 以确认。", "message.active-users": "当前在线 {x} 人", "message.confirm-delete": "你确定要删除 {target} 吗？", "message.confirm-leave": "你确定要离开 {target} 吗？", - "message.confirm-remove": "Are you sure you want to remove {target}?", - "message.confirm-reset": "您确定要重置 {target} 的数据吗?", - "message.delete-team-warning": "Deleting a team will also delete all team websites.", + "message.confirm-remove": "您确定要移除 {target} ？", + "message.confirm-reset": "您确定要重置 {target} 的数据吗？", + "message.delete-team-warning": "删除团队也会删除所有团队的网站。", "message.delete-website-warning": "所有相关数据将会被删除。", "message.error": "出现错误。", - "message.event-log": "{url}上的{event}", + "message.event-log": "{url} 上的 {event}", "message.go-to-settings": "去设置", "message.incorrect-username-password": "用户名或密码不正确。", "message.invalid-domain": "无效域名", "message.min-password-length": "密码最短长度为 {n} 个字符", - "message.new-version-available": "Umami的新版本{version}已推出！", + "message.new-version-available": "Umami 的新版本 {version} 已推出！", "message.no-data-available": "无可用数据。", "message.no-event-data": "无可用事件。", "message.no-match-password": "密码不一致", @@ -219,7 +219,7 @@ "message.no-users": "没有任何用户。", "message.no-websites-configured": "你还没有设置任何网站。", "message.page-not-found": "网页未找到。", - "message.reset-website": "如果确定重置该网站, 请在下面的输入框中输入 {confirmation} 进行二次确认。", + "message.reset-website": "如果确定重置该网站，请在下面的输入框中输入 {confirmation} 进行二次确认。", "message.reset-website-warning": "本网站的所有统计数据将被删除，但您的跟踪代码将保持不变。", "message.saved": "保存成功。", "message.share-url": "这是 {target} 的共享链接。", @@ -227,12 +227,12 @@ "message.team-not-found": "未找到团队。", "message.team-websites-info": "团队中的任何人都可查看网站。", "message.tracking-code": "跟踪代码", - "message.transfer-team-website-to-user": "Transfer this website to your account?", - "message.transfer-user-website-to-team": "Select the team to transfer this website to.", - "message.transfer-website": "Transfer website ownership to your account or another team.", - "message.triggered-event": "Triggered event", + "message.transfer-team-website-to-user": "将该网站转入您的账户？", + "message.transfer-user-website-to-team": "选择要将该网站转移到哪个团队。", + "message.transfer-website": "将网站所有权转移到您的账户或其他团队。", + "message.triggered-event": "触发事件", "message.user-deleted": "用户已删除。", - "message.viewed-page": "Viewed page", - "message.visitor-log": "来自{country}的访客在搭载 {os} 的{device}上使用 {browser} 浏览器进行访问。", - "message.visitors-dropped-off": "Visitors dropped off" + "message.viewed-page": "已浏览页面", + "message.visitor-log": "来自 {country} 的访客在搭载 {os} 的 {device} 上使用 {browser} 浏览器进行访问。", + "message.visitors-dropped-off": "访客减少" } From 2182fa4e9bf79dcc62ee3274e272e548fc0546d5 Mon Sep 17 00:00:00 2001 From: mobeicanyue <81098819+mobeicanyue@users.noreply.github.com> Date: Thu, 14 Mar 2024 12:38:12 +0800 Subject: [PATCH 3/3] Fix variable name typo in saveEventData and saveSessionData --- src/queries/analytics/eventData/saveEventData.ts | 4 ++-- src/queries/analytics/sessions/saveSessionData.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/queries/analytics/eventData/saveEventData.ts b/src/queries/analytics/eventData/saveEventData.ts index 345409ce..c37dd896 100644 --- a/src/queries/analytics/eventData/saveEventData.ts +++ b/src/queries/analytics/eventData/saveEventData.ts @@ -32,7 +32,7 @@ async function relationalQuery(data: { const jsonKeys = flattenJSON(eventData); // id, websiteEventId, eventStringValue - const flattendData = jsonKeys.map(a => ({ + const flattenedData = jsonKeys.map(a => ({ id: uuid(), websiteEventId: eventId, websiteId, @@ -44,7 +44,7 @@ async function relationalQuery(data: { })); return prisma.client.eventData.createMany({ - data: flattendData, + data: flattenedData, }); } diff --git a/src/queries/analytics/sessions/saveSessionData.ts b/src/queries/analytics/sessions/saveSessionData.ts index b1c5759b..efd4898f 100644 --- a/src/queries/analytics/sessions/saveSessionData.ts +++ b/src/queries/analytics/sessions/saveSessionData.ts @@ -14,7 +14,7 @@ export async function saveSessionData(data: { const jsonKeys = flattenJSON(sessionData); - const flattendData = jsonKeys.map(a => ({ + const flattenedData = jsonKeys.map(a => ({ id: uuid(), websiteId, sessionId, @@ -32,7 +32,7 @@ export async function saveSessionData(data: { }, }), client.sessionData.createMany({ - data: flattendData as any, + data: flattenedData as any, }), ]); }