Skip to content

Commit 2d1c892

Browse files
committed
Revert "Do not override explicit Language set"
This reverts commit b273263.
1 parent b273263 commit 2d1c892

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

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

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

113110
hstring ResourceContext::GetLangugageContext()

0 commit comments

Comments
 (0)