fix: fix review issues and remvoe unused localizable

tisfeng · Feb 8, 2024 · 167fe5c · 167fe5c
1 parent 452a30a
commit 167fe5c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 24 deletions.
diff --git a/Easydict/App/Localizable.xcstrings b/Easydict/App/Localizable.xcstrings
@@ -3648,16 +3648,6 @@
         }
       }
     },
-    "shortcut_confict_message (Shortcut.shared.confictMenuItem?.title ?? \"\")" : {
-      "localizations" : {
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : ""
-          }
-        }
-      }
-    },
     "shortcut_confict_message %@" : {
       "extractionState" : "manual",
       "localizations" : {
@@ -3675,16 +3665,6 @@
         }
       }
     },
-    "shortcut_confict_title (keyCombo!.keyEquivalentModifierMaskString + keyCombo!.characters)" : {
-      "localizations" : {
-        "zh-Hans" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : ""
-          }
-        }
-      }
-    },
     "shortcut_confict_title %@" : {
       "extractionState" : "manual",
       "localizations" : {

diff --git a/Easydict/NewApp/View/SettingView/Tabs/View/Shortcut/KeyHolderWrapper.swift b/Easydict/NewApp/View/SettingView/Tabs/View/Shortcut/KeyHolderWrapper.swift
@@ -66,16 +66,20 @@ extension KeyHolderWrapper {
         func recordViewDidEndRecording(_: RecordView) {}
 
         func recordView(_ recordView: RecordView, didChangeKeyCombo keyCombo: KeyCombo?) {
-            if keyCombo == nil { // clear shortcut
-                Shortcut.shared.updateMenu(type)
-            }
             if let key = keyCombo {
                 // shortcut validate confict
                 if Shortcut.validateShortcut(key) {
-                        confictAlterMessage = ShortcutConfictAlertMessage(title: String(localized: "shortcut_confict_title \(keyCombo!.keyEquivalentModifierMaskString + keyCombo!.characters)"), message: String(localized: "shortcut_confict_message \(Shortcut.shared.confictMenuItem?.title ?? "")"))
+                    let title = String(localized: "shortcut_confict_title \(key.keyEquivalentModifierMaskString + key.characters)")
+                    let message = String(localized: "shortcut_confict_message \(Shortcut.shared.confictMenuItem?.title ?? "")")
+                    confictAlterMessage = ShortcutConfictAlertMessage(
+                        title: title,
+                        message: message
+                    )
                     recordView.clear()
                     return
                 }
+            } else { // clear shortcut
+                Shortcut.shared.updateMenu(type)
             }
             storeKeyCombo(with: keyCombo)
             Shortcut.shared.bindingShortcut(keyCombo: keyCombo, type: type)