Skip to content

Use same language set for .wxl and .json files #43888

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 9, 2022

Conversation

dougbu
Copy link
Contributor

@dougbu dougbu commented Sep 9, 2022

  • translation infrastructure works better when Projects elements use same languages
    • previous use of two+two codes were an unnecessary complication and cover the same languages
  • WiX_CloneLanguages already updated on loc side to use the default two-letter language codes

- translation infrastructure works better when `Projects` elements use same languages
  - previous use of two+two codes were an unnecessary complication and cover the same languages
- `WiX_CloneLanguages` already updated on loc side to use the default two-letter language codes
@dougbu dougbu added the area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework label Sep 9, 2022
@dougbu dougbu requested a review from a team September 9, 2022 19:02
@ghost
Copy link

ghost commented Sep 9, 2022

Hey @dotnet/aspnet-build, looks like this PR is something you want to take a look at.

@@ -91,6 +91,7 @@ $locJson = @{
)
},
@{
LanguageSet = $LanguageSet
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this change be in Arcade?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm rushing a bit because a change on the loc side (the WiX_CloneLanguages change mentioned in the description) broke the current aspnetcore-localization pipeline and caused the messed-up e532948 commit. That commit adds incorrectly-mapped files like src/Installers/Windows/SharedFrameworkBundle/cs-CZ/thm.wxl.

I'm about to put up a PR for Arcade making exactly the same fix but want tomorrow's OneLocBuild task to work cleanly.

@dougbu
Copy link
Contributor Author

dougbu commented Sep 9, 2022

Will check this in as soon as it's approved since my test build (#20220908.2) already ran successfully. Resulting loc project looked good. It was the regular build from main that borked things.

@dougbu dougbu merged commit 349ddc9 into dotnet:main Sep 9, 2022
@dougbu dougbu deleted the dougbu/wxl.loc.fix branch September 9, 2022 19:09
@ghost ghost added this to the 8.0-preview1 milestone Sep 9, 2022
@dougbu
Copy link
Contributor Author

dougbu commented Sep 9, 2022

Merged immediately because CI build has nothing to do w/ the changed file.

@dougbu dougbu restored the dougbu/wxl.loc.fix branch September 9, 2022 19:14
dougbu added a commit that referenced this pull request Sep 12, 2022
- translation infrastructure works better when `Projects` elements use same languages
  - previous use of two+two codes were an unnecessary complication and cover the same languages
- `WiX_CloneLanguages` already updated on loc side to use the default two-letter language codes
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants