From fb2b150a1dd394fddcf6663b8590e0faeb179ace Mon Sep 17 00:00:00 2001
From: norwayman22 <adrian.aaen@gmail.com>
Date: Mon, 30 Jan 2023 19:51:19 +0100
Subject: [PATCH] [QuickAccent]Added support for Norwegian letters (#23487)

* [QuickAccent]Added support for Norwegian letters

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

diff --git a/src/modules/poweraccent/PowerAccent.Core/Languages.cs b/src/modules/poweraccent/PowerAccent.Core/Languages.cs
index 2cfd8e1f0a..2546f366b7 100644
--- a/src/modules/poweraccent/PowerAccent.Core/Languages.cs
+++ b/src/modules/poweraccent/PowerAccent.Core/Languages.cs
@@ -29,6 +29,7 @@ namespace PowerAccent.Core
         MK,
         MI,
         NL,
+        NO,
         PI,
         PL,
         PT,
@@ -65,6 +66,7 @@ namespace PowerAccent.Core
                 Language.MK => GetDefaultLetterKeyMK(letter), // Macedonian
                 Language.MI => GetDefaultLetterKeyMI(letter), // Maori
                 Language.NL => GetDefaultLetterKeyNL(letter), // Dutch
+                Language.NO => GetDefaultLetterKeyNO(letter), // Norwegian
                 Language.PI => GetDefaultLetterKeyPI(letter), // Pinyin
                 Language.PL => GetDefaultLetterKeyPL(letter), // Polish
                 Language.PT => GetDefaultLetterKeyPT(letter), // Portuguese
@@ -583,5 +585,18 @@ namespace PowerAccent.Core
                 _ => Array.Empty<string>(),
             };
         }
+
+        // Norwegian
+        private static string[] GetDefaultLetterKeyNO(LetterKey letter)
+        {
+            return letter switch
+            {
+                LetterKey.VK_A => new string[] { "å", "æ" },
+                LetterKey.VK_E => new string[] { "€" },
+                LetterKey.VK_O => new string[] { "ø" },
+                LetterKey.VK_S => 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 04a8c64b48..74bcd3d3d2 100644
--- a/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
+++ b/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
@@ -2752,6 +2752,9 @@ Activate by holding the key for the character you want to add an accent to, then
   <data name="QuickAccent_SelectedLanguage_Dutch.Content" xml:space="preserve">
     <value>Dutch</value>
   </data>
+  <data name="QuickAccent_SelectedLanguage_Norwegian.Content" xml:space="preserve">
+    <value>Norwegian</value>
+  </data>
   <data name="QuickAccent_SelectedLanguage_Pinyin.Content" xml:space="preserve">
     <value>Pinyin</value>
   </data>
diff --git a/src/settings-ui/Settings.UI/ViewModels/PowerAccentViewModel.cs b/src/settings-ui/Settings.UI/ViewModels/PowerAccentViewModel.cs
index 368f73155a..2596e5952d 100644
--- a/src/settings-ui/Settings.UI/ViewModels/PowerAccentViewModel.cs
+++ b/src/settings-ui/Settings.UI/ViewModels/PowerAccentViewModel.cs
@@ -41,6 +41,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             "KU",
             "MK",
             "MI",
+            "NO",
             "PI",
             "PL",
             "PT",
diff --git a/src/settings-ui/Settings.UI/Views/PowerAccentPage.xaml b/src/settings-ui/Settings.UI/Views/PowerAccentPage.xaml
index c9b640ac30..9d3580467f 100644
--- a/src/settings-ui/Settings.UI/Views/PowerAccentPage.xaml
+++ b/src/settings-ui/Settings.UI/Views/PowerAccentPage.xaml
@@ -78,6 +78,7 @@
                             <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Kurdish" />
                             <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Macedonian" />
                             <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Maori" />
+                            <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Norwegian" />
                             <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Pinyin" />
                             <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Polish" />
                             <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Portuguese" />