diff --git a/.github/actions/spell-check/expect.txt b/.github/actions/spell-check/expect.txt index 53043eebf2..bec6e04569 100644 --- a/.github/actions/spell-check/expect.txt +++ b/.github/actions/spell-check/expect.txt @@ -421,6 +421,7 @@ ENTERSIZEMOVE ENU EOAC epu +EPO ERASEBKGND EREOF EResize diff --git a/src/modules/poweraccent/PowerAccent.Core/Languages.cs b/src/modules/poweraccent/PowerAccent.Core/Languages.cs index d4cf75a755..697d956b92 100644 --- a/src/modules/poweraccent/PowerAccent.Core/Languages.cs +++ b/src/modules/poweraccent/PowerAccent.Core/Languages.cs @@ -20,6 +20,7 @@ namespace PowerAccent.Core DE, EL, EST, + EPO, FI, FR, HR, @@ -62,6 +63,7 @@ namespace PowerAccent.Core Language.DE => GetDefaultLetterKeyDE(letter), // German Language.EL => GetDefaultLetterKeyEL(letter), // Greek Language.EST => GetDefaultLetterKeyEST(letter), // Estonian + Language.EPO => GetDefaultLetterKeyEPO(letter), // Esperanto Language.FI => GetDefaultLetterKeyFI(letter), // Finnish Language.FR => GetDefaultLetterKeyFR(letter), // French Language.HR => GetDefaultLetterKeyHR(letter), // Croatian @@ -107,6 +109,7 @@ namespace PowerAccent.Core .Union(GetDefaultLetterKeyDE(letter)) .Union(GetDefaultLetterKeyEL(letter)) .Union(GetDefaultLetterKeyEST(letter)) + .Union(GetDefaultLetterKeyEPO(letter)) .Union(GetDefaultLetterKeyFI(letter)) .Union(GetDefaultLetterKeyFR(letter)) .Union(GetDefaultLetterKeyHR(letter)) @@ -244,6 +247,21 @@ namespace PowerAccent.Core }; } + // Esperanto + private static string[] GetDefaultLetterKeyEPO(LetterKey letter) + { + return letter switch + { + LetterKey.VK_C => new[] { "ĉ" }, + LetterKey.VK_G => new[] { "ĝ" }, + LetterKey.VK_H => new[] { "ĥ" }, + LetterKey.VK_J => new[] { "ĵ" }, + LetterKey.VK_S => new[] { "ŝ" }, + LetterKey.VK_U => new[] { "ǔ" }, + _ => Array.Empty(), + }; + } + // Finnish private static string[] GetDefaultLetterKeyFI(LetterKey letter) { diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml index 001bab2e95..c7409d2c97 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml @@ -63,6 +63,7 @@ + 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 df28916a52..846af5dc0d 100644 --- a/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw +++ b/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw @@ -3436,6 +3436,9 @@ Activate by holding the key for the character you want to add an accent to, then Estonian + + Esperanto + Lithuanian diff --git a/src/settings-ui/Settings.UI/ViewModels/PowerAccentViewModel.cs b/src/settings-ui/Settings.UI/ViewModels/PowerAccentViewModel.cs index d71404c290..bfb67bf494 100644 --- a/src/settings-ui/Settings.UI/ViewModels/PowerAccentViewModel.cs +++ b/src/settings-ui/Settings.UI/ViewModels/PowerAccentViewModel.cs @@ -34,6 +34,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels "NL", "EL", "EST", + "EPO", "FI", "FR", "DE",