From 804e282241790eadac1dd5356b930302ae10dc7d Mon Sep 17 00:00:00 2001
From: Junyi <mytharcher@users.noreply.github.com>
Date: Fri, 26 Jan 2024 18:09:21 +0800
Subject: [PATCH] fix(client): fix cron locale when DOM and DOW both present
 (#3442)

---
 packages/core/client/src/locale/cron/zh_CN.json                 | 2 +-
 .../src/client/triggers/schedule/locale/Cron.zh-CN.ts           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/core/client/src/locale/cron/zh_CN.json b/packages/core/client/src/locale/cron/zh_CN.json
index 09a311676..3deea0f35 100644
--- a/packages/core/client/src/locale/cron/zh_CN.json
+++ b/packages/core/client/src/locale/cron/zh_CN.json
@@ -19,7 +19,7 @@
   "prefixMonths": "的",
   "prefixMonthDays": "的",
   "prefixWeekDays": "的",
-  "prefixWeekDaysForMonthAndYearPeriod": "并且",
+  "prefixWeekDaysForMonthAndYearPeriod": "或者",
   "prefixHours": "的",
   "prefixMinutes": ":",
   "prefixMinutesForHourPeriod": "的",
diff --git a/packages/plugins/@nocobase/plugin-workflow/src/client/triggers/schedule/locale/Cron.zh-CN.ts b/packages/plugins/@nocobase/plugin-workflow/src/client/triggers/schedule/locale/Cron.zh-CN.ts
index 06adaee31..b8e496cc1 100644
--- a/packages/plugins/@nocobase/plugin-workflow/src/client/triggers/schedule/locale/Cron.zh-CN.ts
+++ b/packages/plugins/@nocobase/plugin-workflow/src/client/triggers/schedule/locale/Cron.zh-CN.ts
@@ -19,7 +19,7 @@ export default {
   prefixMonths: '的',
   prefixMonthDays: '的',
   prefixWeekDays: '的',
-  prefixWeekDaysForMonthAndYearPeriod: '并且',
+  prefixWeekDaysForMonthAndYearPeriod: '或者',
   prefixHours: '的',
   prefixMinutes: ':',
   prefixMinutesForHourPeriod: '的',