From 29db8193caab478045c79165941f9f11c15e6174 Mon Sep 17 00:00:00 2001 From: Jeffrey Chen <78434827+TCOTC@users.noreply.github.com> Date: Thu, 19 Sep 2024 20:07:29 +0800 Subject: [PATCH] orderedList --- app/appearance/langs/en_US.json | 2 +- app/appearance/langs/es_ES.json | 2 +- app/appearance/langs/fr_FR.json | 2 +- app/appearance/langs/ja_JP.json | 2 +- app/appearance/langs/zh_CHT.json | 2 +- app/appearance/langs/zh_CN.json | 2 +- app/src/constants.ts | 2 +- app/src/mobile/util/keyboardToolbar.ts | 2 +- app/src/protyle/hint/extend.ts | 2 +- app/src/protyle/wysiwyg/keydown.ts | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index 6f2eb5c1f1a..5063d7c4fd8 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -1206,7 +1206,7 @@ "list": "List", "more": "More", "nameEmpty": "Name is empty", - "ordered-list": "Order List", + "orderedList": "Order List", "outdent": "Outdent", "outlineOutdent": "List outline outdent", "outlineOutdentTip": "After enabling, the outdent will be using the list outline logic, i.e. moving the list items below the parent", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index 06c61d6520f..db502dbbfa4 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -1206,7 +1206,7 @@ "list": "Lista", "more": "Más", "nameEmpty": "El nombre está vacío", - "ordered-list": "Lista ordenada", + "orderedList": "Lista ordenada", "outdent": "anular la sangría", "outlineOutdent": "Lista de contorno sin sangría", "outlineOutdentTip": "Después de habilitar, el outdent utilizará la lógica de esquema de la lista, es decir, moviendo los elementos de la lista debajo del padre", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index e45a9d7f3fe..74772663bb5 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -1206,7 +1206,7 @@ "list": "Liste", "more": "Plus", "nameEmpty": "Nom est vide", - "ordered-list": "Liste d'ordres", + "orderedList": "Liste d'ordres", "outdent": "Outdent", "outlineOutdent": "Liste des retraits excessifs du contour", "outlineOutdentTip": "Après l'activation, le retrait négatif utilisera la logique de contour de la liste, c'est-à-dire en déplaçant les éléments de la liste sous le parent", diff --git a/app/appearance/langs/ja_JP.json b/app/appearance/langs/ja_JP.json index 1a7c4346dd7..3acd3a3b460 100644 --- a/app/appearance/langs/ja_JP.json +++ b/app/appearance/langs/ja_JP.json @@ -1206,7 +1206,7 @@ "list": "リスト", "more": "詳細", "nameEmpty": "名前が空です", - "ordered-list": "番号付きリスト", + "orderedList": "番号付きリスト", "outdent": "アウトデント", "outlineOutdent": "リストのアウトラインアウトデント", "outlineOutdentTip": "リスト項目にアウトラインロジックを使用してアウトデントします", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index 33074864e68..a8eca360715 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -1206,7 +1206,7 @@ "list": "無序列表", "more": "更多", "nameEmpty": "檔案名不能為空", - "ordered-list": "有序列表", + "orderedList": "有序列表", "outdent": "列表反向縮進", "outlineOutdent": "列表大綱反向縮進", "outlineOutdentTip": "啟用後將使用列表大綱式邏輯反向縮進，即將列表項移動到父級下方", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index 1f523e809d4..f69f620e7b5 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -1206,7 +1206,7 @@ "list": "无序列表", "more": "更多", "nameEmpty": "文件名不能为空", - "ordered-list": "有序列表", + "orderedList": "有序列表", "outdent": "列表反向缩进", "outlineOutdent": "列表大纲反向缩进", "outlineOutdentTip": "启用后将使用列表大纲式逻辑反向缩进，即将列表项移动到父级下方", diff --git a/app/src/constants.ts b/app/src/constants.ts index c214d122dbe..c395b68d3bd 100644 --- a/app/src/constants.ts +++ b/app/src/constants.ts @@ -429,7 +429,7 @@ export abstract class Constants { "inline-code": {default: "⌘G", custom: "⌘G"}, link: {default: "⌘K", custom: "⌘K"}, check: {default: "⌘L", custom: "⌘L"}, - "ordered-list": {default: "", custom: ""}, + "orderedList": {default: "", custom: ""}, list: {default: "", custom: ""}, table: {default: "⌘O", custom: "⌘O"}, code: {default: "⇧⌘K", custom: "⇧⌘K"}, diff --git a/app/src/mobile/util/keyboardToolbar.ts b/app/src/mobile/util/keyboardToolbar.ts index c6a944cb1cd..e43a643fba5 100644 --- a/app/src/mobile/util/keyboardToolbar.ts +++ b/app/src/mobile/util/keyboardToolbar.ts @@ -236,7 +236,7 @@ const renderSlashMenu = (protyle: IProtyle, toolbarElement: Element) => { ${getSlashItem("##### " + Lute.Caret, "iconH5", window.siyuan.languages.heading5, "true")} ${getSlashItem("###### " + Lute.Caret, "iconH6", window.siyuan.languages.heading6, "true")} ${getSlashItem("* " + Lute.Caret, "iconList", window.siyuan.languages.list, "true")} - ${getSlashItem("1. " + Lute.Caret, "iconOrderedList", window.siyuan.languages["ordered-list"], "true")} + ${getSlashItem("1. " + Lute.Caret, "iconOrderedList", window.siyuan.languages.orderedList, "true")} ${getSlashItem("* [ ] " + Lute.Caret, "iconCheck", window.siyuan.languages.check, "true")} ${getSlashItem("> " + Lute.Caret, "iconQuote", window.siyuan.languages.quote, "true")} ${getSlashItem("```", "iconCode", window.siyuan.languages.code, "true")} diff --git a/app/src/protyle/hint/extend.ts b/app/src/protyle/hint/extend.ts index 1a72b176cff..0419420a962 100644 --- a/app/src/protyle/hint/extend.ts +++ b/app/src/protyle/hint/extend.ts @@ -92,7 +92,7 @@ export const hintSlash = (key: string, protyle: IProtyle) => { }, { filter: ["有序列表", "youxuliebiao", "yxlb", "ordered list"], value: "1. " + Lute.Caret, - html: `
${window.siyuan.languages["ordered-list"]}1. 
`, + html: `
${window.siyuan.languages.orderedList}1. 
`, }, { filter: ["任务列表", "renwuliebiao", "rwlb", "task list", "todo list"], value: "* [ ] " + Lute.Caret, diff --git a/app/src/protyle/wysiwyg/keydown.ts b/app/src/protyle/wysiwyg/keydown.ts index 2642f5ea7e3..cb08cb17770 100644 --- a/app/src/protyle/wysiwyg/keydown.ts +++ b/app/src/protyle/wysiwyg/keydown.ts @@ -1379,7 +1379,7 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => { } const isMatchList = matchHotKey(window.siyuan.config.keymap.editor.insert.list.custom, event); const isMatchCheck = matchHotKey(window.siyuan.config.keymap.editor.insert.check.custom, event); - const isMatchOList = matchHotKey(window.siyuan.config.keymap.editor.insert["ordered-list"].custom, event); + const isMatchOList = matchHotKey(window.siyuan.config.keymap.editor.insert.orderedList.custom, event); const isMatchQuote = matchHotKey(window.siyuan.config.keymap.editor.insert.quote.custom, event); if (isMatchList || isMatchOList || isMatchCheck || isMatchQuote) { const selectsElement: HTMLElement[] = Array.from(protyle.wysiwyg.element.querySelectorAll(".protyle-wysiwyg--select"));