diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md
index 464307426..702a0a25b 100644
--- a/CHANGELOG.en-US.md
+++ b/CHANGELOG.en-US.md
@@ -12,6 +12,10 @@
 
 - `n-autocomplete` adds `append` prop.
 
+### i18n
+
+- Add `etEE` locale.
+
 ## 2.37.3
 
 ### Fixes
diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md
index 5f8850310..0908119e5 100644
--- a/CHANGELOG.zh-CN.md
+++ b/CHANGELOG.zh-CN.md
@@ -12,6 +12,10 @@
 
 - `n-autocomplete` 新增 `append` 属性
 
+### i18n
+
+- 新增 `etEE` locale
+
 ## 2.37.3
 
 ### Fixes
diff --git a/demo/pages/docs/i18n/enUS/index.md b/demo/pages/docs/i18n/enUS/index.md
index d78e14ede..68ef4f018 100644
--- a/demo/pages/docs/i18n/enUS/index.md
+++ b/demo/pages/docs/i18n/enUS/index.md
@@ -44,33 +44,34 @@ PRs are welcomed for locales that are not supported yet!
 
 The following list is sorted by 'Config' column.
 
-| Language                  | Config | Date config | Version |
-| ------------------------- | ------ | ----------- | ------- |
-| Arabic (العربية)          | arDZ   | dateArDZ    | 2.34.0  |
-| German (Germany)          | deDE   | dateDeDE    |         |
-| English (British)         | enGB   | dateEnGB    | 2.25.1  |
-| English                   | enUS   | dateEnUS    |         |
-| Esperanto                 | eo     | dateEo      | 2.25.2  |
-| Spanish (Argentina)       | esAR   | dateEsAR    | 2.24.2  |
-| Persian                   | faIR   | dateFaIR    | 2.34.4  |
-| French                    | frFR   | dateFrFR    |         |
-| Bahasa Indonesia          | idID   | dateIdID    |         |
-| Italiano                  | itIT   | dateItIT    | 2.24.2  |
-| Japanese                  | jaJP   | dateJaJP    |         |
-| Korean (South Korea)      | koKR   | dateKoKR    | 2.28.1  |
-| Norwegian Bokmål (Norway) | nbNO   | dateNbNO    |         |
-| Dutch (Netherlands)       | nlNL   | dateNlNL    | 2.29.0  |
-| Polish (Poland)           | plPL   | datePlPL    | 2.25.2  |
-| Portuguese (Brazil)       | ptBR   | datePtBR    | 2.28.1  |
-| Russian                   | ruRU   | dateRuRU    |         |
-| Slovak                    | skSK   | dateSkSK    | 2.25.3  |
-| Swedish                   | svSE   | dateSvSE    | 2.35.0  |
-| Thai (Thailand)           | thTH   | dateThTH    | 2.27.0  |
-| Turkish                   | trTR   | dateTrTR    | 2.34.0  |
-| Ukrainian                 | ukUA   | dateUkUA    |         |
-| Vietnamese (Vietnam)      | viVN   | dateViVN    | 2.30.7  |
-| Chinese (Simplified)      | zhCN   | dateZhCN    |         |
-| Chinese (Traditional)     | zhTW   | dateZhTW    |         |
+| Language                  | Config | Date config | Version      |
+| ------------------------- | ------ | ----------- | ------------ |
+| Arabic (العربية)          | arDZ   | dateArDZ    | 2.34.0       |
+| German (Germany)          | deDE   | dateDeDE    |              |
+| English (British)         | enGB   | dateEnGB    | 2.25.1       |
+| English                   | enUS   | dateEnUS    |              |
+| Esperanto                 | eo     | dateEo      | 2.25.2       |
+| Spanish (Argentina)       | esAR   | dateEsAR    | 2.24.2       |
+| Estonian                  | etEE   | dateEtEE    | NEXT_VERSION |
+| Persian                   | faIR   | dateFaIR    | 2.34.4       |
+| French                    | frFR   | dateFrFR    |              |
+| Bahasa Indonesia          | idID   | dateIdID    |              |
+| Italiano                  | itIT   | dateItIT    | 2.24.2       |
+| Japanese                  | jaJP   | dateJaJP    |              |
+| Korean (South Korea)      | koKR   | dateKoKR    | 2.28.1       |
+| Norwegian Bokmål (Norway) | nbNO   | dateNbNO    |              |
+| Dutch (Netherlands)       | nlNL   | dateNlNL    | 2.29.0       |
+| Polish (Poland)           | plPL   | datePlPL    | 2.25.2       |
+| Portuguese (Brazil)       | ptBR   | datePtBR    | 2.28.1       |
+| Russian                   | ruRU   | dateRuRU    |              |
+| Slovak                    | skSK   | dateSkSK    | 2.25.3       |
+| Swedish                   | svSE   | dateSvSE    | 2.35.0       |
+| Thai (Thailand)           | thTH   | dateThTH    | 2.27.0       |
+| Turkish                   | trTR   | dateTrTR    | 2.34.0       |
+| Ukrainian                 | ukUA   | dateUkUA    |              |
+| Vietnamese (Vietnam)      | viVN   | dateViVN    | 2.30.7       |
+| Chinese (Simplified)      | zhCN   | dateZhCN    |              |
+| Chinese (Traditional)     | zhTW   | dateZhTW    |              |
 
 ## Customize the existing locale
 
