📝 fix #9217

siyuan-note · Sep 18, 2023 · f2f292c · f2f292c
1 parent 766e7eb
commit f2f292c
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 8 deletions.
diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json
@@ -288,7 +288,6 @@
   "embedBlockBreadcrumb": "Embed Block Breadcrumb",
   "embedBlockBreadcrumbTip": "After enabling embed blocks will display breadcrumbs, embed blocks in super blocks ignore this option and never show breadcrumbs",
   "appearanceMode": "Appearance Mode",
-  "editMode": "Edit Mode",
   "editReadonly": "Read-only mode",
   "editReadonlyTip": "After enabling, the editor will load the document in read-only mode",
   "generateConflictDoc": "Generate conflict documentation when syncing conflicts",

diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json
@@ -288,7 +288,6 @@
   "embedBlockBreadcrumb": "Incrustar migas de pan de bloque",
   "embedBlockBreadcrumbTip": "Después de habilitar los bloques incrustados, se mostrarán migas de pan, incrustar bloques en superbloques ignora esta opción y nunca muestra migas de pan",
   "appearanceMode": "Modo de apariencia",
-  "editMode": "Modo de edición",
   "editReadonly": "Modo de solo lectura",
   "editReadonlyTip": "Después de habilitarlo, el editor cargará el documento en modo de solo lectura",
   "generateConflictDoc": "Generar documentación de conflicto al sincronizar conflictos",

diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json
@@ -288,7 +288,6 @@
   "embedBlockBreadcrumb": "Intégrer le fil d'Ariane du bloc",
   "embedBlockBreadcrumbTip": "Après avoir activé l'intégration, les blocs afficheront le fil d'Ariane, intégrer des blocs dans des super blocs ignorent cette option et n'affichent jamais le fil d'Ariane",
   "appearanceMode": "Mode d'apparence",
-  "editMode": "Mode d'édition",
   "editReadonly": "Mode lecture seule",
   "editReadonlyTip": "Lorsqu'il est activé, l'éditeur charge le document en mode lecture seule",
   "generateConflictDoc": "Générer une documentation sur les conflits lors de la synchronisation des conflits",

diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json
@@ -288,7 +288,6 @@
   "embedBlockBreadcrumb": "嵌入塊導覽路徑",
   "embedBlockBreadcrumbTip": "啟用後嵌入塊將顯示導覽路徑，在超級塊中的嵌入塊忽略該選項，始終不顯示導覽路徑",
   "appearanceMode": "外觀模式",
-  "editMode": "編輯模式",
   "editReadonly": "只讀模式",
   "editReadonlyTip": "啟用後編輯器將以只讀模式載入文檔",
   "generateConflictDoc": "同步衝突時生成衝突文檔",

diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json
@@ -288,7 +288,6 @@
   "embedBlockBreadcrumb": "嵌入块面包屑",
   "embedBlockBreadcrumbTip": "启用后嵌入块将显示面包屑，在超级块中的嵌入块忽略该选项，始终不显示面包屑",
   "appearanceMode": "外观模式",
-  "editMode": "编辑模式",
   "editReadonly": "只读模式",
   "editReadonlyTip": "启用后编辑器将以只读模式载入文档",
   "generateConflictDoc": "同步冲突时生成冲突文档",

diff --git a/app/src/boot/globalEvent/keydown.ts b/app/src/boot/globalEvent/keydown.ts
@@ -1081,7 +1081,7 @@ export const windowKeyDown = (app: App, event: KeyboardEvent) => {
         commandPanel(app);
         return;
     }
-    if (matchHotKey(window.siyuan.config.keymap.general.editMode.custom, event)) {
+    if (matchHotKey(window.siyuan.config.keymap.general.editReadonly.custom, event)) {
         event.preventDefault();
         editor.setReadonly(!window.siyuan.config.editor.readOnly);
         return;

diff --git a/app/src/config/editor.ts b/app/src/config/editor.ts
@@ -43,7 +43,7 @@ export const editor = {
 <label class="fn__flex b3-label">
     <div class="fn__flex-1">
         ${window.siyuan.languages.editReadonly} 
-        <code class=\"fn__code\">${updateHotkeyTip(window.siyuan.config.keymap.general.editMode.custom)}</code>
+        <code class="fn__code">${updateHotkeyTip(window.siyuan.config.keymap.general.editReadonly.custom)}</code>
         <div class="b3-label__text">${window.siyuan.languages.editReadonlyTip}</div>
     </div>
     <span class="fn__space"></span>

diff --git a/app/src/constants.ts b/app/src/constants.ts
@@ -220,7 +220,7 @@ export abstract class Constants {
         general: {
             mainMenu: {default: "⌥\\", custom: "⌥\\"},
             commandPanel: {default: "⌥⇧P", custom: "⌥⇧P"},
-            editMode: {default: "⇧⌘G", custom: "⇧⌘G"},
+            editReadonly: {default: "⇧⌘G", custom: "⇧⌘G"},
             syncNow: {default: "F9", custom: "F9"},
             enterBack: {default: "⌥←", custom: "⌥←"},
             enter: {default: "⌥→", custom: "⌥→"},