[MRTCore] Add Microsoft.Windows.Globalization.ApplicationLanguages class #4181

stefansjfw · 2024-02-09T13:54:05Z

Changing the application language using PrimaryLanguageOverride property from Windows.Globalization.ApplicationLanguages namespace is not supported for WindowsAppSDK unpackaged apps, only for packaged. To support language change for un-packaged applications Microsoft.Windows.Globalization.ApplicationLanguages.ApplicationLanguages type is introduced in MRTCore. Microsoft.Windows.Globalization.ApplicationLanguages.PrimaryLanguageOverride property is supported both for packaged and un-packaged WindowsAppSDK apps.

Sample app used to verify the change: https://github.com/stefansjfw/testwasdk/blob/master/testlocalwinappsdk/App.xaml.cs#L36

A microsoft employee must use /azp run to validate using the pipelines below.

WARNING:
Comments made by azure-pipelines bot maybe inaccurate.
Please see pipeline link to verify that the build is being ran.

For status checks on the main branch, please use TransportPackage-Foundation-PR
(https://microsoft.visualstudio.com/ProjectReunion/_build?definitionId=81063&_a=summary)
and run the build against your PR branch with the default parameters.

stefansjfw · 2024-02-09T13:54:37Z

/azp run

azure-pipelines · 2024-02-09T13:54:42Z

Commenter does not have sufficient privileges for PR 4181 in repo microsoft/WindowsAppSDK

crutkas · 2024-02-10T04:55:41Z

while doubtful /azp run

crutkas · 2024-02-10T05:01:23Z

/azp run

azure-pipelines · 2024-02-10T05:01:29Z

Commenter does not have sufficient privileges for PR 4181 in repo microsoft/WindowsAppSDK

crutkas · 2024-04-23T21:34:46Z

This is needed for PowerToys to fully enable language override

jeffstall · 2024-04-23T21:53:00Z

dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/ApplicationLanguages.h

+    static hstring PrimaryLanguageOverride();
+
+private:
+    static hstring m_language;


What happens with multiple threads?

wil::srwlock could be used to protect access to this variable.

...soft.Windows.ApplicationModel.Resources/src/Microsoft.Windows.ApplicationModel.Resources.idl

jeffstall

I've added comments. Please address and update.

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

...soft.Windows.ApplicationModel.Resources/src/Microsoft.Windows.ApplicationModel.Resources.idl

…er method

Thread safe PrimaryLanguageOverride for un-packaged Use W.G.PrimaryLanguageOverride for packaged

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

huichen123 · 2024-06-19T16:48:13Z

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

@@ -97,6 +97,10 @@ void ResourceContext::Apply()
            winrt::check_hresult(MrmSetQualifier(m_resourceContext, eachValue.Key().c_str(), eachValue.Value().c_str()));
        }
    }
+    if (!ApplicationLanguages::PrimaryLanguageOverride().empty())


PrimaryLanguageOverride

explicit language context should trump PrimaryLanguageOverride

With W.G.PrimaryLanguageOverride set, newly created ResourceContext takes PrimaryLanguageOverride into account, i.e. does not override language QualifierValue to default language.

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"

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

I think in that logic ResourceContext["Language"] still takes precedence. It would be strange to the caller that an explicit request is not honored

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:

Check if valid language tag is passed to PrimaryLanguageOverride

stefansjfw · 2024-06-26T16:04:18Z

note: changing namespace to Microsoft.Windows.Globalization.ApplicationLanguages is in progress (as decided during API review)

stefansjfw · 2024-06-27T13:18:57Z

note: changing namespace to Microsoft.Windows.Globalization.ApplicationLanguages is in progress (as decided during API review)

change pushed

kmahone · 2024-06-27T16:23:55Z

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

+
+        THROW_HR_IF_MSG(E_INVALIDARG, !isValidLanguageTag, "The parameter is incorrect");
+
+        static wil::srwlock lock;


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.

huichen123 · 2024-06-27T18:33:27Z

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

