Do not override explicit Language set

stefansjfw · stefansjfw · commit 3df83b37bfcc · 2024-06-28T13:30:57.000+02:00
diff --git a/dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/ResourceContext.cpp b/dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/ResourceContext.cpp
@@ -57,7 +57,12 @@ void ResourceContext::InitializeQualifierValueMap()
                 if (m_qualifierNames[i] == c_languageQualifierName)
                 {
                     auto languages = GetLangugageContext();
-                    if (!languages.empty())
+                    if (!ApplicationLanguages::PrimaryLanguageOverride().empty())
+                    {
+                        m_qualifierValueMap.Insert(m_qualifierNames[i], ApplicationLanguages::PrimaryLanguageOverride());
+                        continue;
+                    }
+                    else if (!languages.empty())
                     {
                         m_qualifierValueMap.Insert(m_qualifierNames[i], languages);
                         continue;
@@ -101,10 +106,6 @@ void ResourceContext::Apply()
             winrt::check_hresult(MrmSetQualifier(m_resourceContext, eachValue.Key().c_str(), eachValue.Value().c_str()));
         }
     }
-    if (!ApplicationLanguages::PrimaryLanguageOverride().empty())
-    {
-        winrt::check_hresult(MrmSetQualifier(m_resourceContext, c_languageQualifierName, ApplicationLanguages::PrimaryLanguageOverride().c_str()));
-    }
 }
 
 hstring ResourceContext::GetLangugageContext()

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,12 @@ void ResourceContext::InitializeQualifierValueMap()`
`57`	`57`	`if (m_qualifierNames[i] == c_languageQualifierName)`
`58`	`58`	`{`
`59`	`59`	`auto languages = GetLangugageContext();`
`60`		`- if (!languages.empty())`
	`60`	`+ if (!ApplicationLanguages::PrimaryLanguageOverride().empty())`
	`61`	`+ {`
	`62`	`+ m_qualifierValueMap.Insert(m_qualifierNames[i], ApplicationLanguages::PrimaryLanguageOverride());`
	`63`	`+ continue;`
	`64`	`+ }`
	`65`	`+ else if (!languages.empty())`
`61`	`66`	`{`
`62`	`67`	`m_qualifierValueMap.Insert(m_qualifierNames[i], languages);`
`63`	`68`	`continue;`
`@@ -101,10 +106,6 @@ void ResourceContext::Apply()`
`101`	`106`	`winrt::check_hresult(MrmSetQualifier(m_resourceContext, eachValue.Key().c_str(), eachValue.Value().c_str()));`
`102`	`107`	`}`
`103`	`108`	`}`
`104`		`- if (!ApplicationLanguages::PrimaryLanguageOverride().empty())`
`105`		`- {`
`106`		`- winrt::check_hresult(MrmSetQualifier(m_resourceContext, c_languageQualifierName, ApplicationLanguages::PrimaryLanguageOverride().c_str()));`
`107`		`- }`
`108`	`109`	`}`
`109`	`110`
`110`	`111`	`hstring ResourceContext::GetLangugageContext()`