From 31ade5c662d67a5bf2f23d8b23f82c37799da868 Mon Sep 17 00:00:00 2001 From: "Hao Liu (from Dev Box)" Date: Fri, 13 Dec 2024 12:35:58 +0800 Subject: [PATCH 1/4] =?UTF-8?q?Add=20=E1=B8=B1=20to=20PowerAccent=20for=20?= =?UTF-8?q?Proto-Indo-European?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../poweraccent/PowerAccent.Core/Languages.cs | 13 +++++++++++++ .../Settings.UI/Strings/en-us/Resources.resw | 3 +++ .../Settings.UI/ViewModels/PowerAccentViewModel.cs | 1 + 3 files changed, 17 insertions(+) diff --git a/src/modules/poweraccent/PowerAccent.Core/Languages.cs b/src/modules/poweraccent/PowerAccent.Core/Languages.cs index 2838fe958890..4f967f85c3ba 100644 --- a/src/modules/poweraccent/PowerAccent.Core/Languages.cs +++ b/src/modules/poweraccent/PowerAccent.Core/Languages.cs @@ -39,6 +39,7 @@ public enum Language NL, NO, PI, + PIE, PL, PT, RO, @@ -100,6 +101,7 @@ public static string[] GetDefaultLetterKey(LetterKey letter, Language[] langs) Language.NL => GetDefaultLetterKeyNL(letter), // Dutch Language.NO => GetDefaultLetterKeyNO(letter), // Norwegian Language.PI => GetDefaultLetterKeyPI(letter), // Pinyin + Language.PIE => GetDefaultLetterKeyPIE(letter), // Proto-Indo-European Language.PL => GetDefaultLetterKeyPL(letter), // Polish Language.PT => GetDefaultLetterKeyPT(letter), // Portuguese Language.RO => GetDefaultLetterKeyRO(letter), // Romanian @@ -156,6 +158,7 @@ private static string[] GetDefaultLetterKeyALL(LetterKey letter) .Union(GetDefaultLetterKeyNO(letter)) .Union(GetDefaultLetterKeyPI(letter)) .Union(GetDefaultLetterKeyPL(letter)) + .Union(GetDefaultLetterKeyPIE(letter)) .Union(GetDefaultLetterKeyPT(letter)) .Union(GetDefaultLetterKeyRO(letter)) .Union(GetDefaultLetterKeySK(letter)) @@ -463,6 +466,16 @@ private static string[] GetDefaultLetterKeyPI(LetterKey letter) }; } + // Proto-Indo-European + private static string[] GetDefaultLetterKeyPIE(LetterKey letter) + { + return letter switch + { + LetterKey.VK_K => new[] { "ḱ" }, + _ => Array.Empty(), + }; + } + // Turkish private static string[] GetDefaultLetterKeyTK(LetterKey letter) { diff --git a/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw b/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw index 7f3b5fdabab7..789a94f004f3 100644 --- a/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw +++ b/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw @@ -3672,6 +3672,9 @@ Activate by holding the key for the character you want to add an accent to, then Pinyin + + Proto Indo European + Polish diff --git a/src/settings-ui/Settings.UI/ViewModels/PowerAccentViewModel.cs b/src/settings-ui/Settings.UI/ViewModels/PowerAccentViewModel.cs index 0c4f9db65092..7da5c4ecfbbf 100644 --- a/src/settings-ui/Settings.UI/ViewModels/PowerAccentViewModel.cs +++ b/src/settings-ui/Settings.UI/ViewModels/PowerAccentViewModel.cs @@ -55,6 +55,7 @@ public class PowerAccentViewModel : Observable new PowerAccentLanguageModel("MI", "QuickAccent_SelectedLanguage_Maori", LanguageGroup), new PowerAccentLanguageModel("NO", "QuickAccent_SelectedLanguage_Norwegian", LanguageGroup), new PowerAccentLanguageModel("PI", "QuickAccent_SelectedLanguage_Pinyin", LanguageGroup), + new PowerAccentLanguageModel("PIE", "QuickAccent_SelectedLanguage_Proto_Indo_European", LanguageGroup), new PowerAccentLanguageModel("PL", "QuickAccent_SelectedLanguage_Polish", LanguageGroup), new PowerAccentLanguageModel("PT", "QuickAccent_SelectedLanguage_Portuguese", LanguageGroup), new PowerAccentLanguageModel("RO", "QuickAccent_SelectedLanguage_Romanian", LanguageGroup), From aa9013dcd408bc79d5019d62686e9dc387869990 Mon Sep 17 00:00:00 2001 From: Hao Liu Date: Wed, 18 Dec 2024 14:59:57 +0800 Subject: [PATCH 2/4] Fix Spelling Check --- .github/actions/spell-check/expect.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/spell-check/expect.txt b/.github/actions/spell-check/expect.txt index e80981840c32..e50bf8aa1fea 100644 --- a/.github/actions/spell-check/expect.txt +++ b/.github/actions/spell-check/expect.txt @@ -644,6 +644,7 @@ imageresizerinput imageresizersettings imagingdevices ime +Indo inetcpl Infobar INFOEXAMPLE From 9db2005bda9a3253f2ee2bc292f96f86deb25235 Mon Sep 17 00:00:00 2001 From: Hao Liu Date: Mon, 6 Jan 2025 15:08:02 +0800 Subject: [PATCH 3/4] Add more letters to PIE --- src/modules/poweraccent/PowerAccent.Core/Languages.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/modules/poweraccent/PowerAccent.Core/Languages.cs b/src/modules/poweraccent/PowerAccent.Core/Languages.cs index 4f967f85c3ba..16cc5bc80719 100644 --- a/src/modules/poweraccent/PowerAccent.Core/Languages.cs +++ b/src/modules/poweraccent/PowerAccent.Core/Languages.cs @@ -471,7 +471,15 @@ private static string[] GetDefaultLetterKeyPIE(LetterKey letter) { return letter switch { + LetterKey.VK_A => new[] { "ā" }, + LetterKey.VK_E => new[] { "ē" }, + LetterKey.VK_O => new[] { "ō" }, LetterKey.VK_K => new[] { "ḱ" }, + LetterKey.VK_G => new[] { "ǵ" }, + LetterKey.VK_R => new[] { "r̥" }, + LetterKey.VK_L => new[] { "l̥" }, + LetterKey.VK_M => new[] { "m̥" }, + LetterKey.VK_N => new[] { "n̥" }, _ => Array.Empty(), }; } From 18d0efd06e805774ff6bf509ceebda6262594db8 Mon Sep 17 00:00:00 2001 From: Jaime Bernardo Date: Mon, 6 Jan 2025 11:31:43 +0000 Subject: [PATCH 4/4] Order PIE after PI --- src/modules/poweraccent/PowerAccent.Core/Languages.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/poweraccent/PowerAccent.Core/Languages.cs b/src/modules/poweraccent/PowerAccent.Core/Languages.cs index 16cc5bc80719..6647221b603c 100644 --- a/src/modules/poweraccent/PowerAccent.Core/Languages.cs +++ b/src/modules/poweraccent/PowerAccent.Core/Languages.cs @@ -157,8 +157,8 @@ private static string[] GetDefaultLetterKeyALL(LetterKey letter) .Union(GetDefaultLetterKeyNL(letter)) .Union(GetDefaultLetterKeyNO(letter)) .Union(GetDefaultLetterKeyPI(letter)) - .Union(GetDefaultLetterKeyPL(letter)) .Union(GetDefaultLetterKeyPIE(letter)) + .Union(GetDefaultLetterKeyPL(letter)) .Union(GetDefaultLetterKeyPT(letter)) .Union(GetDefaultLetterKeyRO(letter)) .Union(GetDefaultLetterKeySK(letter))