Merge branch 'main' of https://github.com/TriliumNext/Trilium

apps/client/src/stylesheets/style.css

@@ -1686,46 +1686,6 @@ body:not(.mobile) #launcher-pane.horizontal .dropdown-submenu > .dropdown-menu {
     body.mobile .modal-dialog.modal-dialog-scrollable {
         height: unset;
     }
-
-    body.mobile .revisions-dialog .modal-dialog {
-        height: 95vh;
-    }
-
-    body.mobile .revisions-dialog .modal-body {
-        height: 100% !important;
-        flex-direction: column;
-        padding: 0;
-    }
-
-    body.mobile .revisions-dialog .revision-list {
-        height: unset;
-        max-height: 20vh;
-        border-bottom: 1px solid var(--main-border-color) !important;
-        padding: 0 1em;
-    }
-
-    body.mobile .revisions-dialog .modal-body > .revision-content-wrapper {
-        flex-grow: 1;
-        height: 100%;
-        overflow: auto;
-        margin: 0;
-    }
-
-    body.mobile .revisions-dialog .modal-body > .revision-content-wrapper > div:first-of-type {
-        flex-direction: column;
-    }
-
-    body.mobile .revisions-dialog .revision-title {
-        font-size: 1rem;
-    }
-
-    body.mobile .revisions-dialog .revision-title-buttons {
-        text-align: center;
-    }
-
-    body.mobile .revisions-dialog .revision-content {
-        padding: 0.5em;
-    }
 }
 
 /* Mobile, tablet mode */

apps/client/src/translations/en/translation.json

@@ -2107,5 +2107,8 @@
     "clear-color": "Clear note color",
     "set-color": "Set note color",
     "set-custom-color": "Set custom note color"
+  },
+  "popup-editor": {
+    "maximize": "Switch to full editor"
   }
 }

apps/client/src/widgets/collections/calendar/index.tsx

