diff --git a/Installer/AppDelegate.swift b/Installer/AppDelegate.swift
index 73d55031..7db90297 100644
--- a/Installer/AppDelegate.swift
+++ b/Installer/AppDelegate.swift
@@ -90,8 +90,10 @@ class AppDelegate: NSWindowController, NSApplicationDelegate {
{
appCopyrightLabel.stringValue = copyrightLabel
}
- if let eulaContent = Bundle.main.localizedInfoDictionary?["CFEULAContent"] as? String {
- appEULAContent.string = eulaContent
+ if let eulaContent = Bundle.main.localizedInfoDictionary?["CFEULAContent"] as? String,
+ let eulaContentUpstream = Bundle.main.infoDictionary?["CFUpstreamEULAContent"] as? String
+ {
+ appEULAContent.string = eulaContent + "\n" + eulaContentUpstream
}
appVersionLabel.stringValue = "\(versionString) Build \(installingVersion)"
diff --git a/Installer/Installer-Info.plist b/Installer/Installer-Info.plist
index d32e0ad2..134cddad 100644
--- a/Installer/Installer-Info.plist
+++ b/Installer/Installer-Info.plist
@@ -22,6 +22,34 @@
$(CURRENT_PROJECT_VERSION)
CFEULAContent
License texts used in the customized about window.
+ CFUpstreamEULAContent
+ ########################################################
+## UPSTREAM LICENSE PROVIDED BELOW INTACT FOR REFERENCE
+## https://github.com/openvanilla/McBopomofo/blob/5b319f491142c1170a3607e28ab4e91c22861998/LICENSE.txt
+########################################################
+
+MIT License
+
+Copyright (c) 2011-2022 Mengjuei Hsieh et al.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the “Software”), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
LSApplicationCategoryType
public.app-category.utilities
LSHasLocalizedDisplayName
diff --git a/Source/Modules/WindowControllers/ctlAboutWindow.swift b/Source/Modules/WindowControllers/ctlAboutWindow.swift
index 8d043b06..1ee16ca0 100644
--- a/Source/Modules/WindowControllers/ctlAboutWindow.swift
+++ b/Source/Modules/WindowControllers/ctlAboutWindow.swift
@@ -31,8 +31,10 @@ class ctlAboutWindow: NSWindowController {
{
appCopyrightLabel.stringValue = copyrightLabel
}
- if let eulaContent = Bundle.main.localizedInfoDictionary?["CFEULAContent"] as? String {
- appEULAContent.string = eulaContent
+ if let eulaContent = Bundle.main.localizedInfoDictionary?["CFEULAContent"] as? String,
+ let eulaContentUpstream = Bundle.main.infoDictionary?["CFUpstreamEULAContent"] as? String
+ {
+ appEULAContent.string = eulaContent + "\n" + eulaContentUpstream
}
appVersionLabel.stringValue = "\(versionString) Build \(installingVersion)"
}
diff --git a/Source/Resources/IME-Info.plist b/Source/Resources/IME-Info.plist
index 9819b41e..855d4f05 100644
--- a/Source/Resources/IME-Info.plist
+++ b/Source/Resources/IME-Info.plist
@@ -22,6 +22,34 @@
$(CURRENT_PROJECT_VERSION)
CFEULAContent
License texts used in the customized about window.
+ CFUpstreamEULAContent
+ ########################################################
+## UPSTREAM LICENSE PROVIDED BELOW INTACT FOR REFERENCE
+## https://github.com/openvanilla/McBopomofo/blob/5b319f491142c1170a3607e28ab4e91c22861998/LICENSE.txt
+########################################################
+
+MIT License
+
+Copyright (c) 2011-2022 Mengjuei Hsieh et al.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the “Software”), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
ComponentInputModeDict
tsInputModeListKey