[QuickAccent]Added support for Norwegian letters (#23487)

* [QuickAccent]Added support for Norwegian letters * Add language to Settings
microsoft · Jan 30, 2023 · fb2b150 · fb2b150
1 parent 92f61d6
commit fb2b150
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 0 deletions.
diff --git a/src/modules/poweraccent/PowerAccent.Core/Languages.cs b/src/modules/poweraccent/PowerAccent.Core/Languages.cs
@@ -29,6 +29,7 @@ public enum Language
         MK,
         MI,
         NL,
+        NO,
         PI,
         PL,
         PT,
@@ -65,6 +66,7 @@ public static string[] GetDefaultLetterKey(LetterKey letter, Language lang)
                 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 @@ private static string[] GetDefaultLetterKeyMK(LetterKey letter)
                 _ => 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
@@ -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
@@ -41,6 +41,7 @@ public class PowerAccentViewModel : Observable
             "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
@@ -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" />
-Original file line number
+Diff line change
@@ Expand Up / @@ -41,6 +41,7 @@ public class PowerAccentViewModel : Observable @@
                 "KU",
                 "MK",
                 "MI",
+                "NO",
                 "PI",
                 "PL",
                 "PT",
@@ Expand Down @@