diff --git a/.github/actions/spell-check/expect.txt b/.github/actions/spell-check/expect.txt index a3ceb9fe45..4dd0018f68 100644 --- a/.github/actions/spell-check/expect.txt +++ b/.github/actions/spell-check/expect.txt @@ -250,6 +250,7 @@ CREATESCHEDULEDTASK CREATESTRUCT CREATEWINDOWFAILED CRECT +CRH critsec Crossdevice CRSEL diff --git a/src/modules/poweraccent/PowerAccent.Core/Languages.cs b/src/modules/poweraccent/PowerAccent.Core/Languages.cs index ccac28aa5c..852419c719 100644 --- a/src/modules/poweraccent/PowerAccent.Core/Languages.cs +++ b/src/modules/poweraccent/PowerAccent.Core/Languages.cs @@ -11,6 +11,7 @@ namespace PowerAccent.Core { ALL, CA, + CRH, CUR, CY, CZ, @@ -54,6 +55,7 @@ namespace PowerAccent.Core { Language.ALL => GetDefaultLetterKeyALL(letter), // ALL Language.CA => GetDefaultLetterKeyCA(letter), // Catalan + Language.CRH => GetDefaultLetterKeyCRH(letter), // Crimean Tatar Language.CUR => GetDefaultLetterKeyCUR(letter), // Currency Language.CY => GetDefaultLetterKeyCY(letter), // Welsh Language.CZ => GetDefaultLetterKeyCZ(letter), // Czech @@ -100,6 +102,7 @@ namespace PowerAccent.Core if (!_allLanguagesCache.TryGetValue(letter, out string[] cachedValue)) { cachedValue = GetDefaultLetterKeyCA(letter) + .Union(GetDefaultLetterKeyCRH(letter)) .Union(GetDefaultLetterKeyCUR(letter)) .Union(GetDefaultLetterKeyCY(letter)) .Union(GetDefaultLetterKeyCZ(letter)) @@ -192,6 +195,26 @@ namespace PowerAccent.Core }; } + // Crimean Tatar + private static string[] GetDefaultLetterKeyCRH(LetterKey letter) + { + return letter switch + { + LetterKey.VK_A => new[] { "â" }, + LetterKey.VK_C => new[] { "ç" }, + LetterKey.VK_E => new[] { "€" }, + LetterKey.VK_G => new[] { "ğ" }, + LetterKey.VK_H => new[] { "₴" }, + LetterKey.VK_I => new[] { "ı", "İ" }, + LetterKey.VK_N => new[] { "ñ" }, + LetterKey.VK_O => new[] { "ö" }, + LetterKey.VK_S => new[] { "ş" }, + LetterKey.VK_T => new[] { "₺" }, + LetterKey.VK_U => new[] { "ü" }, + _ => Array.Empty(), + }; + } + // Currencies (source: https://www.eurochange.co.uk/travel-money/world-currency-abbreviations-symbols-and-codes-travel-money) private static string[] GetDefaultLetterKeyCUR(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 c7409d2c97..2c7092f323 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml @@ -54,6 +54,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 5fe667e71b..04e2eb0ef0 100644 --- a/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw +++ b/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw @@ -3447,6 +3447,9 @@ Activate by holding the key for the character you want to add an accent to, then Catalan + + Crimean Tatar + Currency diff --git a/src/settings-ui/Settings.UI/ViewModels/PowerAccentViewModel.cs b/src/settings-ui/Settings.UI/ViewModels/PowerAccentViewModel.cs index bfb67bf494..d3dc5f655c 100644 --- a/src/settings-ui/Settings.UI/ViewModels/PowerAccentViewModel.cs +++ b/src/settings-ui/Settings.UI/ViewModels/PowerAccentViewModel.cs @@ -25,6 +25,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels { "ALL", "CA", + "CRH", "CUR", "HR", "CZ",