From b56e62e5de3c6b8ef4858cd07724c8ef2484f2c2 Mon Sep 17 00:00:00 2001
From: Andon Dragomanov <ad@mca.mk>
Date: Wed, 14 Dec 2022 15:56:43 +0100
Subject: [PATCH] [QuickAccent]Added support for Macedonian accent letters
 (#22721)

* Added support for Macedonian accent letters

* Reordering of resources and enums by alphabetical order
---
 .../poweraccent/PowerAccent.Core/Languages.cs       | 13 +++++++++++++
 .../Settings.UI/Strings/en-us/Resources.resw        | 11 +++++++----
 .../Settings.UI/ViewModels/PowerAccentViewModel.cs  |  1 +
 .../Settings.UI/Views/PowerAccentPage.xaml          |  1 +
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/modules/poweraccent/PowerAccent.Core/Languages.cs b/src/modules/poweraccent/PowerAccent.Core/Languages.cs
index 8a1c1df1b7..86b98b5a4e 100644
--- a/src/modules/poweraccent/PowerAccent.Core/Languages.cs
+++ b/src/modules/poweraccent/PowerAccent.Core/Languages.cs
@@ -24,6 +24,7 @@ namespace PowerAccent.Core
         IS,
         IT,
         KU,
+        MK,
         MI,
         NL,
         PI,
@@ -57,6 +58,7 @@ namespace PowerAccent.Core
                 Language.IS => GetDefaultLetterKeyIS(letter), // Iceland
                 Language.IT => GetDefaultLetterKeyIT(letter), // Italian
                 Language.KU => GetDefaultLetterKeyKU(letter), // Kurdish
+                Language.MK => GetDefaultLetterKeyMK(letter), // Macedonian
                 Language.MI => GetDefaultLetterKeyMI(letter), // Maori
                 Language.NL => GetDefaultLetterKeyNL(letter), // Dutch
                 Language.PI => GetDefaultLetterKeyPI(letter), // Pinyin
@@ -525,5 +527,16 @@ namespace PowerAccent.Core
                 _ => Array.Empty<string>(),
             };
         }
+
+        // Macedonian
+        private static string[] GetDefaultLetterKeyMK(LetterKey letter)
+        {
+            return letter switch
+            {
+                LetterKey.VK_E => new string[] { "ѐ" },
+                LetterKey.VK_I => new string[] { "ѝ" },
+                _ => Array.Empty<string>(),
+            };
+        }
     }
 }
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 a2f1b3e243..197fbc47bb 100644
--- a/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
+++ b/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
@@ -825,7 +825,7 @@
   <data name="General_SettingsBackupAndRestore.Header" xml:space="preserve">
     <value>Backup and restore your settings</value>
   </data>
-	<data name="General_SettingsBackupAndRestore.Description" xml:space="preserve">
+  <data name="General_SettingsBackupAndRestore.Description" xml:space="preserve">
     <value>PowerToys will restart automatically if needed</value>
   </data>
   <data name="ShortcutGuide_Enable.Header" xml:space="preserve">
@@ -1007,7 +1007,7 @@
   <data name="GeneralSettings_AlwaysRunAsAdminText.Header" xml:space="preserve">
     <value>Always run as administrator</value>
   </data>
-	<data name="GeneralSettings_AlwaysRunAsAdminText.Description" xml:space="preserve">
+  <data name="GeneralSettings_AlwaysRunAsAdminText.Description" xml:space="preserve">
     <value>You need to run as administrator to use this setting</value>
   </data>
   <data name="GeneralSettings_RunningAsUserText" xml:space="preserve">
@@ -1266,7 +1266,7 @@ Made with 💗 by Microsoft and the PowerToys community.</value>
   <data name="MoveUp.Text" xml:space="preserve">
     <value>Move up</value>
   </data>
-	<data name="MoveDown.Text" xml:space="preserve">
+  <data name="MoveDown.Text" xml:space="preserve">
     <value>Move down</value>
   </data>
   <data name="ColorPickerAddNewFormat.Content" xml:space="preserve">
@@ -2707,6 +2707,9 @@ Activate by holding the key for the character you want to add an accent to, then
   <data name="QuickAccent_SelectedLanguage_French.Content" xml:space="preserve">
     <value>French</value>
   </data>
+  <data name="QuickAccent_SelectedLanguage_Macedonian.Content" xml:space="preserve">
+    <value>Macedonian</value>
+  </data>
   <data name="QuickAccent_SelectedLanguage_Maori.Content" xml:space="preserve">
     <value>Maori</value>
   </data>
@@ -2843,4 +2846,4 @@ Activate by holding the key for the character you want to add an accent to, then
   <data name="Hosts_AdditionalLinesPosition.Description" xml:space="preserve">
     <value>Additional content includes the file header and lines that can't parse</value>
   </data>
-</root>
+</root>
\ No newline at end of file
diff --git a/src/settings-ui/Settings.UI/ViewModels/PowerAccentViewModel.cs b/src/settings-ui/Settings.UI/ViewModels/PowerAccentViewModel.cs
index 123405cc2f..a39dec882a 100644
--- a/src/settings-ui/Settings.UI/ViewModels/PowerAccentViewModel.cs
+++ b/src/settings-ui/Settings.UI/ViewModels/PowerAccentViewModel.cs
@@ -37,6 +37,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             "IS",
             "IT",
             "KU",
+            "MK",
             "MI",
             "PI",
             "PL",
diff --git a/src/settings-ui/Settings.UI/Views/PowerAccentPage.xaml b/src/settings-ui/Settings.UI/Views/PowerAccentPage.xaml
index 7cd4c4d75d..c1f5a8d697 100644
--- a/src/settings-ui/Settings.UI/Views/PowerAccentPage.xaml
+++ b/src/settings-ui/Settings.UI/Views/PowerAccentPage.xaml
@@ -74,6 +74,7 @@
                             <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Icelandic" />
                             <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Italian" />
                             <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Kurdish" />
+                            <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Macedonian" />
                             <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Maori" />
                             <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Pinyin" />
                             <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Polish" />