diff --git a/demo/pages/docs/i18n/zhCN/index.md b/demo/pages/docs/i18n/zhCN/index.md
index d80b4a46e..ecbeb4094 100644
--- a/demo/pages/docs/i18n/zhCN/index.md
+++ b/demo/pages/docs/i18n/zhCN/index.md
@@ -44,33 +44,34 @@ Naive-ui 通过使用 `n-config-provider` 调整语言，默认情况下所有
 
 以下列表依据“配置”列排序。
 
-| 语言               | 配置 | 日期配置 | 版本   |
-| ------------------ | ---- | -------- | ------ |
-| 阿拉伯语           | arDZ | dateArDZ | 2.34.0 |
-| 德语               | deDE | dateDeDE |        |
-| 英国英语           | enGB | dateEnGB | 2.25.1 |
-| 英语               | enUS | dateEnUS |        |
-| 世界语             | eo   | dateEo   | 2.25.2 |
-| 西班牙语（阿根廷） | esAR | dateEsAR | 2.24.2 |
-| 波斯语             | faIR | dateFaIR | 2.34.4 |
-| 法语               | frFR | dateFrFR |        |
-| 印度尼西亚语       | idID | dateIdID |        |
-| 意大利语           | itIT | dateItIT | 2.24.2 |
-| 日语               | jaJP | dateJaJP |        |
-| 韩语               | koKR | dateKoKR | 2.28.1 |
-| 书面挪威语         | nbNO | dateNbNO |        |
-| 荷兰语（荷兰）     | nlNL | dateNlNL | 2.29.0 |
-| 波兰语（波兰）     | plPL | datePlPL | 2.25.2 |
-| 葡萄牙语 (巴西)    | ptBR | datePtBR | 2.28.1 |
-| 俄罗斯语           | ruRU | dateRuRU |        |
-| 斯洛伐克语         | skSK | dateSkSK | 2.25.3 |
-| 瑞典語             | svSE | dateSvSE | 2.35.0 |
-| 泰语（泰国）       | thTH | dateThTH | 2.27.0 |
-| 土耳其语           | trTR | dateTrTR | 2.34.0 |
-| 乌克兰语           | ukUA | dateUkUA |        |
-| 越南语（越南）     | viVN | dateViVN | 2.30.7 |
-| 简体中文           | zhCN | dateZhCN |        |
-| 繁体中文           | zhTW | dateZhTW |        |
+| 语言               | 配置 | 日期配置 | 版本         |
+| ------------------ | ---- | -------- | ------------ |
+| 阿拉伯语           | arDZ | dateArDZ | 2.34.0       |
+| 德语               | deDE | dateDeDE |              |
+| 英国英语           | enGB | dateEnGB | 2.25.1       |
+| 英语               | enUS | dateEnUS |              |
+| 世界语             | eo   | dateEo   | 2.25.2       |
+| 西班牙语（阿根廷） | esAR | dateEsAR | 2.24.2       |
+| 爱沙尼亚语         | etEE | dateEtEE | NEXT_VERSION |
+| 波斯语             | faIR | dateFaIR | 2.34.4       |
+| 法语               | frFR | dateFrFR |              |
+| 印度尼西亚语       | idID | dateIdID |              |
+| 意大利语           | itIT | dateItIT | 2.24.2       |
+| 日语               | jaJP | dateJaJP |              |
+| 韩语               | koKR | dateKoKR | 2.28.1       |
+| 书面挪威语         | nbNO | dateNbNO |              |
+| 荷兰语（荷兰）     | nlNL | dateNlNL | 2.29.0       |
+| 波兰语（波兰）     | plPL | datePlPL | 2.25.2       |
+| 葡萄牙语 (巴西)    | ptBR | datePtBR | 2.28.1       |
+| 俄罗斯语           | ruRU | dateRuRU |              |
+| 斯洛伐克语         | skSK | dateSkSK | 2.25.3       |
+| 瑞典語             | svSE | dateSvSE | 2.35.0       |
+| 泰语（泰国）       | thTH | dateThTH | 2.27.0       |
+| 土耳其语           | trTR | dateTrTR | 2.34.0       |
+| 乌克兰语           | ukUA | dateUkUA |              |
+| 越南语（越南）     | viVN | dateViVN | 2.30.7       |
+| 简体中文           | zhCN | dateZhCN |              |
+| 繁体中文           | zhTW | dateZhTW |              |
 
 ## 在现有国际化基础上调整
 