@@ -77,6 +77,7 @@ export const LOCALE_MAPPINGS: Record<DISPLAYABLE_LOCALE_IDS, (() => Promise<{ de
     "pt_br": () => import("@fullcalendar/core/locales/pt-br"),
     uk: () => import("@fullcalendar/core/locales/uk"),
     en: null,
+    "en-GB": () => import("@fullcalendar/core/locales/en-gb"),
     "en_rtl": null,
     ar: () => import("@fullcalendar/core/locales/ar")
 };

apps/client/src/widgets/dialogs/PopupEditor.tsx

@@ -19,6 +19,8 @@ import tree from "../../services/tree";
 import froca from "../../services/froca";
 import ReadOnlyNoteInfoBar from "../ReadOnlyNoteInfoBar";
 import MobileEditorToolbar from "../type_widgets/text/mobile_editor_toolbar";
+import { t } from "../../services/i18n";
+import appContext from "../../components/app_context";
 
 export default function PopupEditor() {
     const [ shown, setShown ] = useState(false);
@@ -62,8 +64,13 @@ export default function PopupEditor() {
                     title={<TitleRow />}
                     customTitleBarButtons={[{
                         iconClassName: "bx-expand-alt",
-                        title: "Switch to full editor",
-                        onClick: () => {/* TO DO */}
+                        title: t("popup-editor.maximize"),
+                        onClick: async () => {
+                            if (!noteContext.noteId) return;
+                            const { noteId, hoistedNoteId } = noteContext;
+                            await appContext.tabManager.openInNewTab(noteId, hoistedNoteId, true);
+                            setShown(false);
+                        }
                     }]}
                     className="popup-editor-dialog"
                     size="lg"

apps/client/src/widgets/dialogs/revisions.css

@@ -0,0 +1,63 @@
+body.mobile .revisions-dialog {
+    .modal-dialog {
+        height: 95vh;
+    }
+
+    .modal-header {
+        display: flex;
+        flex-wrap: wrap;
+        gap: 0.25em;
+        font-size: 0.9em;
+    }
+
+    .modal-title {
+        flex-grow: 1;
+        width: 100%;
+    }
+    
+    .modal-body {
+        height: fit-content !important;
+        flex-direction: column;
+        padding: 0;
+    }
+
+    .modal-footer {
+        font-size: 0.9em;
+    }
+    
+    .revision-list {
+        height: fit-content !important;
+        max-height: 20vh;
+        border-bottom: 1px solid var(--main-border-color) !important;
+        padding: 0 1em;
+        flex-shrink: 0;
+    }
+    
+    .modal-body > .revision-content-wrapper {
+        flex-grow: 1;
+        max-width: unset !important;
+        height: 100%;
+        margin: 0;
+        display: block !important;
+    }
+    
+    .modal-body > .revision-content-wrapper > div:first-of-type {
+        flex-direction: column;
+    }
+    
+    .revision-title {
+        font-size: 1rem;
+    }
+    
+    .revision-title-buttons {
+        text-align: center;
+        display: flex;
+        gap: 0.25em;
+        flex-wrap: wrap;
+    }
+    
+    .revision-content {
+        padding: 0.5em;
+        height: fit-content;
+    }
+}

apps/client/src/widgets/dialogs/revisions.tsx

@@ -20,6 +20,7 @@ import ActionButton from "../react/ActionButton";
 import options from "../../services/options";
 import { useTriliumEvent } from "../react/hooks";
 import { diffWords } from "diff";
+import "./revisions.css";
 
 export default function RevisionsDialog() {
     const [ note, setNote ] = useState<FNote>();
@@ -137,7 +138,7 @@ export default function RevisionsDialog() {
 
 function RevisionsList({ revisions, onSelect, currentRevision }: { revisions: RevisionItem[], onSelect: (val: string) => void, currentRevision?: RevisionItem }) {
     return (
-        <FormList onSelect={onSelect} fullHeight>
+        <FormList onSelect={onSelect} fullHeight wrapperClassName="revision-list">
             {revisions.map((item) =>
                 <FormListItem
                     value={item.revisionId}

apps/client/src/widgets/react/FormList.tsx

@@ -6,15 +6,17 @@ import "./FormList.css";
 import { CommandNames } from "../../components/app_context";
 import { useStaticTooltip } from "./hooks";
 import { handleRightToLeftPlacement, isMobile } from "../../services/utils";
+import clsx from "clsx";
 
 interface FormListOpts {
     children: ComponentChildren;
     onSelect?: (value: string) => void;
     style?: CSSProperties;
+    wrapperClassName?: string;
     fullHeight?: boolean;
 }
 
-export default function FormList({ children, onSelect, style, fullHeight }: FormListOpts) {
+export default function FormList({ children, onSelect, style, fullHeight, wrapperClassName }: FormListOpts) {
     const wrapperRef = useRef<HTMLDivElement | null>(null);
     const triggerRef = useRef<HTMLButtonElement | null>(null);
 
@@ -43,7 +45,7 @@ export default function FormList({ children, onSelect, style, fullHeight }: Form
     }, [ fullHeight ]);
 
     return (
-        <div className="dropdownWrapper" ref={wrapperRef} style={builtinStyles}>
+        <div className={clsx("dropdownWrapper", wrapperClassName)} ref={wrapperRef} style={builtinStyles}>
             <div className="dropdown" style={builtinStyles}>
                 <button
                     ref={triggerRef}

apps/client/src/widgets/type_widgets/MindMap.tsx

@@ -28,6 +28,7 @@ const LOCALE_MAPPINGS: Record<DISPLAYABLE_LOCALE_IDS, Options["locale"] | null>
     de: null,
     en: "en",
     en_rtl: "en",
+    "en-GB": "en",
     es: "es",
     fr: "fr",
     it: "it",

apps/client/src/widgets/type_widgets/canvas/i18n.spec.ts

@@ -22,6 +22,7 @@ describe("Canvas i18n", () => {
             if (locale.contentOnly || locale.devOnly) continue;
             const languageCode = LANGUAGE_MAPPINGS[locale.id];
             if (!supportedLanguageCodes.has(languageCode)) {
+                console.log("Supported locales:", Array.from(supportedLanguageCodes.values()).join(", "));
                 expect.fail(`Unable to find locale for ${locale.id} -> ${languageCode}.`)
             }
         }

apps/client/src/widgets/type_widgets/canvas/i18n.ts

@@ -1,10 +1,12 @@
+import { Language } from "@excalidraw/excalidraw/i18n";
 import type { DISPLAYABLE_LOCALE_IDS } from "@triliumnext/commons";
 
-export const LANGUAGE_MAPPINGS: Record<DISPLAYABLE_LOCALE_IDS, string | null> = {
+export const LANGUAGE_MAPPINGS: Record<DISPLAYABLE_LOCALE_IDS, Language["code"] | null> = {
     ar: "ar-SA",
     cn: "zh-CN",
     de: "de-DE",
     en: "en",
+    "en-GB": "en",
     en_rtl: "en",
     es: "es-ES",
     fr: "fr-FR",

apps/server/src/services/i18n.ts

@@ -7,11 +7,13 @@ import hidden_subtree from "./hidden_subtree.js";
 import { LOCALES, type Locale, type LOCALE_IDS } from "@triliumnext/commons";
 import dayjs, { Dayjs } from "dayjs";
 
+// When adding a new locale, prefer the version with hyphen instead of underscore.
 export const DAYJS_LOADER: Record<LOCALE_IDS, () => Promise<typeof import("dayjs/locale/en.js")>> = {
     "ar": () => import("dayjs/locale/ar.js"),
     "cn": () => import("dayjs/locale/zh-cn.js"),
     "de": () => import("dayjs/locale/de.js"),
     "en": () => import("dayjs/locale/en.js"),
+    "en-GB": () => import("dayjs/locale/en-gb.js"),
     "en_rtl": () => import("dayjs/locale/en.js"),
     "es": () => import("dayjs/locale/es.js"),
     "fa": () => import("dayjs/locale/fa.js"),

packages/ckeditor5/src/i18n.ts

@@ -10,6 +10,11 @@ interface LocaleMapping {
 const LOCALE_MAPPINGS: Record<DISPLAYABLE_LOCALE_IDS, LocaleMapping | null> = {
     en: null,
     en_rtl: null,
+    "en-GB": {
+        languageCode: "en-GB",
+        coreTranslation: () => import("ckeditor5/translations/en-gb.js"),
+        premiumFeaturesTranslation: () => import("ckeditor5-premium-features/translations/en-gb.js"),
+    },
     ar: {
         languageCode: "ar",
         coreTranslation: () => import("ckeditor5/translations/ar.js"),

packages/commons/src/lib/i18n.ts

@@ -15,6 +15,7 @@ const UNSORTED_LOCALES = [
     { id: "cn", name: "简体中文", electronLocale: "zh_CN" },
     { id: "de", name: "Deutsch", electronLocale: "de" },
     { id: "en", name: "English", electronLocale: "en" },
+    { id: "en-GB", name: "English (United Kingdom)", electronLocale: "en_GB" },
     { id: "es", name: "Español", electronLocale: "es" },
     { id: "fr", name: "Français", electronLocale: "fr" },
     { id: "it", name: "Italiano", electronLocale: "it" },