From 09aec77862278d28fc361560670adc39e1fb9efc Mon Sep 17 00:00:00 2001 From: ShikiSuen Date: Fri, 11 Feb 2022 22:10:35 +0800 Subject: [PATCH 1/2] Mandarin // Fix the Shintsuu branding to MiTAC. --- Source/3rdParty/OVMandarin/Mandarin.cpp | 8 ++++---- Source/3rdParty/OVMandarin/Mandarin.h | 2 +- Source/Modules/ControllerModules/KeyHandler.mm | 4 ++-- Source/Modules/IMEModules/PreferencesModule.swift | 6 +++--- .../Source/WindowNIBs/Base.lproj/frmPrefWindow.xib | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Source/3rdParty/OVMandarin/Mandarin.cpp b/Source/3rdParty/OVMandarin/Mandarin.cpp index c1cb3a00..813012a2 100644 --- a/Source/3rdParty/OVMandarin/Mandarin.cpp +++ b/Source/3rdParty/OVMandarin/Mandarin.cpp @@ -1097,7 +1097,7 @@ static BopomofoKeyboardLayout* CreateIBMLayout() { return new BopomofoKeyboardLayout(ktcm, "IBM"); } -static BopomofoKeyboardLayout* CreateShintsuuLayout() { +static BopomofoKeyboardLayout* CreateMiTACLayout() { std::vector vec; BopomofoKeyToComponentMap ktcm; @@ -1143,7 +1143,7 @@ static BopomofoKeyboardLayout* CreateShintsuuLayout() { ASSIGNKEY1(ktcm, vec, 'y', BPMF::I); ASSIGNKEY1(ktcm, vec, 'z', BPMF::Z); - return new BopomofoKeyboardLayout(ktcm, "Shintsuu"); + return new BopomofoKeyboardLayout(ktcm, "MiTAC"); } static BopomofoKeyboardLayout* CreateETenLayout() { @@ -1291,8 +1291,8 @@ const BopomofoKeyboardLayout* BopomofoKeyboardLayout::IBMLayout() { return layout; } -const BopomofoKeyboardLayout* BopomofoKeyboardLayout::ShintsuuLayout() { - static BopomofoKeyboardLayout* layout = CreateShintsuuLayout(); +const BopomofoKeyboardLayout* BopomofoKeyboardLayout::MiTACLayout() { + static BopomofoKeyboardLayout* layout = CreateMiTACLayout(); return layout; } diff --git a/Source/3rdParty/OVMandarin/Mandarin.h b/Source/3rdParty/OVMandarin/Mandarin.h index 8df4ddb7..50be17cf 100644 --- a/Source/3rdParty/OVMandarin/Mandarin.h +++ b/Source/3rdParty/OVMandarin/Mandarin.h @@ -213,7 +213,7 @@ public: static const BopomofoKeyboardLayout* HsuLayout(); static const BopomofoKeyboardLayout* ETen26Layout(); static const BopomofoKeyboardLayout* IBMLayout(); - static const BopomofoKeyboardLayout* ShintsuuLayout(); + static const BopomofoKeyboardLayout* MiTACLayout(); static const BopomofoKeyboardLayout* HanyuPinyinLayout(); BopomofoKeyboardLayout(const BopomofoKeyToComponentMap& ktcm, diff --git a/Source/Modules/ControllerModules/KeyHandler.mm b/Source/Modules/ControllerModules/KeyHandler.mm index cb5ee380..6adc3665 100644 --- a/Source/Modules/ControllerModules/KeyHandler.mm +++ b/Source/Modules/ControllerModules/KeyHandler.mm @@ -182,8 +182,8 @@ static NSString *const kGraphVizOutputfile = @"/tmp/vChewing-visualization.dot"; case KeyboardLayoutIBM: _bpmfReadingBuffer->setKeyboardLayout(BopomofoKeyboardLayout::IBMLayout()); break; - case KeyboardLayoutShintsuu: - _bpmfReadingBuffer->setKeyboardLayout(BopomofoKeyboardLayout::ShintsuuLayout()); + case KeyboardLayoutMiTAC: + _bpmfReadingBuffer->setKeyboardLayout(BopomofoKeyboardLayout::MiTACLayout()); break; case KeyboardLayoutHanyuPinyin: _bpmfReadingBuffer->setKeyboardLayout(BopomofoKeyboardLayout::HanyuPinyinLayout()); diff --git a/Source/Modules/IMEModules/PreferencesModule.swift b/Source/Modules/IMEModules/PreferencesModule.swift index 13afcba7..104c2570 100644 --- a/Source/Modules/IMEModules/PreferencesModule.swift +++ b/Source/Modules/IMEModules/PreferencesModule.swift @@ -155,7 +155,7 @@ struct ComposingBufferSize { case hsu = 2 case eten26 = 3 case IBM = 4 - case shintsuu = 5 + case MiTAC = 5 case hanyuPinyin = 10 var name: String { @@ -170,8 +170,8 @@ struct ComposingBufferSize { return "ETen26" case .IBM: return "IBM" - case .shintsuu: - return "Shintsuu" + case .MiTAC: + return "MiTAC" case .hanyuPinyin: return "HanyuPinyin" } diff --git a/Source/WindowNIBs/Source/WindowNIBs/Base.lproj/frmPrefWindow.xib b/Source/WindowNIBs/Source/WindowNIBs/Base.lproj/frmPrefWindow.xib index 88fe55d5..08218d8b 100644 --- a/Source/WindowNIBs/Source/WindowNIBs/Base.lproj/frmPrefWindow.xib +++ b/Source/WindowNIBs/Source/WindowNIBs/Base.lproj/frmPrefWindow.xib @@ -595,7 +595,7 @@ - + From e4809303ceb3b6952e0b0199813aea1635e38bdc Mon Sep 17 00:00:00 2001 From: ShikiSuen Date: Fri, 11 Feb 2022 22:25:30 +0800 Subject: [PATCH 2/2] IME // Localization to the new MiTAC phonetic layout. --- .../Source/WindowNIBs/en.lproj/frmPrefWindow.strings | 3 +++ .../Source/WindowNIBs/ja.lproj/frmPrefWindow.strings | 3 +++ .../Source/WindowNIBs/zh-Hans.lproj/frmPrefWindow.strings | 3 +++ .../Source/WindowNIBs/zh-Hant.lproj/frmPrefWindow.strings | 3 +++ 4 files changed, 12 insertions(+) diff --git a/Source/WindowNIBs/Source/WindowNIBs/en.lproj/frmPrefWindow.strings b/Source/WindowNIBs/Source/WindowNIBs/en.lproj/frmPrefWindow.strings index 07f5f6e1..0eebc9c6 100644 --- a/Source/WindowNIBs/Source/WindowNIBs/en.lproj/frmPrefWindow.strings +++ b/Source/WindowNIBs/Source/WindowNIBs/en.lproj/frmPrefWindow.strings @@ -89,6 +89,9 @@ /* Class = "NSMenuItem"; title = "IBM"; ObjectID = "137"; */ "137.title" = "IBM"; +/* Class = "NSMenuItem"; title = "MiTAC"; ObjectID = "7fV-x8-WHQ"; */ +"7fV-x8-WHQ.title" = "MiTAC"; + /* Class = "NSTabViewItem"; label = "Keyboard"; ObjectID = "1AW-xf-c2f"; */ "1AW-xf-c2f.label" = "Keyboard"; diff --git a/Source/WindowNIBs/Source/WindowNIBs/ja.lproj/frmPrefWindow.strings b/Source/WindowNIBs/Source/WindowNIBs/ja.lproj/frmPrefWindow.strings index 175fb309..1bc1ba72 100644 --- a/Source/WindowNIBs/Source/WindowNIBs/ja.lproj/frmPrefWindow.strings +++ b/Source/WindowNIBs/Source/WindowNIBs/ja.lproj/frmPrefWindow.strings @@ -89,6 +89,9 @@ /* Class = "NSMenuItem"; title = "IBM"; ObjectID = "137"; */ "137.title" = "IBM"; +/* Class = "NSMenuItem"; title = "MiTAC"; ObjectID = "7fV-x8-WHQ"; */ +"7fV-x8-WHQ.title" = "神通"; + /* Class = "NSTabViewItem"; label = "Keyboard"; ObjectID = "1AW-xf-c2f"; */ "1AW-xf-c2f.label" = "キーボード"; diff --git a/Source/WindowNIBs/Source/WindowNIBs/zh-Hans.lproj/frmPrefWindow.strings b/Source/WindowNIBs/Source/WindowNIBs/zh-Hans.lproj/frmPrefWindow.strings index 973c0919..72f334d4 100644 --- a/Source/WindowNIBs/Source/WindowNIBs/zh-Hans.lproj/frmPrefWindow.strings +++ b/Source/WindowNIBs/Source/WindowNIBs/zh-Hans.lproj/frmPrefWindow.strings @@ -89,6 +89,9 @@ /* Class = "NSMenuItem"; title = "IBM"; ObjectID = "137"; */ "137.title" = "IBM"; +/* Class = "NSMenuItem"; title = "MiTAC"; ObjectID = "7fV-x8-WHQ"; */ +"7fV-x8-WHQ.title" = "神通"; + /* Class = "NSTabViewItem"; label = "Keyboard"; ObjectID = "1AW-xf-c2f"; */ "1AW-xf-c2f.label" = "键盘"; diff --git a/Source/WindowNIBs/Source/WindowNIBs/zh-Hant.lproj/frmPrefWindow.strings b/Source/WindowNIBs/Source/WindowNIBs/zh-Hant.lproj/frmPrefWindow.strings index d15e9c36..fb104a04 100644 --- a/Source/WindowNIBs/Source/WindowNIBs/zh-Hant.lproj/frmPrefWindow.strings +++ b/Source/WindowNIBs/Source/WindowNIBs/zh-Hant.lproj/frmPrefWindow.strings @@ -89,6 +89,9 @@ /* Class = "NSMenuItem"; title = "IBM"; ObjectID = "137"; */ "137.title" = "IBM"; +/* Class = "NSMenuItem"; title = "MiTAC"; ObjectID = "7fV-x8-WHQ"; */ +"7fV-x8-WHQ.title" = "神通"; + /* Class = "NSTabViewItem"; label = "Keyboard"; ObjectID = "1AW-xf-c2f"; */ "1AW-xf-c2f.label" = "鍵盤";