diff --git a/src/locales/common/etEE.ts b/src/locales/common/etEE.ts
new file mode 100644
index 000000000..5cfc14ee4
--- /dev/null
+++ b/src/locales/common/etEE.ts
@@ -0,0 +1,128 @@
+import type { NLocale } from './enUS'
+
+const etEE: NLocale = {
+  name: 'et-EE',
+  global: {
+    undo: 'Võta tagasi',
+    redo: 'Rakenda uuesti',
+    confirm: 'Kinnita',
+    clear: 'Tühjenda'
+  },
+  Popconfirm: {
+    positiveText: 'Kinnita',
+    negativeText: 'Katkesta'
+  },
+  Cascader: {
+    placeholder: 'Vali',
+    loading: 'Laeb',
+    loadingRequiredMessage: (label: string): string =>
+      `Enne kontrollimist pead elemendi ${label} kõik alamad laadima.`
+  },
+  Time: {
+    dateFormat: 'dd.MM.yyyy',
+    dateTimeFormat: 'dd.MM.yyyy HH:mm:ss'
+  },
+  DatePicker: {
+    yearFormat: 'yyyy',
+    monthFormat: 'MMM',
+    dayFormat: 'eeeeee',
+    yearTypeFormat: 'yyyy',
+    monthTypeFormat: 'MM-yyyy',
+    dateFormat: 'dd.MM.yyyy',
+    dateTimeFormat: 'dd.MM.yyyy HH:mm:ss',
+    quarterFormat: 'yyyy-qqq',
+    weekFormat: 'yyyy-w',
+    clear: 'Tühjenda',
+    now: 'Nüüd',
+    confirm: 'Kinnita',
+    selectTime: 'Vali aeg',
+    selectDate: 'Vali kuupäev',
+    datePlaceholder: 'Vali kuupäev',
+    datetimePlaceholder: 'Vali aeg ja kuupäev',
+    monthPlaceholder: 'Vali kuu',
+    yearPlaceholder: 'Vali aasta',
+    quarterPlaceholder: 'Vali kvartal',
+    weekPlaceholder: 'Vali nädal',
+    startDatePlaceholder: 'Alguskpv',
+    endDatePlaceholder: 'Lõppkpv',
+    startDatetimePlaceholder: 'Alguskpv ja -aeg',
+    endDatetimePlaceholder: 'Lõppkpv ja -aeg',
+    startMonthPlaceholder: 'Alguskuu',
+    endMonthPlaceholder: 'Lõppkuu',
+    monthBeforeYear: true,
+    firstDayOfWeek: 0 as 0 | 1 | 2 | 3 | 4 | 5 | 6,
+    today: 'Täna'
+  },
+  DataTable: {
+    checkTableAll: 'Vali tabelis kõik',
+    uncheckTableAll: 'Tühista tabeli valik',
+    confirm: 'Kinnita',
+    clear: 'Tühjenda'
+  },
+  LegacyTransfer: {
+    sourceTitle: 'Kust',
+    targetTitle: 'Kuhu'
+  },
+  Transfer: {
+    selectAll: 'Vali kõik',
+    unselectAll: 'Tühista valik',
+    clearAll: 'Tühjenda',
+    total: (num: number): string => `Kokku ${num} rida`,
+    selected: (num: number): string => `${num} rida valitud`
+  },
+  Empty: {
+    description: 'Andmeid pole'
+  },
+  Select: {
+    placeholder: 'Vali'
+  },
+  TimePicker: {
+    placeholder: 'Vali aeg',
+    positiveText: 'OK',
+    negativeText: 'Katkesta',
+    now: 'Nüüd',
+    clear: 'Tühjenda'
+  },
+  Pagination: {
+    goto: 'Mine',
+    selectionSuffix: 'lk'
+  },
+  DynamicTags: {
+    add: 'Lisa'
+  },
+  Log: {
+    loading: 'Laeb'
+  },
+  Input: {
+    placeholder: 'Sisesta'
+  },
+  InputNumber: {
+    placeholder: 'Sisesta'
+  },
+  DynamicInput: {
+    create: 'Loo'
+  },
+  ThemeEditor: {
+    title: 'Teemaredaktor',
+    clearAllVars: 'Tühjenda kõik muutujad',
+    clearSearch: 'Tühjenda otsing',
+    filterCompName: 'Filter komponendi nimega',
+    filterVarName: 'Filter muutuja nimega',
+    import: 'Import',
+    export: 'Eksport',
+    restore: 'Taasta originaal'
+  },
+  Image: {
+    tipPrevious: 'Eelmine pilt (←)',
+    tipNext: 'Järgmine pilt (→)',
+    tipCounterclockwise: 'Vastupäeva',
+    tipClockwise: 'Päripäeva',
+    tipZoomOut: 'Suumi välja',
+    tipZoomIn: 'Suumi sisse',
+    tipDownload: 'Lae alla',
+    tipClose: 'Sulge (Esc)',
+    tipOriginalSize: 'Algsuurus'
+  }
+}
+
+export default etEE
diff --git a/src/locales/date/etEE.ts b/src/locales/date/etEE.ts
new file mode 100644
index 000000000..62d615d10
--- /dev/null
+++ b/src/locales/date/etEE.ts
@@ -0,0 +1,9 @@
+import et from 'date-fns/esm/locale/et'
+import { type NDateLocale } from './enUS'
+
+const dateEtEE: NDateLocale = {
+  name: 'et-EE',
+  locale: et
+}
+
+export default dateEtEE
diff --git a/src/locales/index.spec.tsx b/src/locales/index.spec.tsx
index eecb1f9ea..b512673be 100644
--- a/src/locales/index.spec.tsx
+++ b/src/locales/index.spec.tsx
@@ -24,6 +24,7 @@ import {
   arDZ,
   trTR,
   svSE,
+  etEE,
   eo,
   dateEnUS,
   dateZhCN,
@@ -48,6 +49,7 @@ import {
   dateArDZ,
   dateTrTR,
   dateSvSE,
+  dateEtEE,
   dateEo,
   NConfigProvider,
   type NDateLocale,
@@ -347,5 +349,16 @@ describe('locale', () => {
         }
       }).html()
     ).toMatchSnapshot()
