Merge branch 'master' into Yvand/add-param-to-spfarm

CHANGELOG.md

@@ -10,6 +10,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - SPFarm
   - Added parameter SkipRegisterAsDistributedCacheHost
 
+### Fixed
+
+- SPInstallLanguagePack
+  - Fixed detection of Norwegian language pack
+
 ## [4.7.0] - 2021-06-10
 
 ### Added
@@ -31,8 +36,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - Added ability to configure generic authentication settings per zone, like allow
     anonymous authentication or a custom signin page
 
-### Fixed
-
 - SharePointDsc
   - Fixed code coverage in pipeline
 - SPConfigWizard

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(","))