@@ -86,3 +86,31 @@ HRESULT GetDefaultPriFile(winrt::hstring& filePath)
    bool isPackaged = (hr != HRESULT_FROM_WIN32(APPMODEL_ERROR_NO_PACKAGE));
    return GetDefaultPriFileForCurentModule(isPackaged, filePath);
 }
+
+bool IsWellFormedLanguageTag(const wchar_t* languageTag)


can use https://learn.microsoft.com/en-us/windows/win32/api/bcp47mrm/nf-bcp47mrm-iswellformedtag

done. I don't have this header, so I reused the logic to load the DLL manually as in platform.h/.cpp. Tested. Works as expected.

the header should be in SDK. The LoadLibrary code was written before it's added into SDK.

according to the docs it should be there since Windows 10 Build 17763, but I don't have it on machine (OS version 10.0.22631 Build 22631), VS 22 installed with multiple SDK versions. I double-checked on another machine with the same software versions

I double-checked again, the header is present in SDK v10.0.20348.0 (and later), even though docs says it should be there before

Is bumping WindowsTargetPlatformVersion to 10.0.20348.0 for this specific project ok to do ?

I pushed the change (including WindowsTargetPlatformVersion bump). I'll revert if it's not ok

This reverts commit b273263.

kmahone · 2024-06-28T16:43:28Z

/azp run

azure-pipelines · 2024-06-28T16:43:41Z

Azure Pipelines successfully started running 1 pipeline(s).

kmahone · 2024-06-28T21:16:58Z

This has been merged as #4523

ghost1372 mentioned this pull request Feb 13, 2024

Support PrimaryLanguageOverride from unpackaged apps #1687

Closed

jeffstall reviewed Apr 23, 2024

View reviewed changes

...soft.Windows.ApplicationModel.Resources/src/Microsoft.Windows.ApplicationModel.Resources.idl Show resolved Hide resolved

jeffstall reviewed Apr 23, 2024

View reviewed changes

...soft.Windows.ApplicationModel.Resources/src/Microsoft.Windows.ApplicationModel.Resources.idl Show resolved Hide resolved

jeffstall reviewed Apr 23, 2024

View reviewed changes

...soft.Windows.ApplicationModel.Resources/src/Microsoft.Windows.ApplicationModel.Resources.idl Show resolved Hide resolved

jeffstall requested changes Apr 23, 2024

View reviewed changes

DrusTheAxe reviewed Apr 27, 2024

View reviewed changes

dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/ApplicationLanguages.cpp Outdated Show resolved Hide resolved

nickrandolph mentioned this pull request May 20, 2024

LocalizationService does not set a culture in Windows (Unpackaged) Head unoplatform/uno.extensions#2133

Open

stefansjfw added 2 commits June 4, 2024 11:29

[MRTCore] Add global PrimaryLanguageOverride switch

5259292

Address PR comment

410c575

stefansjfw force-pushed the user/stefansjfw/add_primary_language_override branch from eafa77e to 410c575 Compare June 6, 2024 13:13

kmahone reviewed Jun 6, 2024

View reviewed changes

...soft.Windows.ApplicationModel.Resources/src/Microsoft.Windows.ApplicationModel.Resources.idl Outdated Show resolved Hide resolved

stefansjfw added 3 commits June 7, 2024 09:46

Bump MrtCoreContract

7053cb8

Add Languages and ManifestLanguages properties. Add GetLanguagesForUs…

3f8a0d7

…er method

Remove GetLanguagesForUser

e3b424e

Thread safe PrimaryLanguageOverride for un-packaged Use W.G.PrimaryLanguageOverride for packaged

stefansjfw changed the title ~~[MRTCore] Add global PrimaryLanguageOverride switch~~ [MRTCore] Add Microsoft.Windows.ApplicationModel.ResourcesApplicationLanguages class Jun 19, 2024

huichen123 reviewed Jun 19, 2024

View reviewed changes

dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/ApplicationLanguages.cpp Show resolved Hide resolved

huichen123 reviewed Jun 19, 2024

View reviewed changes

Return empty ManifestLanguages list for unpackaged apps

108def9

Check if valid language tag is passed to PrimaryLanguageOverride

