From ceb570c4d041da4730d571cd489bf1af3d300f8f Mon Sep 17 00:00:00 2001 From: Whatsaaaa Date: Mon, 16 Nov 2026 17:12:43 +0100 Subject: [PATCH 1/6] feat(locale): add Serbian (Cyrillic and Latin) --- src/runtime/locale/index.ts | 2 + src/runtime/locale/sr.ts | 228 ++++++++++++++++++++++++++++++++++ src/runtime/locale/sr_latn.ts | 228 ++++++++++++++++++++++++++++++++++ 3 files changed, 458 insertions(+) create mode 100644 src/runtime/locale/sr.ts create mode 100644 src/runtime/locale/sr_latn.ts diff --git a/src/runtime/locale/index.ts b/src/runtime/locale/index.ts index 9ff601c3e2..0ae477d63f 100644 --- a/src/runtime/locale/index.ts +++ b/src/runtime/locale/index.ts @@ -50,6 +50,8 @@ export { default as ru } from './ru' export { default as sk } from './sk' export { default as sl } from './sl' export { default as sq } from './sq' +export { default as sr } from './sr' +export { default as sr_latn } from './sr_latn' export { default as sv } from './sv' export { default as tg } from './tg' export { default as th } from './th' diff --git a/src/runtime/locale/sr.ts b/src/runtime/locale/sr.ts new file mode 100644 index 0000000000..77398dad34 --- /dev/null +++ b/src/runtime/locale/sr.ts @@ -0,0 +1,228 @@ +import type { Messages } from '../types/locale' +import { defineLocale } from '../composables/defineLocale' + +export default defineLocale({ + name: 'Српски', + code: 'sr', + messages: { + alert: { + close: 'Затвори' + }, + authForm: { + hidePassword: 'Сакриј лозинку', + showPassword: 'Прикажи лозинку', + submit: 'Настави' + }, + banner: { + close: 'Затвори' + }, + breadcrumb: { + label: 'навигациона путања' + }, + calendar: { + label: 'Датум догађаја', + monthPicker: 'Избор месеца', + nextMonth: 'Следећи месец', + nextYear: 'Следећа година', + prevMonth: 'Претходни месец', + prevYear: 'Претходна година', + yearPicker: 'Избор године' + }, + carousel: { + dots: 'Изабери слајд за приказ', + goto: 'Иди на слајд {slide}', + next: 'Следећи', + prev: 'Претходни', + roledescription: 'карусел', + slide: 'слајд' + }, + chatAttachment: { + uploading: 'Отпремање', + error: 'Отпремање није успело' + }, + chatMessages: { + autoScroll: 'Помери на дно' + }, + chatPrompt: { + placeholder: 'Унеси поруку овде…', + queue: 'Поруке на чекању', + sendNow: 'Пошаљи одмах', + edit: 'Измени', + remove: 'Уклони' + }, + chatPromptSubmit: { + label: 'Пошаљи упит', + reload: 'Покушај поново', + stop: 'Заустави генерисање' + }, + colorMode: { + dark: 'Тамно', + light: 'Светло', + switchToDark: 'Пребаци на тамни режим', + switchToLight: 'Пребаци на светли режим', + system: 'Систем' + }, + commandPalette: { + back: 'Назад', + close: 'Затвори', + noData: 'Нема података', + noMatch: 'Нема одговарајућих података', + placeholder: 'Унеси команду или претражи…', + results: 'Резултати' + }, + contentSearch: { + links: 'Линкови', + search: 'Резултати', + theme: 'Тема' + }, + contentSearchButton: { + label: 'Претражи…' + }, + contentToc: { + title: 'На овој страници' + }, + dropdownMenu: { + noMatch: 'Нема одговарајућих података', + search: 'Претражи…' + }, + dashboardSearch: { + theme: 'Тема' + }, + dashboardSearchButton: { + label: 'Претражи…' + }, + dashboardSidebarCollapse: { + collapse: 'Скупи бочну траку', + expand: 'Прошири бочну траку' + }, + dashboardSidebarToggle: { + close: 'Затвори бочну траку', + open: 'Отвори бочну траку' + }, + drawer: { + close: 'Затвори' + }, + error: { + clear: 'Назад на почетну' + }, + fileUpload: { + removeFile: 'Уклони {filename}' + }, + header: { + close: 'Затвори мени', + open: 'Отвори мени' + }, + inputDate: { + day: 'дан', + dayPeriod: 'AM/PM', + era: 'ера', + hour: 'сат', + minute: 'минут', + month: 'месец', + second: 'секунд', + timeZoneName: 'временска зона', + year: 'година' + }, + inputMenu: { + create: 'Креирај "{label}"', + noData: 'Нема података', + noMatch: 'Нема одговарајућих података', + trigger: 'Прикажи опције' + }, + inputNumber: { + decrement: 'Смањи', + increment: 'Повећај', + roledescription: 'нумеричко поље' + }, + inputRating: { + rate: 'Оцени {value} од {length}' + }, + inputTime: { + dayPeriod: 'AM/PM', + hour: 'сат', + minute: 'минут', + second: 'секунд', + timeZoneName: 'временска зона' + }, + listbox: { + noData: 'Нема података', + noMatch: 'Нема одговарајућих података', + search: 'Претражи…' + }, + modal: { + close: 'Затвори' + }, + pagination: { + first: 'Прва страница', + last: 'Последња страница', + next: 'Следећа страница', + page: 'Страница {page}', + prev: 'Претходна страница' + }, + pinInput: { + input: 'ПИН поље {index} од {length}' + }, + pricingTable: { + caption: 'Поређење ценовних планова' + }, + prose: { + codeCollapse: { + closeText: 'Скупи', + name: 'код', + openText: 'Прошири' + }, + collapsible: { + closeText: 'Сакриј', + name: 'својства', + openText: 'Прикажи' + }, + pre: { + copy: 'Копирај код у привремену меморију' + }, + prompt: { + copy: 'Копирај упит', + openIn: 'Отвори у {name}' + } + }, + chatReasoning: { + thinking: 'Размишљам…', + thought: 'Размишљање', + thoughtFor: 'Размишљање: {duration}' + }, + sidebar: { + close: 'Затвори', + toggle: 'Прикажи/сакриј' + }, + selectMenu: { + create: 'Креирај "{label}"', + noData: 'Нема података', + noMatch: 'Нема одговарајућих података', + search: 'Претражи…' + }, + skeleton: { + label: 'учитавање' + }, + slideover: { + close: 'Затвори' + }, + slider: { + max: 'Максимум', + min: 'Минимум', + thumb: 'Клизач', + value: 'Вредност {index} од {total}' + }, + stepper: { + label: 'напредак' + }, + table: { + noData: 'Нема података' + }, + toast: { + close: 'Затвори' + }, + toaster: { + label: 'Обавештење', + viewport: 'Обавештења ({hotkey})' + } + } +}) diff --git a/src/runtime/locale/sr_latn.ts b/src/runtime/locale/sr_latn.ts new file mode 100644 index 0000000000..2ce98307d8 --- /dev/null +++ b/src/runtime/locale/sr_latn.ts @@ -0,0 +1,228 @@ +import type { Messages } from '../types/locale' +import { defineLocale } from '../composables/defineLocale' + +export default defineLocale({ + name: 'Srpski (latinica)', + code: 'sr-LATN', + messages: { + alert: { + close: 'Zatvori' + }, + authForm: { + hidePassword: 'Sakrij lozinku', + showPassword: 'Prikaži lozinku', + submit: 'Nastavi' + }, + banner: { + close: 'Zatvori' + }, + breadcrumb: { + label: 'navigaciona putanja' + }, + calendar: { + label: 'Datum događaja', + monthPicker: 'Izbor meseca', + nextMonth: 'Sledeći mesec', + nextYear: 'Sledeća godina', + prevMonth: 'Prethodni mesec', + prevYear: 'Prethodna godina', + yearPicker: 'Izbor godine' + }, + carousel: { + dots: 'Izaberi slajd za prikaz', + goto: 'Idi na slajd {slide}', + next: 'Sledeći', + prev: 'Prethodni', + roledescription: 'karusel', + slide: 'slajd' + }, + chatAttachment: { + uploading: 'Otpremanje', + error: 'Otpremanje nije uspelo' + }, + chatMessages: { + autoScroll: 'Pomeri na dno' + }, + chatPrompt: { + placeholder: 'Unesi poruku ovde…', + queue: 'Poruke na čekanju', + sendNow: 'Pošalji odmah', + edit: 'Izmeni', + remove: 'Ukloni' + }, + chatPromptSubmit: { + label: 'Pošalji upit', + reload: 'Pokušaj ponovo', + stop: 'Zaustavi generisanje' + }, + colorMode: { + dark: 'Tamno', + light: 'Svetlo', + switchToDark: 'Prebaci na tamni režim', + switchToLight: 'Prebaci na svetli režim', + system: 'Sistem' + }, + commandPalette: { + back: 'Nazad', + close: 'Zatvori', + noData: 'Nema podataka', + noMatch: 'Nema odgovarajućih podataka', + placeholder: 'Unesi komandu ili pretraži…', + results: 'Rezultati' + }, + contentSearch: { + links: 'Linkovi', + search: 'Rezultati', + theme: 'Tema' + }, + contentSearchButton: { + label: 'Pretraži…' + }, + contentToc: { + title: 'Na ovoj stranici' + }, + dropdownMenu: { + noMatch: 'Nema odgovarajućih podataka', + search: 'Pretraži…' + }, + dashboardSearch: { + theme: 'Tema' + }, + dashboardSearchButton: { + label: 'Pretraži…' + }, + dashboardSidebarCollapse: { + collapse: 'Skupi bočnu traku', + expand: 'Proširi bočnu traku' + }, + dashboardSidebarToggle: { + close: 'Zatvori bočnu traku', + open: 'Otvori bočnu traku' + }, + drawer: { + close: 'Zatvori' + }, + error: { + clear: 'Nazad na početnu' + }, + fileUpload: { + removeFile: 'Ukloni {filename}' + }, + header: { + close: 'Zatvori meni', + open: 'Otvori meni' + }, + inputDate: { + day: 'dan', + dayPeriod: 'AM/PM', + era: 'era', + hour: 'sat', + minute: 'minut', + month: 'mesec', + second: 'sekund', + timeZoneName: 'vremenska zona', + year: 'godina' + }, + inputMenu: { + create: 'Kreiraj "{label}"', + noData: 'Nema podataka', + noMatch: 'Nema odgovarajućih podataka', + trigger: 'Prikaži opcije' + }, + inputNumber: { + decrement: 'Smanji', + increment: 'Povećaj', + roledescription: 'numeričko polje' + }, + inputRating: { + rate: 'Oceni {value} od {length}' + }, + inputTime: { + dayPeriod: 'AM/PM', + hour: 'sat', + minute: 'minut', + second: 'sekund', + timeZoneName: 'vremenska zona' + }, + listbox: { + noData: 'Nema podataka', + noMatch: 'Nema odgovarajućih podataka', + search: 'Pretraži…' + }, + modal: { + close: 'Zatvori' + }, + pagination: { + first: 'Prva stranica', + last: 'Poslednja stranica', + next: 'Sledeća stranica', + page: 'Stranica {page}', + prev: 'Prethodna stranica' + }, + pinInput: { + input: 'PIN polje {index} od {length}' + }, + pricingTable: { + caption: 'Poređenje cenovnih planova' + }, + prose: { + codeCollapse: { + closeText: 'Skupi', + name: 'kod', + openText: 'Proširi' + }, + collapsible: { + closeText: 'Sakrij', + name: 'svojstva', + openText: 'Prikaži' + }, + pre: { + copy: 'Kopiraj kod u privremenu memoriju' + }, + prompt: { + copy: 'Kopiraj upit', + openIn: 'Otvori u {name}' + } + }, + chatReasoning: { + thinking: 'Razmišljam…', + thought: 'Razmišljanje', + thoughtFor: 'Razmišljanje: {duration}' + }, + sidebar: { + close: 'Zatvori', + toggle: 'Prikaži/sakrij' + }, + selectMenu: { + create: 'Kreiraj "{label}"', + noData: 'Nema podataka', + noMatch: 'Nema odgovarajućih podataka', + search: 'Pretraži…' + }, + skeleton: { + label: 'učitavanje' + }, + slideover: { + close: 'Zatvori' + }, + slider: { + max: 'Maksimum', + min: 'Minimum', + thumb: 'Klizač', + value: 'Vrednost {index} od {total}' + }, + stepper: { + label: 'napredak' + }, + table: { + noData: 'Nema podataka' + }, + toast: { + close: 'Zatvori' + }, + toaster: { + label: 'Obaveštenje', + viewport: 'Obaveštenja ({hotkey})' + } + } +}) From 0bd7ff2a2e986cd97059d976d357238637ca1b9f Mon Sep 17 00:00:00 2001 From: Whatsaaaa Date: Mon, 16 Nov 2026 17:21:41 +0100 Subject: [PATCH 2/6] =?UTF-8?q?feat(locale):=20use=20=D0=BF=D1=80=D0=B5=20?= =?UTF-8?q?=D0=BF=D0=BE=D0=B4=D0=BD=D0=B5/=D0=BF=D0=BE=20=D0=BF=D0=BE?= =?UTF-8?q?=D0=B4=D0=BD=D0=B5=20in=20Serbian=20Cyrillic?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/runtime/locale/sr.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/runtime/locale/sr.ts b/src/runtime/locale/sr.ts index 77398dad34..60ce8861d8 100644 --- a/src/runtime/locale/sr.ts +++ b/src/runtime/locale/sr.ts @@ -114,7 +114,7 @@ export default defineLocale({ }, inputDate: { day: 'дан', - dayPeriod: 'AM/PM', + dayPeriod: 'пре подне/по подне', era: 'ера', hour: 'сат', minute: 'минут', @@ -138,7 +138,7 @@ export default defineLocale({ rate: 'Оцени {value} од {length}' }, inputTime: { - dayPeriod: 'AM/PM', + dayPeriod: 'пре подне/по подне', hour: 'сат', minute: 'минут', second: 'секунд', From c0e1bf1f834904f8fc4cba124c04965260eb7c27 Mon Sep 17 00:00:00 2001 From: Benjamin Canac Date: Tue, 17 Nov 2026 09:55:59 +0100 Subject: [PATCH 3/6] fix(locale): add collapse labels and use `sr-Latn` for Serbian Latin --- cli/utils.mjs | 3 ++- src/runtime/locale/sr.ts | 2 ++ src/runtime/locale/sr_latn.ts | 8 +++++--- test/locale.spec.ts | 3 ++- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/cli/utils.mjs b/cli/utils.mjs index e88c900312..38b724b7d4 100644 --- a/cli/utils.mjs +++ b/cli/utils.mjs @@ -54,7 +54,8 @@ export function normalizeLocale(locale) { if (locale.includes('_')) { return locale.split('_') - .map((part, index) => index === 0 ? part.toLowerCase() : part.toUpperCase()) + // A four-letter subtag is a script (`sr-Latn`), anything else a region (`pt-BR`) + .map((part, index) => index === 0 ? part.toLowerCase() : part.length === 4 ? part[0].toUpperCase() + part.slice(1).toLowerCase() : part.toUpperCase()) .join('-') } diff --git a/src/runtime/locale/sr.ts b/src/runtime/locale/sr.ts index 60ce8861d8..a88a9c7abc 100644 --- a/src/runtime/locale/sr.ts +++ b/src/runtime/locale/sr.ts @@ -168,11 +168,13 @@ export default defineLocale({ prose: { codeCollapse: { closeText: 'Скупи', + label: '{text} {name}', name: 'код', openText: 'Прошири' }, collapsible: { closeText: 'Сакриј', + label: '{text} {name}', name: 'својства', openText: 'Прикажи' }, diff --git a/src/runtime/locale/sr_latn.ts b/src/runtime/locale/sr_latn.ts index 2ce98307d8..92ed93c821 100644 --- a/src/runtime/locale/sr_latn.ts +++ b/src/runtime/locale/sr_latn.ts @@ -3,7 +3,7 @@ import { defineLocale } from '../composables/defineLocale' export default defineLocale({ name: 'Srpski (latinica)', - code: 'sr-LATN', + code: 'sr-Latn', messages: { alert: { close: 'Zatvori' @@ -114,7 +114,7 @@ export default defineLocale({ }, inputDate: { day: 'dan', - dayPeriod: 'AM/PM', + dayPeriod: 'pre podne/po podne', era: 'era', hour: 'sat', minute: 'minut', @@ -138,7 +138,7 @@ export default defineLocale({ rate: 'Oceni {value} od {length}' }, inputTime: { - dayPeriod: 'AM/PM', + dayPeriod: 'pre podne/po podne', hour: 'sat', minute: 'minut', second: 'sekund', @@ -168,11 +168,13 @@ export default defineLocale({ prose: { codeCollapse: { closeText: 'Skupi', + label: '{text} {name}', name: 'kod', openText: 'Proširi' }, collapsible: { closeText: 'Sakrij', + label: '{text} {name}', name: 'svojstva', openText: 'Prikaži' }, diff --git a/test/locale.spec.ts b/test/locale.spec.ts index cc37440945..87f6e85ca9 100644 --- a/test/locale.spec.ts +++ b/test/locale.spec.ts @@ -27,7 +27,8 @@ const nameExceptions: Record = { function normalizeLocale(locale: string): string { if (locale.includes('_')) { - return locale.split('_').map((part, index) => index === 0 ? part.toLowerCase() : part.toUpperCase()).join('-') + // A four-letter subtag is a script (`sr-Latn`), anything else a region (`pt-BR`) + return locale.split('_').map((part, index) => index === 0 ? part.toLowerCase() : part.length === 4 ? part[0]!.toUpperCase() + part.slice(1).toLowerCase() : part.toUpperCase()).join('-') } return locale.toLowerCase() } From 879b874eab98c352ac07cb9e351da9719bbbd9fa Mon Sep 17 00:00:00 2001 From: Benjamin Canac Date: Tue, 17 Nov 2026 10:09:27 +0100 Subject: [PATCH 4/6] fix(LocaleSelect): show the Serbian flag for `sr` and `sr-Latn` --- docs/app/components/content/SupportedLanguages.vue | 5 +++-- src/runtime/components/locale/LocaleSelect.vue | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/docs/app/components/content/SupportedLanguages.vue b/docs/app/components/content/SupportedLanguages.vue index cab1866494..68fdd0facf 100644 --- a/docs/app/components/content/SupportedLanguages.vue +++ b/docs/app/components/content/SupportedLanguages.vue @@ -37,6 +37,7 @@ function getEmojiFlag(locale: string): string { nb: 'no', // Norwegian Bokmål -> Norway sl: 'si', // Slovenian -> Slovenia sq: 'al', // Albanian -> Albania + sr: 'rs', // Serbian -> Serbia sv: 'se', // Swedish -> Sweden tg: 'tj', // Tajik -> Tajikistan uk: 'ua', // Ukrainian -> Ukraine @@ -44,10 +45,10 @@ function getEmojiFlag(locale: string): string { vi: 'vn' // Vietnamese -> Vietnam } - // If locale has a country code (e.g., en-GB), extract and use it + // If locale has a country code (e.g., en-GB), extract and use it, a four-letter subtag is a script (e.g., sr-Latn) if (locale.includes('-')) { const countryCode = locale.split('-')[1]?.toLowerCase() - if (countryCode) { + if (countryCode?.length === 2) { return countryCode.toUpperCase() .split('') .map(char => String.fromCodePoint(0x1F1A5 + char.charCodeAt(0))) diff --git a/src/runtime/components/locale/LocaleSelect.vue b/src/runtime/components/locale/LocaleSelect.vue index eacd3ba3cb..c1e5868cdb 100644 --- a/src/runtime/components/locale/LocaleSelect.vue +++ b/src/runtime/components/locale/LocaleSelect.vue @@ -54,6 +54,7 @@ function getEmojiFlag(locale: string): string { nb: 'no', // Norwegian Bokmål -> Norway sl: 'si', // Slovenian -> Slovenia sq: 'al', // Albanian -> Albania + sr: 'rs', // Serbian -> Serbia sv: 'se', // Swedish -> Sweden tg: 'tj', // Tajik -> Tajikistan uk: 'ua', // Ukrainian -> Ukraine @@ -61,10 +62,10 @@ function getEmojiFlag(locale: string): string { vi: 'vn' // Vietnamese -> Vietnam } - // If locale has a country code (e.g., en-GB), extract and use it + // If locale has a country code (e.g., en-GB), extract and use it, a four-letter subtag is a script (e.g., sr-Latn) if (locale.includes('-')) { const countryCode = locale.split('-')[1]?.toLowerCase() - if (countryCode) { + if (countryCode?.length === 2) { return countryCode.toUpperCase() .split('') .map(char => String.fromCodePoint(0x1F1A5 + char.charCodeAt(0))) From ba0e0e45d8fab84a4869eeca95ed4468cc2c45d5 Mon Sep 17 00:00:00 2001 From: Benjamin Canac Date: Tue, 17 Nov 2026 10:22:56 +0100 Subject: [PATCH 5/6] fix(LocaleSelect): read the region after a script subtag --- docs/app/components/content/SupportedLanguages.vue | 6 +++--- src/runtime/components/locale/LocaleSelect.vue | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/app/components/content/SupportedLanguages.vue b/docs/app/components/content/SupportedLanguages.vue index 68fdd0facf..12cd75983f 100644 --- a/docs/app/components/content/SupportedLanguages.vue +++ b/docs/app/components/content/SupportedLanguages.vue @@ -45,10 +45,10 @@ function getEmojiFlag(locale: string): string { vi: 'vn' // Vietnamese -> Vietnam } - // If locale has a country code (e.g., en-GB), extract and use it, a four-letter subtag is a script (e.g., sr-Latn) + // If locale has a country code (e.g., en-GB or sr-Latn-BA), extract and use it, a four-letter subtag is a script if (locale.includes('-')) { - const countryCode = locale.split('-')[1]?.toLowerCase() - if (countryCode?.length === 2) { + const countryCode = locale.split('-').slice(1).find(part => part.length === 2)?.toLowerCase() + if (countryCode) { return countryCode.toUpperCase() .split('') .map(char => String.fromCodePoint(0x1F1A5 + char.charCodeAt(0))) diff --git a/src/runtime/components/locale/LocaleSelect.vue b/src/runtime/components/locale/LocaleSelect.vue index c1e5868cdb..1317cd25c8 100644 --- a/src/runtime/components/locale/LocaleSelect.vue +++ b/src/runtime/components/locale/LocaleSelect.vue @@ -62,10 +62,10 @@ function getEmojiFlag(locale: string): string { vi: 'vn' // Vietnamese -> Vietnam } - // If locale has a country code (e.g., en-GB), extract and use it, a four-letter subtag is a script (e.g., sr-Latn) + // If locale has a country code (e.g., en-GB or sr-Latn-BA), extract and use it, a four-letter subtag is a script if (locale.includes('-')) { - const countryCode = locale.split('-')[1]?.toLowerCase() - if (countryCode?.length === 2) { + const countryCode = locale.split('-').slice(1).find(part => part.length === 2)?.toLowerCase() + if (countryCode) { return countryCode.toUpperCase() .split('') .map(char => String.fromCodePoint(0x1F1A5 + char.charCodeAt(0))) From e1f071b48496cc87960c4652ada317e6d59f5c55 Mon Sep 17 00:00:00 2001 From: Benjamin Canac Date: Tue, 17 Nov 2026 10:53:50 +0100 Subject: [PATCH 6/6] fix(LocaleSelect): read the region with `Intl.Locale` --- .../components/content/SupportedLanguages.vue | 21 +++++++++++-------- .../components/locale/LocaleSelect.vue | 21 +++++++++++-------- 2 files changed, 24 insertions(+), 18 deletions(-) diff --git a/docs/app/components/content/SupportedLanguages.vue b/docs/app/components/content/SupportedLanguages.vue index 12cd75983f..048bdf45dc 100644 --- a/docs/app/components/content/SupportedLanguages.vue +++ b/docs/app/components/content/SupportedLanguages.vue @@ -45,15 +45,18 @@ function getEmojiFlag(locale: string): string { vi: 'vn' // Vietnamese -> Vietnam } - // If locale has a country code (e.g., en-GB or sr-Latn-BA), extract and use it, a four-letter subtag is a script - if (locale.includes('-')) { - const countryCode = locale.split('-').slice(1).find(part => part.length === 2)?.toLowerCase() - if (countryCode) { - return countryCode.toUpperCase() - .split('') - .map(char => String.fromCodePoint(0x1F1A5 + char.charCodeAt(0))) - .join('') - } + // If locale has a country code (e.g., en-GB or sr-Latn-BA), extract and use it + let region: string | undefined + try { + region = new Intl.Locale(locale).region + } catch { + // Not a valid language tag, fall back to the language mapping + } + if (region?.length === 2) { + return region + .split('') + .map(char => String.fromCodePoint(0x1F1A5 + char.charCodeAt(0))) + .join('') } // Otherwise, use the language-to-country mapping diff --git a/src/runtime/components/locale/LocaleSelect.vue b/src/runtime/components/locale/LocaleSelect.vue index 1317cd25c8..faaad55e7e 100644 --- a/src/runtime/components/locale/LocaleSelect.vue +++ b/src/runtime/components/locale/LocaleSelect.vue @@ -62,15 +62,18 @@ function getEmojiFlag(locale: string): string { vi: 'vn' // Vietnamese -> Vietnam } - // If locale has a country code (e.g., en-GB or sr-Latn-BA), extract and use it, a four-letter subtag is a script - if (locale.includes('-')) { - const countryCode = locale.split('-').slice(1).find(part => part.length === 2)?.toLowerCase() - if (countryCode) { - return countryCode.toUpperCase() - .split('') - .map(char => String.fromCodePoint(0x1F1A5 + char.charCodeAt(0))) - .join('') - } + // If locale has a country code (e.g., en-GB or sr-Latn-BA), extract and use it + let region: string | undefined + try { + region = new Intl.Locale(locale).region + } catch { + // Not a valid language tag, fall back to the language mapping + } + if (region?.length === 2) { + return region + .split('') + .map(char => String.fromCodePoint(0x1F1A5 + char.charCodeAt(0))) + .join('') } // Otherwise, use the language-to-country mapping