Skip to content

LOC CHECKIN | dotnet/roslyn-master | 20171212#23744

Merged
tmeschter merged 3 commits intodotnet:masterfrom
tmeschter:Localization20171212
Dec 13, 2017
Merged

LOC CHECKIN | dotnet/roslyn-master | 20171212#23744
tmeschter merged 3 commits intodotnet:masterfrom
tmeschter:Localization20171212

Conversation

@tmeschter
Copy link
Copy Markdown
Contributor

Based on #23742, with further updates.

@tmeschter tmeschter requested review from a team as code owners December 12, 2017 17:58
@tmeschter
Copy link
Copy Markdown
Contributor Author

Didn't realize I could update #23742. I have done so, and will close this PR.

@tmeschter tmeschter closed this Dec 12, 2017
One of the VB scripting tests changes the default culture to "de-DE" and
later prints out a string subject to localization. Now that we actually
have satellite assemblies with real translations where the runtime will
find them, we're getting the German version rather than the English
version.

The fix here is to simply update the baseline.
@tmeschter tmeschter reopened this Dec 13, 2017
@tmeschter
Copy link
Copy Markdown
Contributor Author

The source branch for #23742 disappeared before I could push the latest fix, so I've had to reopen this PR.

@tmeschter
Copy link
Copy Markdown
Contributor Author

@jasonmalinowski Could you take a look at this? It's the same as #23742 but with the one broken unit test fixed up.

@jasonmalinowski
Copy link
Copy Markdown
Member

@tmeschter Let's merge this!

@tmeschter tmeschter merged commit 0923887 into dotnet:master Dec 13, 2017
@tmeschter tmeschter deleted the Localization20171212 branch December 13, 2017 23:47
@alrz
Copy link
Copy Markdown
Member

alrz commented Dec 13, 2017

well I think most of PRs just got conflicted. this is not great.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants