Skip to content

Commit b273263

Browse files
committed
Do not override explicit Language set
1 parent acbcd27 commit b273263

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,15 @@ void ResourceContext::InitializeQualifierValueMap()
5656
// Override the default behavior
5757
if (m_qualifierNames[i] == c_languageQualifierName)
5858
{
59+
auto primaryLanguageOverride = ApplicationLanguages::PrimaryLanguageOverride();
5960
auto languages = GetLangugageContext();
60-
if (!languages.empty())
61+
62+
if (!primaryLanguageOverride.empty())
63+
{
64+
m_qualifierValueMap.Insert(m_qualifierNames[i], primaryLanguageOverride);
65+
continue;
66+
}
67+
else if (!languages.empty())
6168
{
6269
m_qualifierValueMap.Insert(m_qualifierNames[i], languages);
6370
continue;
@@ -101,10 +108,6 @@ void ResourceContext::Apply()
101108
winrt::check_hresult(MrmSetQualifier(m_resourceContext, eachValue.Key().c_str(), eachValue.Value().c_str()));
102109
}
103110
}
104-
if (!ApplicationLanguages::PrimaryLanguageOverride().empty())
105-
{
106-
winrt::check_hresult(MrmSetQualifier(m_resourceContext, c_languageQualifierName, ApplicationLanguages::PrimaryLanguageOverride().c_str()));
107-
}
108111
}
109112

110113
hstring ResourceContext::GetLangugageContext()

0 commit comments

Comments
 (0)