From 4a264cd8b75ae884b11d3f722aba81d7b0dfef75 Mon Sep 17 00:00:00 2001 From: Henrik Giesel Date: Thu, 22 Apr 2021 13:38:37 +0200 Subject: [PATCH] Add editing fluent strings without attached keyboard shortcuts --- ftl/core/editing.ftl | 38 ++++++++++++++++++++++++++------------ ts/editor/cloze.ts | 2 +- ts/editor/color.ts | 4 ++-- ts/editor/formatInline.ts | 12 ++++++------ ts/editor/notetype.ts | 2 +- 5 files changed, 36 insertions(+), 22 deletions(-) diff --git a/ftl/core/editing.ftl b/ftl/core/editing.ftl index 19e59632e..131fe1034 100644 --- a/ftl/core/editing.ftl +++ b/ftl/core/editing.ftl @@ -2,14 +2,14 @@ editing-add-media = Add Media editing-align-left = Align left editing-align-right = Align right editing-an-error-occurred-while-opening = An error occurred while opening { $val } -editing-attach-picturesaudiovideo-f3 = Attach pictures/audio/video (F3) -editing-bold-text-ctrlandb = Bold text (Ctrl+B) +editing-attach-picturesaudiovideo = Attach pictures/audio/video +editing-bold-text = Bold text editing-cards = Cards editing-center = Center -editing-change-colour-f8 = Change colour (F8) -editing-cloze-deletion-ctrlandshiftandc = Cloze deletion (Ctrl+Shift+C) +editing-change-color = Change color +editing-cloze-deletion = Cloze deletion editing-couldnt-record-audio-have-you-installed = Couldn't record audio. Have you installed 'lame'? -editing-customize-card-templates-ctrlandl = Customize Card Templates (Ctrl+L) +editing-customize-card-templates = Customize Card Templates editing-customize-fields = Customize Fields editing-cut = Cut editing-edit-current = Edit Current @@ -17,7 +17,7 @@ editing-edit-html = Edit HTML editing-fields = Fields editing-html-editor = HTML Editor editing-indent = Increase indent -editing-italic-text-ctrlandi = Italic text (Ctrl+I) +editing-italic-text = Italic text editing-jump-to-tags-with-ctrlandshiftandt = Jump to tags with Ctrl+Shift+T editing-justify = Justify editing-latex = LaTeX @@ -30,14 +30,28 @@ editing-media = Media editing-ordered-list = Ordered list editing-outdent = Decrease indent editing-paste = Paste -editing-record-audio-f5 = Record audio (F5) -editing-remove-formatting-ctrlandr = Remove formatting (Ctrl+R) -editing-set-foreground-colour-f7 = Set foreground colour (F7) +editing-record-audio = Record audio +editing-remove-formatting = Remove formatting +editing-set-foreground-color = Set foreground color editing-show-duplicates = Show Duplicates -editing-subscript-ctrland = Subscript (Ctrl+=) -editing-superscript-ctrlandand = Superscript (Ctrl++) +editing-subscript = Subscript +editing-superscript = Superscript editing-tags = Tags editing-to-make-a-cloze-deletion-on = To make a cloze deletion on an existing note, you need to change it to a cloze type first, via 'Notes>Change Note Type' -editing-underline-text-ctrlandu = Underline text (Ctrl+U) +editing-underline-text = Underline text editing-unordered-list = Unordered list editing-warning-cloze-deletions-will-not-work = Warning, cloze deletions will not work until you switch the type at the top to Cloze. + +### deprecated, do not use +editing-bold-text-ctrlandb = Bold text (Ctrl+B) +editing-italic-text-ctrlandi = Italic text (Ctrl+I) +editing-underline-text-ctrlandu = Underline text (Ctrl+U) +editing-subscript-ctrland = Subscript (Ctrl+=) +editing-superscript-ctrlandand = Superscript (Ctrl++) +editing-remove-formatting-ctrlandr = Remove formatting (Ctrl+R) +editing-record-audio-f5 = Record audio (F5) +editing-attach-picturesaudiovideo-f3 = Attach pictures/audio/video (F3) +editing-cloze-deletion-ctrlandshiftandc = Cloze deletion (Ctrl+Shift+C) +editing-change-colour-f8 = Change colour (F8) +editing-set-foreground-colour-f7 = Set foreground colour (F7) +editing-customize-card-templates-ctrlandl = Customize Card Templates (Ctrl+L) diff --git a/ts/editor/cloze.ts b/ts/editor/cloze.ts index 69eaa1d3c..8434edcd6 100644 --- a/ts/editor/cloze.ts +++ b/ts/editor/cloze.ts @@ -48,7 +48,7 @@ export function getClozeButton(): DynamicSvelteComponent & button: iconButton({ icon: bracketsIcon, onClick: onCloze, - tooltip: tr.editingClozeDeletionCtrlandshiftandc(), + tooltip: tr.editingClozeDeletion(), }), }); } diff --git a/ts/editor/color.ts b/ts/editor/color.ts index 1c2dca19f..b41345b06 100644 --- a/ts/editor/color.ts +++ b/ts/editor/color.ts @@ -37,7 +37,7 @@ export function getColorGroup(): DynamicSvelteComponent & icon: squareFillIcon, className: "forecolor", onClick: () => wrapWithForecolor(getForecolor()), - tooltip: tr.editingSetForegroundColourF7(), + tooltip: tr.editingSetForegroundColor(), }), }); @@ -46,7 +46,7 @@ export function getColorGroup(): DynamicSvelteComponent & button: colorPicker({ onChange: ({ currentTarget }) => setForegroundColor((currentTarget as HTMLInputElement).value), - tooltip: tr.editingChangeColourF8(), + tooltip: tr.editingChangeColor(), }), }); diff --git a/ts/editor/formatInline.ts b/ts/editor/formatInline.ts index 6907945b3..4dd131e42 100644 --- a/ts/editor/formatInline.ts +++ b/ts/editor/formatInline.ts @@ -25,7 +25,7 @@ export function getFormatInlineGroup(): DynamicSvelteComponent { document.execCommand("removeFormat"); }, diff --git a/ts/editor/notetype.ts b/ts/editor/notetype.ts index d11aefa79..4978aeea9 100644 --- a/ts/editor/notetype.ts +++ b/ts/editor/notetype.ts @@ -21,7 +21,7 @@ export function getNotetypeGroup(): DynamicSvelteComponent & onClick: () => bridgeCommand("cards"), disables: false, label: `${tr.editingCards()}...`, - tooltip: tr.editingCustomizeCardTemplatesCtrlandl(), + tooltip: tr.editingCustomizeCardTemplates(), }); return buttonGroup({