Skip to content

Build your personal knowledge base with Trilium Notes

client/text editor: remove the "Insert" prefix from formatting commands

Adorian Dorana2bef8ebf988
diff --git a/apps/client/src/translations/en/translation.json b/apps/client/src/translations/en/translation.json
index e65dd965d6..b819c6dcea 100644
--- a/apps/client/src/translations/en/translation.json
+++ b/apps/client/src/translations/en/translation.json
@@ -4271,8 +4271,6 @@
"insert-date-time": "Insert date/time",
"insert-date-time-0": "Insert date/time: %0",
"insert-footnote-0": "Insert footnote %0",
- "insert-math": "Insert math",
- "insert-mermaid-diagram": "Insert Mermaid diagram",
"insert-mermaid-source-code": "Insert Mermaid source code",
"insert-paragraph-after-code-block": "Insert paragraph after code block",
"insert-paragraph-before-code-block": "Insert paragraph before code block",
@@ -4338,7 +4336,6 @@
"upload-image": "Upload image",
"warning": "Warning",
"working": "Working…",
- "insert-icon": "Insert icon",
"icon": "Icon",
"insert-an-icon-from-an-installed-icon-pack": "Insert an icon from an installed icon pack",
"transform-icon": "Transform icon",
@@ -4349,7 +4346,9 @@
"rotate-270": "Rotate 270°",
"flip-horizontally": "Flip horizontally",
"flip-vertically": "Flip vertically",
- "change-icon": "Change icon"
+ "change-icon": "Change icon",
+ "math": "Math",
+ "date-time": "Date/time"
},
"task-state-dropped-title": "Invalid task states",
"task-state-dropped-message_one": "A custom task state definition is invalid and was ignored.",
diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Markdown.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Markdown.html
index 8f34b6f628..a73baac44e 100644
--- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Markdown.html
+++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Markdown.html
@@ -159,8 +159,8 @@
into a new child note.</li>
<li><em>Add link</em> (<kbd>Ctrl</kbd>+<kbd>L</kbd>) which shows the dialog
to create external or reference links.</li>
- <li><em>Insert date/time</em> (<kbd>Alt</kbd>+<kbd>T</kbd>) which respects
- the same formatting as text notes.</li>
+ <li><em>Date/time</em> (<kbd>Alt</kbd>+<kbd>T</kbd>) which respects the same
+ formatting as text notes.</li>
<li><em>Include note</em> (not assigned by default), which triggers the same
dialog to insert notes as the one for text notes.</li>
</ul>
diff --git a/docs/User Guide/User Guide/Note Types/Markdown.md b/docs/User Guide/User Guide/Note Types/Markdown.md
index 7de9b7f457..8e7c9bb283 100644
--- a/docs/User Guide/User Guide/Note Types/Markdown.md
+++ b/docs/User Guide/User Guide/Note Types/Markdown.md
@@ -124,7 +124,7 @@ The Markdown notes share some of the keyboard shortcuts from <a class="referenc
* _Cut to note_ (<kbd>Ctrl</kbd>+<kbd>X</kbd>) which cuts the selection into a new child note.
* _Add link_ (<kbd>Ctrl</kbd>+<kbd>L</kbd>) which shows the dialog to create external or reference links.
-* _Insert date/time_ (<kbd>Alt</kbd>+<kbd>T</kbd>) which respects the same formatting as text notes.
+* _Date/time_ (<kbd>Alt</kbd>+<kbd>T</kbd>) which respects the same formatting as text notes.
* _Include note_ (not assigned by default), which triggers the same dialog to insert notes as the one for text notes.
In addition, the following formatting keyboard shortcuts are available:
diff --git a/packages/ckeditor5/src/plugins/inline_icon/inline_icon_ui.ts b/packages/ckeditor5/src/plugins/inline_icon/inline_icon_ui.ts
index f415bd7314..0555543fe3 100644
--- a/packages/ckeditor5/src/plugins/inline_icon/inline_icon_ui.ts
+++ b/packages/ckeditor5/src/plugins/inline_icon/inline_icon_ui.ts
@@ -39,7 +39,7 @@ export default class InlineIconUI extends Plugin {
const editor = this.editor;
const t = editor.t;
- this.addPickerButton(INSERT_ICON_COMMAND, t("Insert icon"));
+ this.addPickerButton(INSERT_ICON_COMMAND, t("Icon"));
this.addPickerButton(CHANGE_ICON, t("Change icon"));
// Esc reaches the editor only while the caret has focus, and the picker takes focus away,
diff --git a/packages/ckeditor5/src/plugins/insert_date_time.spec.ts b/packages/ckeditor5/src/plugins/insert_date_time.spec.ts
index bbb8e30e14..a276b5822d 100644
--- a/packages/ckeditor5/src/plugins/insert_date_time.spec.ts
+++ b/packages/ckeditor5/src/plugins/insert_date_time.spec.ts
@@ -87,7 +87,7 @@ describe("InsertDateTimePlugin", () => {
expect(dropdown.buttonView).toBeInstanceOf(SplitButtonView);
// No dictionary is configured here, so `t()` renders the message id, which is the
// English label.
- expect(dropdown.buttonView.label).toBe("Insert date/time");
+ expect(dropdown.buttonView.label).toBe("Date/time");
const spy = vi.spyOn(editor, "execute");
dropdown.buttonView.fire("execute");
diff --git a/packages/ckeditor5/src/plugins/insert_date_time.ts b/packages/ckeditor5/src/plugins/insert_date_time.ts
index d600526e8e..a09f8a1052 100644
--- a/packages/ckeditor5/src/plugins/insert_date_time.ts
+++ b/packages/ckeditor5/src/plugins/insert_date_time.ts
@@ -37,7 +37,7 @@ export default class InsertDateTimePlugin extends Plugin {
addListToDropdown(dropdownView, items);
dropdownView.buttonView.set({
- label: t('Insert date/time'),
+ label: t('Date/time'),
icon: dateTimeIcon,
tooltip: true
});
diff --git a/packages/ckeditor5/src/plugins/math/math_ui.ts b/packages/ckeditor5/src/plugins/math/math_ui.ts
index 303a3f1d28..a2bebf4297 100644
--- a/packages/ckeditor5/src/plugins/math/math_ui.ts
+++ b/packages/ckeditor5/src/plugins/math/math_ui.ts
@@ -258,7 +258,7 @@ export default class MathUI extends Plugin {
const button = new ButtonView( locale );
button.isEnabled = true;
- button.label = t( 'Insert math' );
+ button.label = t( 'Math' );
button.icon = mathIcon;
button.keystroke = mathKeystroke;
button.tooltip = true;
diff --git a/packages/ckeditor5/src/plugins/mermaid/mermaid_ui.spec.ts b/packages/ckeditor5/src/plugins/mermaid/mermaid_ui.spec.ts
index ddbf60387a..f996adadcc 100644
--- a/packages/ckeditor5/src/plugins/mermaid/mermaid_ui.spec.ts
+++ b/packages/ckeditor5/src/plugins/mermaid/mermaid_ui.spec.ts
@@ -40,7 +40,7 @@ describe( 'MermaidUI', () => {
it( 'has the base properties', () => {
const dropdown = editor.ui.componentFactory.create( 'mermaid' );
- expect( dropdown.buttonView ).to.have.property( 'label', 'Insert Mermaid diagram' );
+ expect( dropdown.buttonView ).to.have.property( 'label', 'Mermaid diagram' );
expect( dropdown.buttonView ).to.have.property( 'icon' );
expect( dropdown.buttonView ).to.have.property( 'tooltip', true );
} );
diff --git a/packages/ckeditor5/src/plugins/mermaid/mermaid_ui.ts b/packages/ckeditor5/src/plugins/mermaid/mermaid_ui.ts
index c6b2896e17..fbe4147948 100644
--- a/packages/ckeditor5/src/plugins/mermaid/mermaid_ui.ts
+++ b/packages/ckeditor5/src/plugins/mermaid/mermaid_ui.ts
@@ -76,7 +76,7 @@ export default class MermaidUI extends Plugin {
const splitButtonView = dropdownView.buttonView;
splitButtonView.set( {
- label: t( 'Insert Mermaid diagram' ),
+ label: t( 'Mermaid diagram' ),
icon: insertMermaidIcon,
tooltip: true
} );