+    expect(
+      mount(Wrapper, {
+        props: {
+          dateLocale: dateEtEE,
+          locale: etEE,
+          onMounted: (date: string) => {
+            expect(date).toMatchSnapshot()
+          }
+        }
+      }).html()
+    ).toMatchSnapshot()
   })
 })
diff --git a/src/locales/index.ts b/src/locales/index.ts
index f744732d7..51e0cd9a9 100644
--- a/src/locales/index.ts
+++ b/src/locales/index.ts
@@ -23,6 +23,7 @@ export { default as eo } from './common/eo'
 export { default as viVN } from './common/viVN'
 export { default as faIR } from './common/faIR'
 export { default as svSE } from './common/svSE'
+export { default as etEE } from './common/etEE'
 export { default as dateZhCN } from './date/zhCN'
 export { default as dateZhTW } from './date/zhTW'
 export { default as dateEnUS } from './date/enUS'
@@ -48,6 +49,7 @@ export { default as dateEo } from './date/eo'
 export { default as dateViVN } from './date/viVN'
 export { default as dateFaIR } from './date/faIR'
 export { default as dateSvSE } from './date/svSE'
+export { default as dateEtEE } from './date/etEE'
 export type { NLocale } from './common/enUS'
 export type { NDateLocale } from './date/enUS'
 export type { NPartialLocale } from './utils/index'