From f51dacff088362a249ed9669317d87b309c5ce93 Mon Sep 17 00:00:00 2001
From: Taras <109293326+taras-janea@users.noreply.github.com>
Date: Wed, 30 Nov 2022 19:48:03 +0200
Subject: [PATCH] [QuickAccent]Add Irish and Scottish language accents (#22350)

* [Quick Accent] add Irish Gaelic language accents

* [Quick Accent] add Scottish Gaelic language accents

* Fix spellcheck

* Add comments for localization
---
 .github/actions/spell-check/expect.txt        |  2 +
 .../poweraccent/PowerAccent.Core/Languages.cs | 44 +++++++++++++++++++
 .../Settings.UI/Strings/en-us/Resources.resw  |  8 ++++
 .../ViewModels/PowerAccentViewModel.cs        |  2 +
 .../Settings.UI/Views/PowerAccentPage.xaml    |  2 +
 5 files changed, 58 insertions(+)

diff --git a/.github/actions/spell-check/expect.txt b/.github/actions/spell-check/expect.txt
index 469ead5345..49772f7bf8 100644
--- a/.github/actions/spell-check/expect.txt
+++ b/.github/actions/spell-check/expect.txt
@@ -576,6 +576,8 @@ FZE
 gabime
 GAC
 gacutil
+Gaeilge
+Gaidhlig
 GBarm
 Gbits
 Gbps
diff --git a/src/modules/poweraccent/PowerAccent.Core/Languages.cs b/src/modules/poweraccent/PowerAccent.Core/Languages.cs
index 629e358069..f3793d2830 100644
--- a/src/modules/poweraccent/PowerAccent.Core/Languages.cs
+++ b/src/modules/poweraccent/PowerAccent.Core/Languages.cs
@@ -14,6 +14,8 @@ namespace PowerAccent.Core
         CUR,
         CY,
         CZ,
+        GA,
+        GD,
         DE,
         FR,
         HR,
@@ -45,6 +47,8 @@ namespace PowerAccent.Core
                 case Language.CUR: return GetDefaultLetterKeyCUR(letter); // Currency
                 case Language.CY: return GetDefaultLetterKeyCY(letter); // Welsh
                 case Language.CZ: return GetDefaultLetterKeyCZ(letter); // Czech
+                case Language.GA: return GetDefaultLetterKeyGA(letter); // Gaeilge (Irish Gaelic)
+                case Language.GD: return GetDefaultLetterKeyGD(letter); // Gàidhlig (Scottish Gaelic)
                 case Language.DE: return GetDefaultLetterKeyDE(letter); // German
                 case Language.FR: return GetDefaultLetterKeyFR(letter); // French
                 case Language.HR: return GetDefaultLetterKeyHR(letter); // Croatian
@@ -530,6 +534,46 @@ namespace PowerAccent.Core
             return Array.Empty<string>();
         }
 
+        // Gaeilge (Irish language)
+        private static string[] GetDefaultLetterKeyGA(LetterKey letter)
+        {
+            switch (letter)
+            {
+                case LetterKey.VK_A:
+                    return new string[] { "á" };
+                case LetterKey.VK_E:
+                    return new string[] { "é" };
+                case LetterKey.VK_I:
+                    return new string[] { "í" };
+                case LetterKey.VK_O:
+                    return new string[] { "ó" };
+                case LetterKey.VK_U:
+                    return new string[] { "ú" };
+            }
+
+            return Array.Empty<string>();
+        }
+
+        // Gàidhlig (Scottish Gaelic)
+        private static string[] GetDefaultLetterKeyGD(LetterKey letter)
+        {
+            switch (letter)
+            {
+                case LetterKey.VK_A:
+                    return new string[] { "à" };
+                case LetterKey.VK_E:
+                    return new string[] { "è" };
+                case LetterKey.VK_I:
+                    return new string[] { "ì" };
+                case LetterKey.VK_O:
+                    return new string[] { "ò" };
+                case LetterKey.VK_U:
+                    return new string[] { "ù" };
+            }
+
+            return Array.Empty<string>();
+        }
+
         // Czech
         private static string[] GetDefaultLetterKeyCZ(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 4524af6d86..cd2e188d6c 100644
--- a/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
+++ b/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
@@ -2552,6 +2552,14 @@ Activate by holding the key for the character you want to add an accent to, then
   <data name="QuickAccent_SelectedLanguage_Czech.Content" xml:space="preserve">
     <value>Czech</value>
   </data>
+  <data name="QuickAccent_SelectedLanguage_Gaeilge.Content" xml:space="preserve">
+    <value>Gaeilge</value>
+    <comment>Irish Gaelic</comment>
+  </data>
+  <data name="QuickAccent_SelectedLanguage_Gaidhlig.Content" xml:space="preserve">
+    <value>Gàidhlig</value>
+    <comment>Scottish Gaelic</comment>
+  </data>
   <data name="QuickAccent_SelectedLanguage_German.Content" xml:space="preserve">
     <value>German</value>
   </data>
diff --git a/src/settings-ui/Settings.UI/ViewModels/PowerAccentViewModel.cs b/src/settings-ui/Settings.UI/ViewModels/PowerAccentViewModel.cs
index 61d4a78261..f2adc823d6 100644
--- a/src/settings-ui/Settings.UI/ViewModels/PowerAccentViewModel.cs
+++ b/src/settings-ui/Settings.UI/ViewModels/PowerAccentViewModel.cs
@@ -28,6 +28,8 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             "CUR",
             "HR",
             "CZ",
+            "GA",
+            "GD",
             "NL",
             "FR",
             "DE",
diff --git a/src/settings-ui/Settings.UI/Views/PowerAccentPage.xaml b/src/settings-ui/Settings.UI/Views/PowerAccentPage.xaml
index e546864169..37c4452f2f 100644
--- a/src/settings-ui/Settings.UI/Views/PowerAccentPage.xaml
+++ b/src/settings-ui/Settings.UI/Views/PowerAccentPage.xaml
@@ -65,6 +65,8 @@
                             <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Currency" />
                             <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Croatian" />
                             <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Czech" />
+                            <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Gaeilge" />
+                            <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Gaidhlig" />
                             <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Dutch" />
                             <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_French" />
                             <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_German" />