Skip to content

Commit b2ce582

Browse files
committed
Use new localization style in the templates.
1 parent d035ad1 commit b2ce582

File tree

2 files changed

+11
-34
lines changed

2 files changed

+11
-34
lines changed

templates/module/app/MyCompanyName.MyProjectName.DemoApp/DemoAppModule.cs

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
1-
using System.Collections.Generic;
2-
using System.Globalization;
3-
using System.IO;
1+
using System.IO;
42
using System.Linq;
53
using Microsoft.AspNetCore.Builder;
64
using Microsoft.AspNetCore.Hosting;
7-
using Microsoft.AspNetCore.Localization;
85
using Microsoft.Extensions.Configuration;
96
using Microsoft.Extensions.DependencyInjection;
10-
using Microsoft.Extensions.Options;
117
using MyCompanyName.MyProjectName.EntityFrameworkCore;
128
using Swashbuckle.AspNetCore.Swagger;
139
using Volo.Abp;
@@ -22,6 +18,7 @@
2218
using Volo.Abp.Identity;
2319
using Volo.Abp.Identity.EntityFrameworkCore;
2420
using Volo.Abp.Identity.Web;
21+
using Volo.Abp.Localization;
2522
using Volo.Abp.Modularity;
2623
using Volo.Abp.PermissionManagement.EntityFrameworkCore;
2724
using Volo.Abp.SettingManagement.EntityFrameworkCore;
@@ -81,17 +78,10 @@ public override void ConfigureServices(ServiceConfigurationContext context)
8178
options.DocInclusionPredicate((docName, description) => true);
8279
});
8380

84-
var cultures = new List<CultureInfo>
81+
context.Services.Configure<AbpLocalizationOptions>(options =>
8582
{
86-
new CultureInfo("en")
87-
//Add other languages...
88-
};
89-
90-
context.Services.Configure<RequestLocalizationOptions>(options =>
91-
{
92-
options.DefaultRequestCulture = new RequestCulture("en");
93-
options.SupportedCultures = cultures;
94-
options.SupportedUICultures = cultures;
83+
options.Languages.Add(new LanguageInfo("en", "en", "English"));
84+
//...add other languages
9585
});
9686

9787
context.Services.AddAssemblyOf<DemoAppModule>();
@@ -110,7 +100,6 @@ public override void OnApplicationInitialization(ApplicationInitializationContex
110100
app.UseErrorPage();
111101
}
112102

113-
app.UseStaticFiles();
114103
app.UseVirtualFiles();
115104

116105
app.UseSwagger();
@@ -120,9 +109,7 @@ public override void OnApplicationInitialization(ApplicationInitializationContex
120109
});
121110

122111
app.UseAuthentication();
123-
124-
app.UseRequestLocalization(app.ApplicationServices.GetRequiredService<IOptions<RequestLocalizationOptions>>().Value);
125-
112+
app.UseAbpRequestLocalization();
126113
app.UseAuditing();
127114

128115
app.UseMvc(routes =>

templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
1-
using System.Collections.Generic;
2-
using System.Globalization;
3-
using System.IO;
1+
using System.IO;
42
using Localization.Resources.AbpUi;
53
using Microsoft.AspNetCore.Builder;
64
using Microsoft.AspNetCore.Hosting;
7-
using Microsoft.AspNetCore.Localization;
85
using Microsoft.Extensions.Configuration;
96
using Microsoft.Extensions.DependencyInjection;
10-
using Microsoft.Extensions.Options;
117
using MyCompanyName.MyProjectName.EntityFrameworkCore;
128
using MyCompanyName.MyProjectName.Localization.MyProjectName;
139
using MyCompanyName.MyProjectName.Menus;
@@ -122,14 +118,6 @@ private static void ConfigureVirtualFileSystem(IServiceCollection services, IHos
122118

123119
private static void ConfigureLocalizationServices(IServiceCollection services)
124120
{
125-
var cultures = new List<CultureInfo> {new CultureInfo("en"), new CultureInfo("tr")};
126-
services.Configure<RequestLocalizationOptions>(options =>
127-
{
128-
options.DefaultRequestCulture = new RequestCulture("en");
129-
options.SupportedCultures = cultures;
130-
options.SupportedUICultures = cultures;
131-
});
132-
133121
services.Configure<AbpLocalizationOptions>(options =>
134122
{
135123
options.Resources
@@ -138,6 +126,9 @@ private static void ConfigureLocalizationServices(IServiceCollection services)
138126
typeof(AbpValidationResource),
139127
typeof(AbpUiResource)
140128
);
129+
130+
options.Languages.Add(new LanguageInfo("en", "en", "English"));
131+
options.Languages.Add(new LanguageInfo("tr", "tr", "Türkçe"));
141132
});
142133
}
143134

@@ -183,8 +174,7 @@ public override void OnApplicationInitialization(ApplicationInitializationContex
183174

184175
app.UseVirtualFiles();
185176
app.UseAuthentication();
186-
187-
app.UseRequestLocalization(app.ApplicationServices.GetRequiredService<IOptions<RequestLocalizationOptions>>().Value);
177+
app.UseAbpRequestLocalization();
188178

189179
app.UseSwagger();
190180
app.UseSwaggerUI(options =>

0 commit comments

Comments
 (0)