Skip to content

Commit 350da82

Browse files
authored
Merge pull request #17812 from dotnet/master
2 parents f29a124 + 5ec5c96 commit 350da82

11 files changed

Lines changed: 7 additions & 16 deletions

File tree

aspnetcore/blazor/globalization-localization.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: Learn how to make Razor components accessible to users in multiple
55
monikerRange: '>= aspnetcore-3.1'
66
ms.author: riande
77
ms.custom: mvc
8-
ms.date: 04/07/2020
8+
ms.date: 04/14/2020
99
no-loc: [Blazor, SignalR]
1010
uid: blazor/globalization-localization
1111
---
@@ -54,6 +54,10 @@ The following field types have specific formatting requirements and aren't curre
5454

5555
### Blazor WebAssembly
5656

57+
By default, Blazor's linker configuration for Blazor WebAssembly apps strips out internationalization information except for locales explicitly requested. For more information and guidance on controlling the linker's behavior, see <xref:host-and-deploy/blazor/configure-linker#configure-the-linker-for-internationalization>.
58+
59+
<!-- HOLD FOR 3.2 PREVIEW 4: Replace prior paragraph with ...
60+
5761
Blazor WebAssembly apps set the culture using the user's [language preference](https://developer.mozilla.org/docs/Web/API/NavigatorLanguage/languages).
5862
5963
To explicitly configure the culture, set `CultureInfo.DefaultThreadCurrentCulture` and `CultureInfo.DefaultThreadCurrentUICulture` in `Program.Main`.
@@ -62,6 +66,8 @@ By default, Blazor's linker configuration for Blazor WebAssembly apps strips out
6266
6367
While the culture that Blazor selects by default might be sufficient for most users, consider offering a way for users to specify their preferred locale. For a Blazor WebAssembly sample app with a culture picker, see the [LocSample](https://github.com/pranavkm/LocSample) localization sample app.
6468
69+
-->
70+
6571
### Blazor Server
6672

6773
Blazor Server apps are localized using [Localization Middleware](xref:fundamentals/localization#localization-middleware). The middleware selects the appropriate culture for users requesting resources from the app.

aspnetcore/mvc/views/overview.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -266,12 +266,6 @@ public class HomeController : Controller
266266
}
267267
```
268268

269-
In the About view, access the `Title` property as a model property:
270-
271-
```cshtml
272-
<h1>@Model.Title</h1>
273-
```
274-
275269
In the layout, the title is read from the ViewData dictionary:
276270

277271
```cshtml

aspnetcore/security/cors/3.1sample/Cors/WebAPI/Startup.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
4242

4343
app.UseCors(MyAllowSpecificOrigins);
4444

45-
app.UseAuthorization();
4645
app.UseAuthorization();
4746

4847
app.UseEndpoints(endpoints =>

aspnetcore/security/cors/3.1sample/Cors/WebAPI/Startup2.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
5151

5252
app.UseCors(MyAllowSpecificOrigins);
5353

54-
app.UseAuthorization();
5554
app.UseAuthorization();
5655

5756
app.UseEndpoints(endpoints =>

aspnetcore/security/cors/3.1sample/Cors/WebAPI/Startup3.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
5555

5656
app.UseCors();
5757

58-
app.UseAuthorization();
5958
app.UseAuthorization();
6059

6160
app.UseEndpoints(endpoints =>

aspnetcore/security/cors/3.1sample/Cors/WebAPI/StartupAllowSubdomain.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
9898
app.UseCors(policy => policy.WithHeaders(HeaderNames.CacheControl));
9999
#endregion
100100

101-
app.UseAuthorization();
102101
app.UseAuthorization();
103102

104103
app.UseEndpoints(endpoints =>

aspnetcore/security/cors/3.1sample/Cors/WebAPI/StartupDefaultPolicy.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
3838

3939
app.UseCors();
4040

41-
app.UseAuthorization();
4241
app.UseAuthorization();
4342

4443
app.UseEndpoints(endpoints =>

aspnetcore/security/cors/3.1sample/Cors/WebAPI/StartupEndPointBugTest.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
4343

4444
app.UseCors();
4545

46-
app.UseAuthorization();
4746
app.UseAuthorization();
4847

4948
app.UseEndpoints(endpoints =>

aspnetcore/security/cors/3.1sample/Cors/WebAPI/StartupEndPt.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
4242

4343
app.UseCors();
4444

45-
app.UseAuthorization();
4645
app.UseAuthorization();
4746

4847
app.UseEndpoints(endpoints =>

aspnetcore/security/cors/3.1sample/Cors/WebAPI/StartupTest2.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ public void Configure(IApplicationBuilder app)
3535

3636
app.UseCors();
3737

38-
app.UseAuthorization();
3938
app.UseAuthorization();
4039

4140
app.UseEndpoints(endpoints =>

0 commit comments

Comments
 (0)