Revert "[MRTCore] Sync between WGA.PrimaryLanguageOverride and MWGA.PrimaryLanguageOverride (#4608)" (#4712)
This reverts commit 68ffb095b3
.
This commit is contained in:
Родитель
aae37a0580
Коммит
b9a3c8c6ba
|
@ -6,8 +6,6 @@
|
||||||
#include "ResourceContext.g.cpp"
|
#include "ResourceContext.g.cpp"
|
||||||
#include "winrt/Windows.Globalization.h"
|
#include "winrt/Windows.Globalization.h"
|
||||||
|
|
||||||
#include <AppModel.Identity.h>
|
|
||||||
|
|
||||||
const wchar_t c_languageQualifierName[] = L"Language";
|
const wchar_t c_languageQualifierName[] = L"Language";
|
||||||
|
|
||||||
#include "ApplicationLanguages.h"
|
#include "ApplicationLanguages.h"
|
||||||
|
@ -103,16 +101,6 @@ void ResourceContext::Apply()
|
||||||
winrt::check_hresult(MrmSetQualifier(m_resourceContext, eachValue.Key().c_str(), eachValue.Value().c_str()));
|
winrt::check_hresult(MrmSetQualifier(m_resourceContext, eachValue.Key().c_str(), eachValue.Value().c_str()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// sync with Windows::Globalization::ApplicationLanguages::PrimaryLanguageOverride if it has been updated more recently
|
|
||||||
if (AppModel::Identity::IsPackagedProcess())
|
|
||||||
{
|
|
||||||
auto language = winrt::Windows::Globalization::ApplicationLanguages::PrimaryLanguageOverride();
|
|
||||||
if (language != ApplicationLanguages::PrimaryLanguageOverride())
|
|
||||||
{
|
|
||||||
ApplicationLanguages::PrimaryLanguageOverride(language);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (!ApplicationLanguages::PrimaryLanguageOverride().empty())
|
if (!ApplicationLanguages::PrimaryLanguageOverride().empty())
|
||||||
{
|
{
|
||||||
winrt::check_hresult(MrmSetQualifier(m_resourceContext, c_languageQualifierName, ApplicationLanguages::PrimaryLanguageOverride().c_str()));
|
winrt::check_hresult(MrmSetQualifier(m_resourceContext, c_languageQualifierName, ApplicationLanguages::PrimaryLanguageOverride().c_str()));
|
||||||
|
|
Загрузка…
Ссылка в новой задаче