From 357fb8f66d4c513b37b9ff88af74a28494163acf Mon Sep 17 00:00:00 2001
From: damienleroy <13002713+damienleroy@users.noreply.github.com>
Date: Sat, 26 Nov 2022 19:46:07 +0100
Subject: [PATCH] [Quick Accent] Add Serbian language accents (#22288)

---
 .../poweraccent/PowerAccent.Core/Languages.cs | 20 +++++++++++++++++++
 .../Settings.UI/Strings/en-us/Resources.resw  |  3 +++
 .../ViewModels/PowerAccentViewModel.cs        |  1 +
 .../Settings.UI/Views/PowerAccentPage.xaml    |  1 +
 4 files changed, 25 insertions(+)

diff --git a/src/modules/poweraccent/PowerAccent.Core/Languages.cs b/src/modules/poweraccent/PowerAccent.Core/Languages.cs
index 9f9716b6ba..629e358069 100644
--- a/src/modules/poweraccent/PowerAccent.Core/Languages.cs
+++ b/src/modules/poweraccent/PowerAccent.Core/Languages.cs
@@ -29,6 +29,7 @@ namespace PowerAccent.Core
         RO,
         SK,
         SP,
+        SR,
         SV,
         TK,
     }
@@ -59,6 +60,7 @@ namespace PowerAccent.Core
                 case Language.RO: return GetDefaultLetterKeyRO(letter); // Romanian
                 case Language.SK: return GetDefaultLetterKeySK(letter); // Slovak
                 case Language.SP: return GetDefaultLetterKeySP(letter); // Spain
+                case Language.SR: return GetDefaultLetterKeySR(letter); // Serbian
                 case Language.SV: return GetDefaultLetterKeySV(letter); // Swedish
                 case Language.TK: return GetDefaultLetterKeyTK(letter); // Turkish
             }
@@ -705,5 +707,23 @@ namespace PowerAccent.Core
 
             return Array.Empty<string>();
         }
+
+        // Serbian
+        private static string[] GetDefaultLetterKeySR(LetterKey letter)
+        {
+            switch (letter)
+            {
+                case LetterKey.VK_C:
+                    return new string[] { "ć", "č" };
+                case LetterKey.VK_D:
+                    return new string[] { "đ" };
+                case LetterKey.VK_S:
+                    return new string[] { "š" };
+                case LetterKey.VK_Z:
+                    return new string[] { "ž" };
+            }
+
+            return 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 157efac41a..00cd87a39f 100644
--- a/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
+++ b/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
@@ -2600,6 +2600,9 @@ Activate by holding the key for the character you want to add an accent to, then
   <data name="QuickAccent_SelectedLanguage_Romanian.Content" xml:space="preserve">
     <value>Romanian</value>
   </data>
+  <data name="QuickAccent_SelectedLanguage_Serbian.Content" xml:space="preserve">
+    <value>Serbian</value>
+  </data>
   <data name="QuickAccent_SelectedLanguage_Hungarian.Content" xml:space="preserve">
     <value>Hungarian</value>
   </data>
diff --git a/src/settings-ui/Settings.UI/ViewModels/PowerAccentViewModel.cs b/src/settings-ui/Settings.UI/ViewModels/PowerAccentViewModel.cs
index bd88279e0f..61d4a78261 100644
--- a/src/settings-ui/Settings.UI/ViewModels/PowerAccentViewModel.cs
+++ b/src/settings-ui/Settings.UI/ViewModels/PowerAccentViewModel.cs
@@ -42,6 +42,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             "RO",
             "SK",
             "SP",
+            "SR",
             "SV",
             "TK",
             "CY",
diff --git a/src/settings-ui/Settings.UI/Views/PowerAccentPage.xaml b/src/settings-ui/Settings.UI/Views/PowerAccentPage.xaml
index 7f9aecbb27..e546864169 100644
--- a/src/settings-ui/Settings.UI/Views/PowerAccentPage.xaml
+++ b/src/settings-ui/Settings.UI/Views/PowerAccentPage.xaml
@@ -79,6 +79,7 @@
                             <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Romanian" />
                             <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Slovakian" />
                             <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Spanish" />
+                            <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Serbian" />
                             <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Swedish" />
                             <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Turkish" />
                             <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Welsh" />