[MRTCore] Add Microsoft.Windows.Globalization.ApplicationLanguages class #4181
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| // Copyright (c) Microsoft Corporation and Contributors. | ||
| // Licensed under the MIT License. | ||
|
|
||
| #include "pch.h" | ||
| #include "ApplicationLanguages.h" | ||
| #include "Microsoft.Windows.Globalization.ApplicationLanguages.g.cpp" | ||
|
|
||
| #include <winrt/Windows.Globalization.h> | ||
|
|
||
| #include <AppModel.Identity.h> | ||
|
|
||
| #include "Helper.h" | ||
|
|
||
| namespace winrt::Microsoft::Windows::Globalization::implementation | ||
| { | ||
| hstring ApplicationLanguages::m_language; | ||
|
|
||
| winrt::Windows::Foundation::Collections::IVectorView<hstring> ApplicationLanguages::Languages() | ||
| { | ||
| return winrt::Windows::Globalization::ApplicationLanguages::Languages(); | ||
| } | ||
|
|
||
| winrt::Windows::Foundation::Collections::IVectorView<hstring> ApplicationLanguages::ManifestLanguages() | ||
| { | ||
| if (AppModel::Identity::IsPackagedProcess()) | ||
| { | ||
| return winrt::Windows::Globalization::ApplicationLanguages::ManifestLanguages(); | ||
| } | ||
| else | ||
| { | ||
| return {}; | ||
| } | ||
| } | ||
|
|
||
| hstring ApplicationLanguages::PrimaryLanguageOverride() | ||
| { | ||
| static wil::srwlock lock; | ||
|
|
||
| auto criticalSection{ lock.lock_shared() }; | ||
| return m_language; | ||
| } | ||
|
|
||
| void ApplicationLanguages::PrimaryLanguageOverride(hstring const& language) | ||
| { | ||
| bool isValidLanguageTag = IsWellFormedLanguageTag(language.c_str()); | ||
|
|
||
| THROW_HR_IF_MSG(E_INVALIDARG, !isValidLanguageTag, "The parameter is incorrect"); | ||
|
|
||
| static wil::srwlock lock; | ||
|
|
||
| auto criticalSection {lock.lock_exclusive()}; | ||
| m_language = language; | ||
|
|
||
| if (AppModel::Identity::IsPackagedProcess()) | ||
| { | ||
| winrt::Windows::Globalization::ApplicationLanguages::PrimaryLanguageOverride(language); | ||
stefansjfw marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
| } | ||
| } // namespace winrt::Microsoft::Windows::Globalization::implementation | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| // Copyright (c) Microsoft Corporation and Contributors. | ||
| // Licensed under the MIT License. | ||
|
|
||
| #pragma once | ||
| #include "Microsoft.Windows.Globalization.ApplicationLanguages.g.h" | ||
|
|
||
| namespace winrt::Microsoft::Windows::Globalization::implementation | ||
| { | ||
| struct ApplicationLanguages | ||
| { | ||
| ApplicationLanguages() = delete; | ||
|
|
||
| static winrt::Windows::Foundation::Collections::IVectorView<hstring> Languages(); | ||
| static winrt::Windows::Foundation::Collections::IVectorView<hstring> ManifestLanguages(); | ||
| static hstring PrimaryLanguageOverride(); | ||
| static void PrimaryLanguageOverride(hstring const& language); | ||
|
|
||
| private: | ||
| static hstring m_language; | ||
| }; | ||
| } // namespace winrt::Microsoft::Windows::Globalization::implementation | ||
|
|
||
| namespace winrt::Microsoft::Windows::Globalization::factory_implementation | ||
| { | ||
| struct ApplicationLanguages : ApplicationLanguagesT<ApplicationLanguages, implementation::ApplicationLanguages> | ||
| { | ||
| }; | ||
| } // namespace winrt::Microsoft::Windows::Globalization::factory_implementation |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,6 +8,10 @@ | |
|
|
||
| const wchar_t c_languageQualifierName[] = L"Language"; | ||
|
|
||
| #include "ApplicationLanguages.h" | ||
|
|
||
| using namespace winrt::Microsoft::Windows::Globalization; | ||
|
|
||
| namespace winrt::Microsoft::Windows::ApplicationModel::Resources::implementation | ||
| { | ||
| void ResourceContext::InitializeQualifierNames() | ||
|
|
@@ -97,6 +101,10 @@ void ResourceContext::Apply() | |
| winrt::check_hresult(MrmSetQualifier(m_resourceContext, eachValue.Key().c_str(), eachValue.Value().c_str())); | ||
| } | ||
| } | ||
| if (!ApplicationLanguages::PrimaryLanguageOverride().empty()) | ||
|
There was a problem hiding this comment. With W.G.PrimaryLanguageOverride set, newly created ResourceContext takes PrimaryLanguageOverride into account, i.e. does not override language QualifierValue to default language. There was a problem hiding this comment. e.g. if default language is "en-US", PrimaryLanguageOverride is "de-DE", and ResourceContext["Lanauge"]="fr-FR", what's the language that will take effect? I'd think "fr-FR" There was a problem hiding this comment. according to this logic, no, PrimaryLanguageOverride should take precedence over ResourceContext["Language"]. GetLangugageContext returns Windows::Globalization::ApplicationLanguages::Languages() which is affected if W.G.PrimaryLanguageOverride is set. This behavior remains the same with this change There was a problem hiding this comment. I think in that logic ResourceContext["Language"] still takes precedence. It would be strange to the caller that an explicit request is not honored There was a problem hiding this comment. Got it now. You're right. Fixed by latest change. Now explicit set of context Language is not overridden by PrimaryLanguageOverride. I tested with this WinAppSDK sample. Default language is PrimaryLanguageOverride - de-DE, but fetching resources with m_overrideResourceContext passed is fetching it-IT resources:
|
||
| { | ||
| winrt::check_hresult(MrmSetQualifier(m_resourceContext, c_languageQualifierName, ApplicationLanguages::PrimaryLanguageOverride().c_str())); | ||
| } | ||
| } | ||
|
|
||
| hstring ResourceContext::GetLangugageContext() | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You have to use the same lock for reading and writing. Otherwise the setter could take an exclusive lock, but another thread could still read the data.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🤦 fixed