gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-28 10:08:52 +01:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity

Merge branch 'main' into fix/quick-search-equals-operator

Browse Source
This commit is contained in:
Jon Fuller 2025-08-24 14:47:31 -07:00 committed by GitHub
commit b0b788b7dc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/client/src/widgets/view_widgets/calendar_view.ts
View File

@ -676,7 +676,7 @@ export async function getFullCalendarLocale(locale: string) {
return (await import("@fullcalendar/core/locales/ru")).default;
case "ja":
return (await import("@fullcalendar/core/locales/ja")).default;
case "pt_BR":
case "pt_br":
return (await import("@fullcalendar/core/locales/pt-br")).default;
case "uk":
return (await import("@fullcalendar/core/locales/uk")).default;

2
apps/server/src/services/i18n.ts
View File

@ -18,7 +18,7 @@ const DAYJS_LOADER: Record<LOCALE_IDS, () => Promise<typeof import("dayjs/locale
"he": () => import("dayjs/locale/he.js"),
"ja": () => import("dayjs/locale/ja.js"),
"ku": () => import("dayjs/locale/ku.js"),
"pt_BR": () => import("dayjs/locale/pt_BR.js"),
"pt_br": () => import("dayjs/locale/pt-br.js"),
"ro": () => import("dayjs/locale/ro.js"),
"ru": () => import("dayjs/locale/ru.js"),
"tw": () => import("dayjs/locale/zh-tw.js"),

2
packages/commons/src/lib/i18n.ts
View File

@ -16,7 +16,7 @@ const UNSORTED_LOCALES: Locale[] = [
{ id: "es", name: "Español", electronLocale: "es" },
{ id: "fr", name: "Français", electronLocale: "fr" },
{ id: "ja", name: "日本語", electronLocale: "ja" },
{ id: "pt_BR", name: "Português (Brasil)", electronLocale: "pt-BR" },
{ id: "pt_br", name: "Português (Brasil)", electronLocale: "pt-BR" },
{ id: "ro", name: "Română", electronLocale: "ro" },
{ id: "ru", name: "Русский", electronLocale: "ru" },
{ id: "tw", name: "繁體中文", electronLocale: "zh_TW" },