Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-01 19:05:59 +01:00
Code Issues Packages Projects Releases Activity

feat(note_language): initialize CKEditor with right language

Browse Source
This commit is contained in:
Elian Doran
2025-03-04 19:29:02 +02:00
parent 3546ac6ded
commit 42d3334c9d
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/public/app/widgets/note_detail.ts
View File

@@ -148,6 +148,9 @@ export default class NoteDetailWidget extends NoteContextAwareWidget {
typeWidget.spacedUpdate = this.spacedUpdate; typeWidget.spacedUpdate = this.spacedUpdate;
typeWidget.setParent(this); typeWidget.setParent(this);
if (this.noteContext) {
typeWidget.setNoteContextEvent({ noteContext: this.noteContext });
}
const $renderedWidget = typeWidget.render(); const $renderedWidget = typeWidget.render();
keyboardActionsService.updateDisplayedShortcuts($renderedWidget); keyboardActionsService.updateDisplayedShortcuts($renderedWidget);

14
src/public/app/widgets/type_widgets/editable_text.js
View File

@@ -185,7 +185,7 @@ export default class EditableTextTypeWidget extends AbstractTextTypeWidget {
this.watchdog.setCreator(async (elementOrData, editorConfig) => { this.watchdog.setCreator(async (elementOrData, editorConfig) => {
logInfo("Creating new CKEditor"); logInfo("Creating new CKEditor");
const editor = await editorClass.create(elementOrData, { const finalConfig = {
...editorConfig, ...editorConfig,
...buildConfig(), ...buildConfig(),
...buildToolbarConfig(isClassicEditor), ...buildToolbarConfig(isClassicEditor),
@@ -195,7 +195,17 @@ export default class EditableTextTypeWidget extends AbstractTextTypeWidget {
classes: true, classes: true,
attributes: true attributes: true
} }
}); };
const contentLanguage = this.note.getLabelValue("language");
if (contentLanguage) {
finalConfig.language = {
ui: (typeof finalConfig.language === "string" ? finalConfig.language : "en"),
content: contentLanguage
}
}
const editor = await editorClass.create(elementOrData, finalConfig);
const notificationsPlugin = editor.plugins.get("Notification"); const notificationsPlugin = editor.plugins.get("Notification");
notificationsPlugin.on("show:warning", (evt, data) => { notificationsPlugin.on("show:warning", (evt, data) => {