From 58c8c501eb12b224ac821d2157391e6a897aee96 Mon Sep 17 00:00:00 2001 From: ivarlovlie Date: Mon, 5 Dec 2022 16:02:46 +0900 Subject: fix: Resource files is now read correctly --- code/api/src/Program.cs | 14 ++++++++------ code/api/src/Resources/SharedResources.cs | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) (limited to 'code/api/src') diff --git a/code/api/src/Program.cs b/code/api/src/Program.cs index 4b04bf4..c372e7e 100644 --- a/code/api/src/Program.cs +++ b/code/api/src/Program.cs @@ -30,11 +30,13 @@ global using Microsoft.Extensions.DependencyInjection; global using Microsoft.Extensions.Hosting; global using Microsoft.Extensions.Logging; global using Serilog; +global using Quartz; +global using IOL.GreatOffice.Api.Resources; using IOL.GreatOffice.Api.Endpoints.V1; using IOL.GreatOffice.Api.Jobs; using Microsoft.AspNetCore.HttpOverrides; +using Microsoft.AspNetCore.Localization; using Microsoft.AspNetCore.Mvc.Versioning; -using Quartz; using Serilog.Events; namespace IOL.GreatOffice.Api; @@ -72,7 +74,7 @@ public static class Program new JsonSerializerOptions() { WriteIndented = true })); - + builder.Host.UseSerilog(Log.Logger); builder.WebHost.ConfigureKestrel(kestrel => { kestrel.AddServerHeader = false; }); @@ -84,7 +86,7 @@ public static class Program builder.Services.Configure(options => { options.ForwardedHeaders = ForwardedHeaders.XForwardedProto; }); } - builder.Services.AddLocalization(options => { options.ResourcesPath = "Resources"; }); + builder.Services.AddLocalization(); builder.Services.AddRequestLocalization(options => { var supportedCultures = new[] {"en", "nb"}; options.SetDefaultCulture(supportedCultures[0]) @@ -120,7 +122,7 @@ public static class Program options.DefaultChallengeScheme = CookieAuthenticationDefaults.AuthenticationScheme; }) .AddCookie(options => { - options.Cookie.Name = "go_session"; + options.Cookie.Name = AppCookies.Session; options.Cookie.Domain = builder.Environment.IsDevelopment() ? "localhost" : ".greatoffice.life"; options.Cookie.HttpOnly = true; options.Cookie.IsEssential = true; @@ -180,13 +182,13 @@ public static class Program } }); }); - + builder.Services.AddPagination(options => { options.DefaultSize = 50; options.MaxSize = 100; options.CanChangeSizeFromQuery = true; }); - + builder.Services .AddControllers() .AddDataAnnotationsLocalization() diff --git a/code/api/src/Resources/SharedResources.cs b/code/api/src/Resources/SharedResources.cs index 4b8ec2f..f98895b 100644 --- a/code/api/src/Resources/SharedResources.cs +++ b/code/api/src/Resources/SharedResources.cs @@ -1,4 +1,4 @@ -namespace IOL.GreatOffice.Api; +namespace IOL.GreatOffice.Api.Resources; public class SharedResources { } \ No newline at end of file -- cgit v1.3