ant-design · zombieJ · Aug 2, 2023 · Jul 31, 2023 · Jul 31, 2023
diff --git a/src/components/calendar/calendar.tsx b/src/components/calendar/calendar.tsx
@@ -15,6 +15,7 @@ import { useConfig } from '../config-provider'
 import isoWeek from 'dayjs/plugin/isoWeek'
 import { useUpdateEffect } from 'ahooks'
 import { usePropsValue } from '../../utils/use-props-value'
+import { replaceMessage } from '../../utils/replace-message'
 import {
   convertValueToRange,
   convertPageToDayjs,
@@ -171,10 +172,10 @@ export const Calendar = forwardRef<CalendarRef, CalendarProps>((p, ref) => {
         {props.prevMonthButton}
       </a>
       <div className={`${classPrefix}-title`}>
-        {locale.Calendar.renderYearAndMonth(
-          current.year(),
-          current.month() + 1
-        )}
+        {replaceMessage(locale.Calendar.yearAndMonth, {
+          year: current.year().toString(),
+          month: (current.month() + 1).toString(),
+        })}
       </div>
       <a
         className={classNames(

diff --git a/src/components/config-provider/tests/__snapshots__/config-provider.test.tsx.snap b/src/components/config-provider/tests/__snapshots__/config-provider.test.tsx.snap
@@ -8618,7 +8618,7 @@ exports[`ConfigProvider should display the text as ja-JP 1`] = `
       <div
         class="adm-calendar-title"
       >
-         2022年3月
+        2022年3月
       </div>
       <a
         class="adm-calendar-arrow-button adm-calendar-arrow-button-right adm-calendar-arrow-button-right-month"

diff --git a/src/locales/base.ts b/src/locales/base.ts
@@ -10,7 +10,7 @@ export const base = {
   },
   Calendar: {
     markItems: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
-    renderYearAndMonth: (year: number, month: number) => `${year}/${month}`,
+    yearAndMonth: '${year}/${month}',
   },
   Cascader: {
     placeholder: 'Selecting',

diff --git a/src/locales/da-DK.ts b/src/locales/da-DK.ts
@@ -13,7 +13,7 @@ const daDK = mergeLocale(base, {
   },
   Calendar: {
     markItems: ['ma', 'ti', 'on', 'to', 'fr', 'lø', 'sø'],
-    renderYearAndMonth: (year: number, month: number) => `${month}.${year}`,
+    yearAndMonth: '${month}.${year}',
   },
   Cascader: {
     placeholder: 'Vælger',

diff --git a/src/locales/es-ES.ts b/src/locales/es-ES.ts
@@ -12,7 +12,7 @@ const esES = mergeLocale(base, {
   },
   Calendar: {
     markItems: ['Lun', 'Mar', 'Mie', 'Jue', 'Vie', 'Sab', 'Dom'],
-    renderYearAndMonth: (year: number, month: number) => `${year}/${month}`,
+    yearAndMonth: '${year}/${month}',
   },
   Cascader: {
     placeholder: 'Seleccionando',

diff --git a/src/locales/fa-IR.ts b/src/locales/fa-IR.ts
@@ -19,7 +19,7 @@ const faIR = mergeLocale(base, {
       'پنج‌نشبه',
       'جمعه',
     ],
-    renderYearAndMonth: (year: number, month: number) => `${year}/${month}`,
+    yearAndMonth: '${year}/${month}',
   },
   Cascader: {
     placeholder: 'انتخاب کنید',

diff --git a/src/locales/fr-FR.ts b/src/locales/fr-FR.ts
@@ -12,8 +12,7 @@ const frFR = mergeLocale(base, {
   },
   Calendar: {
     markItems: ['un', 'deux', 'trois', 'quatre', 'cinq', 'six', 'sept'],
-    renderYearAndMonth: (year: number, month: number) =>
-      `${year}Année ${month}Mois`,
+    yearAndMonth: '${year}Année ${month}Mois',
   },
   Cascader: {
     placeholder: 'Veuillez sélectionner',

diff --git a/src/locales/id-ID.ts b/src/locales/id-ID.ts
@@ -12,8 +12,7 @@ const idID = mergeLocale(base, {
   },
   Calendar: {
     markItems: ['Senin', 'Selasa', 'Rabu', 'Kamis', 'Jumat', 'Sabtu', 'Minggu'],
-    renderYearAndMonth: (year: number, month: number) =>
-      `${year} Tahun ${month} Bulan`,
+    yearAndMonth: '${year} Tahun ${month} Bulan',
   },
   Cascader: {
     placeholder: 'Silahkan Pilih',

diff --git a/src/locales/it-IT.ts b/src/locales/it-IT.ts
@@ -13,7 +13,7 @@ const itIT = mergeLocale(base, {
   },
   Calendar: {
     markItems: ['lun', 'mar', 'mer', 'gio', 'ven', 'sab', 'dom'],
-    renderYearAndMonth: (year: number, month: number) => `${month}/${year}`,
+    yearAndMonth: '${month}/${year}',
   },
   Cascader: {
     placeholder: 'Si prega di selezionare',

diff --git a/src/locales/ja-JP.ts b/src/locales/ja-JP.ts
@@ -12,7 +12,7 @@ const jaJP = mergeLocale(base, {
   },
   Calendar: {
     markItems: ['月', '火', '水', '木', '金', '土', '日'],
-    renderYearAndMonth: (year: number, month: number) => ` ${year}年${month}月`,
+    yearAndMonth: '${year}年${month}月',
   },
   Cascader: {
     placeholder: '選択下さい',

diff --git a/src/locales/kk-KZ.ts b/src/locales/kk-KZ.ts
@@ -12,8 +12,7 @@ const kkKZ = mergeLocale(base, {
   },
   Calendar: {
     markItems: ['Дү', 'Се', 'Сә', 'Бе', 'Жұ', 'Се', 'Же'],
-    renderYearAndMonth: (year: number, month: number) =>
-      `${year}жыл${month}-ші ай`,
+    yearAndMonth: '${year}жыл${month}-ші ай',
   },
   Cascader: {
     placeholder: 'Таңдаңыз',

diff --git a/src/locales/ko-KR.ts b/src/locales/ko-KR.ts
@@ -13,7 +13,7 @@ const koKR = mergeLocale(base, {
   },
   Calendar: {
     markItems: ['월', '화', '수', '목', '금', '토', '일'],
-    renderYearAndMonth: (year: number, month: number) => `${year}년 ${month}월`,
+    yearAndMonth: '${year}년 ${month}월',
   },
   Cascader: {
     placeholder: '선택됨',
@@ -132,7 +132,6 @@ const koKR = mergeLocale(base, {
   Switch: {
     name: '스위치',
   },
-
 })
 
 export default koKR
diff --git a/src/locales/nb-NO.ts b/src/locales/nb-NO.ts
@@ -13,7 +13,7 @@ const nbNO = mergeLocale(base, {
   },
   Calendar: {
     markItems: ['Man', 'Tir', 'Ons', 'Tor', 'Fre', 'Lør', 'Søn'],
-    renderYearAndMonth: (year: number, month: number) => `${month}.${year}`,
+    yearAndMonth: '${month}.${year}',
   },
   Cascader: {
     placeholder: 'Velg',

diff --git a/src/locales/nl-NL.ts b/src/locales/nl-NL.ts
@@ -13,7 +13,7 @@ const nlNL = mergeLocale(base, {
   },
   Calendar: {
     markItems: ['Ma', 'Di', 'Wo', 'Do', 'Vr', 'Za', 'Zo'],
-    renderYearAndMonth: (year: number, month: number) => `${month}-${year}`,
+    yearAndMonth: '${month}-${year}',
   },
   Cascader: {
     placeholder: 'Selecteren',

diff --git a/src/locales/ru-RU.ts b/src/locales/ru-RU.ts
@@ -13,7 +13,7 @@ const ruRU = mergeLocale(base, {
   },
   Calendar: {
     markItems: ['Пн', 'Вт', 'Ср', 'Чт', 'Пт', 'Сб', 'Вс'],
-    renderYearAndMonth: (year: number, month: number) => `${year}/${month}`,
+    yearAndMonth: '${year}/${month}',
   },
   Cascader: {
     placeholder: 'Выбор',

diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
@@ -13,7 +13,7 @@ const zhCN = mergeLocale(base, {
   },
   Calendar: {
     markItems: ['一', '二', '三', '四', '五', '六', '日'],
-    renderYearAndMonth: (year: number, month: number) => `${year}年${month}月`,
+    yearAndMonth: '${year}年${month}月',
   },
   Cascader: {
     placeholder: '请选择',

diff --git a/src/locales/zh-HK.ts b/src/locales/zh-HK.ts
@@ -13,7 +13,7 @@ const zhHK = mergeLocale(base, {
   },
   Calendar: {
     markItems: ['一', '二', '三', '四', '五', '六', '日'],
-    renderYearAndMonth: (year: number, month: number) => `${year}年${month}月`,
+    yearAndMonth: '${year}年${month}月',
   },
   Cascader: {
     placeholder: '請選擇',

diff --git a/src/locales/zh-TW.ts b/src/locales/zh-TW.ts
@@ -13,7 +13,7 @@ const zhTW = mergeLocale(base, {
   },
   Calendar: {
     markItems: ['一', '二', '三', '四', '五', '六', '日'],
-    renderYearAndMonth: (year: number, month: number) => `${year}年${month}月`,
+    yearAndMonth: '${year}年${month}月',
   },
   Cascader: {
     placeholder: '請選擇',

diff --git a/src/utils/replace-message.ts b/src/utils/replace-message.ts
@@ -0,0 +1,10 @@
+// 移植自 field-form https://github.com/react-component/field-form/blob/master/src/utils/validateUtil.ts#L21
+export function replaceMessage(
+  template: string,
+  kv: Record<string, string>
+): string {
+  return template.replace(/\$\{\w+\}/g, (str: string) => {
+    const key = str.slice(2, -1)
+    return kv[key]
+  })
+}