Merge pull request #1464 from sillsdev/DariLang

Work around Windows CultureInfo change for Dari (prs) (#1464)

Author: StephenMcConnel

.github/workflows/build.yml

@@ -71,8 +71,12 @@ jobs:
       timeout-minutes: 5
 
     - name: Start Windows Audio Service
-      run: net start audiosrv
       shell: powershell
+      run: |
+        $svc = Get-Service -Name "audiosrv"
+        if ($svc.Status -ne "Running") {
+          net start audiosrv
+        }
 
     # there are cases where this will fail and we want to know about it
     # so we don't use continue-on-error, but we still want to publish the results

SIL.WritingSystems.Tests/IetfLanguageTagTests.cs

@@ -920,6 +920,8 @@ public void IsScriptImplied_ReturnsExpectedResults(string tag, bool expectedResu
 		}
 
 		#region GetLocalizedLanguageName
+		const string kIetfLanguageCodeWhichWindowsDoesntKnowAbout = "tlh"; // Happens to be Klingon
+
 		[TestCase("en", "en", ExpectedResult = "English")]
 		[TestCase("en-Latn-US", "en", ExpectedResult = "English")]
 		[TestCase("en-x-etic", "en-GB", ExpectedResult = "English")]
@@ -932,8 +934,10 @@ public void IsScriptImplied_ReturnsExpectedResults(string tag, bool expectedResu
 		[TestCase("zh-CN", "en", ExpectedResult = "Chinese (Simplified)")]
 		[TestCase("pbu", "pbu", ExpectedResult = "پښتو")]
 		[TestCase("pbu", "tpi", ExpectedResult = "پښتو")]
+		[TestCase("pbu", kIetfLanguageCodeWhichWindowsDoesntKnowAbout, ExpectedResult = "پښتو")]
 		[TestCase("prs", "en", ExpectedResult = "Dari")]
 		[TestCase("tpi", "tpi", ExpectedResult = "Tok Pisin")]
+		[TestCase("tpi", kIetfLanguageCodeWhichWindowsDoesntKnowAbout, ExpectedResult = "Tok Pisin")]
 		[TestCase("es", "tpi", ExpectedResult = "español")]
 		[TestCase("es", "fr", "español", ExpectedResult = "espagnol")]
 		[TestCase("es", "de", "español", ExpectedResult = "Spanisch")]
@@ -953,6 +957,7 @@ public void IsScriptImplied_ReturnsExpectedResults(string tag, bool expectedResu
 		// version does not actually appear on that Wikipedia page.
 		[TestCase("prs", "prs", /*"درى",*/ ExpectedResult = "دری")]
 		[TestCase("prs", "fr", /*"درى",*/ ExpectedResult = "دری")]
+		[TestCase("prs", kIetfLanguageCodeWhichWindowsDoesntKnowAbout, /*"درى",*/ ExpectedResult = "دری")]
 		public string GetLocalizedLanguageName_Valid_GetsNameInTargetLanguageOrNativeAsFallback(
 			string tag, string uiTag, string acceptableFallback = null)
 		{

SIL.WritingSystems/IetfLanguageTag.cs

@@ -1313,6 +1313,15 @@ public static string GetLocalizedLanguageName(string languageTag, string uiLangu
 				return "Chinese (Simplified)";
 			}
 
+			// Starting some time around Sept 2025, Windows started returning the "fa" culture
+			// for CultureInfo.GetCultureInfo("prs"). We actually want to return Dari in that case.
+			if (generalCode == "prs")
+			{
+				if (uiLanguageCode == "en")
+					return "Dari";
+				return "دری";
+			}
+
 			if (UseICUForLanguageNames)
 			{
 				var name = GetLocalizedLanguageNameFromIcu(generalCode, uiLanguageCode);
@@ -1404,6 +1413,12 @@ public static string GetNativeLanguageNameWithEnglishSubtitle(string code)
 			{
 				// englishNameSuffix is always an empty string if we don't need it.
 				string englishNameSuffix = Empty;
+
+				// Starting some time around Sept 2025, Windows started returning the "fa" culture
+				// for CultureInfo.GetCultureInfo("prs"). We actually want to return Dari in that case.
+				if (generalCode == "prs")
+					return "دری (Dari)";
+
 				var ci = CultureInfo.GetCultureInfo(generalCode); // this may throw or produce worthless empty object
 				if (NeedEnglishSuffixForLanguageName(ci))
 					englishNameSuffix = $" ({GetManuallyOverriddenEnglishNameIfNeeded(code, ()=>ci.EnglishName)})";