Skip to content

Commit 3df83b3

Browse files
committed
Do not override explicit Language set
1 parent 0cf11b8 commit 3df83b3

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/ResourceContext.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,12 @@ void ResourceContext::InitializeQualifierValueMap()
5757
if (m_qualifierNames[i] == c_languageQualifierName)
5858
{
5959
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())
6166
{
6267
m_qualifierValueMap.Insert(m_qualifierNames[i], languages);
6368
continue;
@@ -101,10 +106,6 @@ void ResourceContext::Apply()
101106
winrt::check_hresult(MrmSetQualifier(m_resourceContext, eachValue.Key().c_str(), eachValue.Value().c_str()));
102107
}
103108
}
104-
if (!ApplicationLanguages::PrimaryLanguageOverride().empty())
105-
{
106-
winrt::check_hresult(MrmSetQualifier(m_resourceContext, c_languageQualifierName, ApplicationLanguages::PrimaryLanguageOverride().c_str()));
107-
}
108109
}
109110

110111
hstring ResourceContext::GetLangugageContext()

0 commit comments

Comments
 (0)