Skip to content

Conversation

@phenning
Copy link
Member

Update localization for templates

Inserting localization from WebTools repo

@phenning phenning requested a review from a team as a code owner February 11, 2021 15:24
@ghost ghost added the area-mvc Includes: MVC, Actions and Controllers, Localization, CORS, most templates label Feb 11, 2021
@phenning
Copy link
Member Author

@pranavkm Here are the updated strings. I couldn't locate your repo issue #, but this corresponds with the bug in DevOps.

@phenning phenning changed the base branch from main to release/5.0 February 11, 2021 15:26
@pranavkm
Copy link
Contributor

Thanks Phil. Could you rebase on the 5.0 branch? Might fix the merge conflicts.

@phenning
Copy link
Member Author

Thanks Phil. Could you rebase on the 5.0 branch? Might fix the merge conflicts.

Weird, it was initially branched from release/5.0, but I created the PR targeting main then retargetted on the website when i noticed..

@wtgodbe
Copy link
Member

wtgodbe commented Feb 11, 2021

Still lots of conflicts, I can get this merged once that's cleaned up

@mkArtakMSFT mkArtakMSFT added tell-mode Indicates a PR which is being merged during tell-mode ask-mode This issue / PR is a patch candidate which we will bar-check internally before patching it. and removed ask-mode This issue / PR is a patch candidate which we will bar-check internally before patching it. labels Feb 11, 2021
@mkArtakMSFT
Copy link
Contributor

Thanks @wtgodbe.
@phenning can you please resolve conflicts so that Will can get this merged? Thanks!

@mkArtakMSFT mkArtakMSFT added this to the 5.0.4 milestone Feb 11, 2021
# Conflicts:
#	src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/.template.config/es-ES/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/.template.config/it-IT/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/.template.config/pt-BR/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/.template.config/ru-RU/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/es-ES/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/it-IT/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/pt-BR/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/ru-RU/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/cs-CZ/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/de-DE/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/es-ES/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/it-IT/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/ja-JP/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/pl-PL/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/pt-BR/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/ru-RU/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/tr-TR/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/zh-CN/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/zh-TW/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/cs-CZ/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/de-DE/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/es-ES/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/it-IT/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/ja-JP/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/pl-PL/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/pt-BR/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/ru-RU/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/tr-TR/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/zh-CN/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/zh-TW/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/it-IT/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/ru-RU/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/zh-TW/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/it-IT/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/ru-RU/strings.json
@phenning phenning force-pushed the phenning/locUpdate-50 branch from 2d806c3 to efcee52 Compare February 11, 2021 17:44
@phenning
Copy link
Member Author

Still lots of conflicts, I can get this merged once that's cleaned up

Should be good to go now.

Copy link
Contributor

@mkArtakMSFT mkArtakMSFT left a comment

Choose a reason for hiding this comment

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

Thanks @phenning!

@wtgodbe
Copy link
Member

wtgodbe commented Feb 11, 2021

Do we need this change in 3.1 as well? @phenning @mkArtakMSFT

@phenning
Copy link
Member Author

Do we need this change in 3.1 as well? @phenning @mkArtakMSFT

From my perspective in VS 16.9+ its not really necessary since we have 5.0 enabled by default and will pull in these strings in the new UI experience. Also, without updates to the en strings.json in 3.1 (which are not in this PR) enu and non-enu names would be out of sync since we added "ASP.NET Core" to some of the template names in the 5.0 branch for the new New Project Dialog experience.

@wtgodbe wtgodbe merged commit c097bb9 into dotnet:release/5.0 Feb 11, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area-mvc Includes: MVC, Actions and Controllers, Localization, CORS, most templates tell-mode Indicates a PR which is being merged during tell-mode

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants