File tree Expand file tree Collapse file tree 1 file changed +8
-5
lines changed
dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src Expand file tree Collapse file tree 1 file changed +8
-5
lines changed Original file line number Diff line number Diff line change @@ -56,8 +56,15 @@ void ResourceContext::InitializeQualifierValueMap()
56
56
// Override the default behavior
57
57
if (m_qualifierNames[i] == c_languageQualifierName)
58
58
{
59
+ auto primaryLanguageOverride = ApplicationLanguages::PrimaryLanguageOverride ();
59
60
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 ())
61
68
{
62
69
m_qualifierValueMap.Insert (m_qualifierNames[i], languages);
63
70
continue ;
@@ -101,10 +108,6 @@ void ResourceContext::Apply()
101
108
winrt::check_hresult (MrmSetQualifier (m_resourceContext, eachValue.Key ().c_str (), eachValue.Value ().c_str ()));
102
109
}
103
110
}
104
- if (!ApplicationLanguages::PrimaryLanguageOverride ().empty ())
105
- {
106
- winrt::check_hresult (MrmSetQualifier (m_resourceContext, c_languageQualifierName, ApplicationLanguages::PrimaryLanguageOverride ().c_str ()));
107
- }
108
111
}
109
112
110
113
hstring ResourceContext::GetLangugageContext ()
You can’t perform that action at this time.
0 commit comments