diff --git a/Source/InputMethodController.mm b/Source/InputMethodController.mm index 5d9b3f1b..0f7b46d3 100644 --- a/Source/InputMethodController.mm +++ b/Source/InputMethodController.mm @@ -232,8 +232,8 @@ public: } #endif //DEBUG - NSMenuItem *chineseConversionMenuItem = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"Chinese Conversion", @"") action:@selector(toggleChineseConverter:) keyEquivalent:@"G"]; - chineseConversionMenuItem.keyEquivalentModifierMask = NSEventModifierFlagCommand | NSEventModifierFlagControl; + NSMenuItem *chineseConversionMenuItem = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"Chinese Conversion", @"") action:@selector(toggleChineseConverter:) keyEquivalent:@"K"]; + chineseConversionMenuItem.keyEquivalentModifierMask = NSEventModifierFlagCommand; chineseConversionMenuItem.state = _chineseConversionEnabled ? NSControlStateValueOn : NSControlStateValueOff; [menu addItem:chineseConversionMenuItem]; diff --git a/Source/OpenCCBridge.swift b/Source/OpenCCBridge.swift index 72a25740..6c64695d 100644 --- a/Source/OpenCCBridge.swift +++ b/Source/OpenCCBridge.swift @@ -5,18 +5,18 @@ import OpenCC // in Swift in order to bridge the Swift classes into our Objective-C++ project. class OpenCCBridge : NSObject { private static let shared = OpenCCBridge() - private var conveter: ChineseConverter? + private var converter: ChineseConverter? override init() { - try? conveter = ChineseConverter(options: .simplify) + try? converter = ChineseConverter(options: .twStandardRev) super.init() } @objc static func convert(_ string:String) -> String? { - return shared.conveter?.convert(string) + return shared.converter?.convert(string) } private func convert(_ string:String) -> String? { - return conveter?.convert(string) + return converter?.convert(string) } } diff --git a/Source/en.lproj/Localizable.strings b/Source/en.lproj/Localizable.strings index 48445416..7e3c6a78 100644 --- a/Source/en.lproj/Localizable.strings +++ b/Source/en.lproj/Localizable.strings @@ -49,4 +49,4 @@ /* No comment provided by engineer. */ "You're currently using vChewing %@ (%@), a new version %@ (%@) is now available. Do you want to visit vChewing's website to download the version?%@" = "You're currently using vChewing %@ (%@), a new version %@ (%@) is now available. Do you want to visit vChewing's website to download the version?%@"; -"Chinese Conversion" = "Convert to Simplified Chinese"; +"Chinese Conversion" = "Convert zh-TW Kanji to KangXi Variants"; diff --git a/Source/zh-Hans.lproj/Localizable.strings b/Source/zh-Hans.lproj/Localizable.strings index 2855d232..a9ecbc43 100644 --- a/Source/zh-Hans.lproj/Localizable.strings +++ b/Source/zh-Hans.lproj/Localizable.strings @@ -49,4 +49,4 @@ /* No comment provided by engineer. */ "You're currently using vChewing %@ (%@), a new version %@ (%@) is now available. Do you want to visit vChewing's website to download the version?%@" = "目前使用的威注音版本是 %1$@ (%2$@),网路上有更新版本 %3$@ (%4$@) 可供下载。是否要前往威注音网站下载新版来安装?%5$@"; -"Chinese Conversion" = "强制简体字输出"; +"Chinese Conversion" = "优先使用康熙繁体字"; diff --git a/Source/zh-Hant.lproj/Localizable.strings b/Source/zh-Hant.lproj/Localizable.strings index ebfa32d0..0434c9e0 100644 --- a/Source/zh-Hant.lproj/Localizable.strings +++ b/Source/zh-Hant.lproj/Localizable.strings @@ -49,4 +49,4 @@ /* No comment provided by engineer. */ "You're currently using vChewing %@ (%@), a new version %@ (%@) is now available. Do you want to visit vChewing's website to download the version?%@" = "目前使用的威注音版本是 %1$@ (%2$@),網路上有更新版本 %3$@ (%4$@) 可供下載。是否要前往威注音網站下載新版來安裝?%5$@"; -"Chinese Conversion" = "輸出簡體中文"; +"Chinese Conversion" = "優先使用康熙繁體字"; diff --git a/vChewing.xcodeproj/project.pbxproj b/vChewing.xcodeproj/project.pbxproj index b2f33a3a..9825a06c 100644 --- a/vChewing.xcodeproj/project.pbxproj +++ b/vChewing.xcodeproj/project.pbxproj @@ -1149,7 +1149,7 @@ repositoryURL = "https://dev.azure.com/ShikiSuen/vChewing/_git/SwiftyLibreCC"; requirement = { kind = revision; - revision = 1d8105a0f7199c90af722bff62728050c858e777; + revision = 5419c7a4f4d3ac0c5acbf67dcc90d45499c790ae; }; }; /* End XCRemoteSwiftPackageReference section */