Merge pull request #1324 from jensotto/fix-nb-no-language-pack-detection

SPInstallLanguagePack: Fix detection of norwegian language pack
dsccommunity · Jun 22, 2021 · 1b7c1e1 · 1b7c1e1
2 parents 852a377 + 4c2d4a6
commit 1b7c1e1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+- SPInstallLanguagePack
+  - Fixed detection of Norwegian language pack
+
 ## [4.7.0] - 2021-06-10
 
 ### Added

diff --git a/SharePointDsc/DSCResources/MSFT_SPInstallLanguagePack/MSFT_SPInstallLanguagePack.psm1 b/SharePointDsc/DSCResources/MSFT_SPInstallLanguagePack/MSFT_SPInstallLanguagePack.psm1
@@ -250,16 +250,13 @@ function Get-TargetResource
         {
             $languageEnglish = "Serbian (Latin)"
         }
-        # If VS Code shows a strange character in Bokmål, this is correct.
-        # PowerShell encodes files in Windows-1252 and VSCode uses UTF8.
-        # This characters is therefore stored in Windows-1252.
-        "Norwegian Bokm�l (Norway)"
-        {
-            $languageEnglish = "Norwegian"
-        }
         Default
         {
-            if ($cultureInfo.EnglishName -match "(\w*,*\s*\w*) \([^)]*\)")
+            if ($cultureInfo.LCID -eq 1044)
+            {
+                $languageEnglish = "Norwegian"
+            }
+            elseif ($cultureInfo.EnglishName -match "(\w*,*\s*\w*) \([^)]*\)")
             {
                 $languageEnglish = $matches[1]
                 if ($languageEnglish.contains(","))