stefansjfw changed the title ~~[MRTCore] Add Microsoft.Windows.ApplicationModel.ResourcesApplicationLanguages class~~ [MRTCore] Add Microsoft.Windows.Globalization.ApplicationLanguages class Jun 26, 2024

Move to Microsoft.Windows.Globalization namespace

a344d8a

stefansjfw mentioned this pull request Jun 27, 2024

[MRTCore] Add PrimaryLanguageOverride samples microsoft/WindowsAppSDK-Samples#358

Open

7 tasks

stefansjfw requested review from DrusTheAxe, huichen123, kmahone and jeffstall June 27, 2024 14:33

kmahone reviewed Jun 27, 2024

View reviewed changes

stefansjfw requested a review from kmahone June 27, 2024 17:54

huichen123 reviewed Jun 27, 2024

View reviewed changes

stefansjfw requested a review from huichen123 June 27, 2024 21:20

stefansjfw added 5 commits June 28, 2024 13:43

static lock

b710e14

Use bcp47mrm IsWellFormedTag

544211d

Use bcp47mrm header

acbcd27

Do not override explicit Language set

b273263

Revert "Do not override explicit Language set"

2d1c892

This reverts commit b273263.

stefansjfw force-pushed the user/stefansjfw/add_primary_language_override branch from 6f37f5c to 2d1c892 Compare June 28, 2024 14:31

kmahone mentioned this pull request Jun 28, 2024

[MRTCore] Add Microsoft.Windows.Globalization.ApplicationLanguages class #4523

Merged

kmahone closed this Jun 28, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[MRTCore] Add Microsoft.Windows.Globalization.ApplicationLanguages class #4181

[MRTCore] Add Microsoft.Windows.Globalization.ApplicationLanguages class #4181

stefansjfw commented Feb 9, 2024 •

edited

Loading

stefansjfw commented Feb 9, 2024

azure-pipelines bot commented Feb 9, 2024

crutkas commented Feb 10, 2024

crutkas commented Feb 10, 2024

azure-pipelines bot commented Feb 10, 2024

crutkas commented Apr 23, 2024

jeffstall Apr 23, 2024

kmahone Jun 17, 2024

jeffstall left a comment

huichen123 Jun 19, 2024

stefansjfw Jun 26, 2024 •

edited

Loading

huichen123 Jun 27, 2024

stefansjfw Jun 27, 2024

huichen123 Jun 27, 2024

stefansjfw Jun 28, 2024

stefansjfw commented Jun 26, 2024

stefansjfw commented Jun 27, 2024

kmahone Jun 27, 2024

stefansjfw Jun 27, 2024

huichen123 Jun 27, 2024

stefansjfw Jun 27, 2024

huichen123 Jun 27, 2024

stefansjfw Jun 28, 2024

stefansjfw Jun 28, 2024

stefansjfw Jun 28, 2024 •

edited

Loading

stefansjfw Jun 28, 2024

kmahone commented Jun 28, 2024

azure-pipelines bot commented Jun 28, 2024

kmahone commented Jun 28, 2024


		THROW_HR_IF_MSG(E_INVALIDARG, !isValidLanguageTag, "The parameter is incorrect");

		static wil::srwlock lock;

[MRTCore] Add Microsoft.Windows.Globalization.ApplicationLanguages class #4181

[MRTCore] Add Microsoft.Windows.Globalization.ApplicationLanguages class #4181

Conversation

stefansjfw commented Feb 9, 2024 • edited Loading

stefansjfw commented Feb 9, 2024

azure-pipelines bot commented Feb 9, 2024

crutkas commented Feb 10, 2024

crutkas commented Feb 10, 2024

azure-pipelines bot commented Feb 10, 2024

crutkas commented Apr 23, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jeffstall left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

stefansjfw Jun 26, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

stefansjfw commented Jun 26, 2024

stefansjfw commented Jun 27, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

stefansjfw Jun 28, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kmahone commented Jun 28, 2024

azure-pipelines bot commented Jun 28, 2024

kmahone commented Jun 28, 2024

stefansjfw commented Feb 9, 2024 •

edited

Loading

stefansjfw Jun 26, 2024 •

edited

Loading

stefansjfw Jun 28, 2024 •

edited

Loading