Removed usage of Site.Culture. Fixes #1845

PiranhaCMS · Apr 5, 2022 · 88133ab · 88133ab
1 parent 8dd2928
commit 88133ab
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/core/Piranha.AspNetCore/Http/RoutingMiddleware.cs b/core/Piranha.AspNetCore/Http/RoutingMiddleware.cs
@@ -108,9 +108,13 @@ public override async Task Invoke(HttpContext context, IApi api, IApplicationSer
 
                 if (site != null)
                 {
+                    // Get the selected language
+                    var language = await api.Languages.GetByIdAsync(site.LanguageId)
+                        .ConfigureAwait(false);
+
                     // Update application service
                     service.Site.Id = site.Id;
-                    service.Site.Culture = site.Culture;
+                    service.Site.Culture = language?.Culture;
                     service.Site.Sitemap = await api.Sites.GetSitemapAsync(site.Id);
 
                     // Set preferred hostname & prefix
@@ -130,7 +134,7 @@ public override async Task Invoke(HttpContext context, IApi api, IApplicationSer
                     }
 
                     // Set current culture if specified in site
-                    if (!string.IsNullOrEmpty(site.Culture))
+                    if (!string.IsNullOrEmpty(service.Site.Culture))
                     {
                         var cultureInfo = new CultureInfo(service.Site.Culture);
                         CultureInfo.CurrentCulture = CultureInfo.CurrentUICulture = cultureInfo;

diff --git a/core/Piranha.AspNetCore/Services/ApplicationService.cs b/core/Piranha.AspNetCore/Services/ApplicationService.cs
@@ -122,9 +122,11 @@ public async Task InitAsync(HttpContext context)
                 // Store the current site id & get the sitemap
                 if (site != null)
                 {
+                    var language = await Api.Languages.GetByIdAsync(site.LanguageId);
+
                     Site.Id = site.Id;
                     Site.LanguageId = site.LanguageId;
-                    Site.Culture = site.Culture;
+                    Site.Culture = language?.Culture;
                     Site.Sitemap = await Api.Sites.GetSitemapAsync(Site.Id);
 
                     var siteHost = GetFirstHost(site);

diff --git a/core/Piranha.Manager/Services/SiteService.cs b/core/Piranha.Manager/Services/SiteService.cs
@@ -113,7 +113,6 @@ public async Task Save(SiteEditModel model)
             site.LanguageId = model.LanguageId;
             site.Title = model.Title;
             site.InternalId = model.InternalId;
-            site.Culture = model.Culture;
             site.Hostnames = model.Hostnames;
             site.Description = model.Description;
             site.Logo = model.Logo;
@@ -224,7 +223,6 @@ private SiteEditModel Transform(Site site)
                 LanguageId = site.LanguageId,
                 Title = site.Title,
                 InternalId = site.InternalId,
-                Culture = site.Culture,
                 Description = site.Description,
                 Logo = site.Logo,
                 Hostnames = site.Hostnames,

diff --git a/core/Piranha/Models/Site.cs b/core/Piranha/Models/Site.cs
@@ -72,6 +72,7 @@ public sealed class Site
         /// Gets/sets the optional culture for the site.
         /// </summary>
         [StringLength(6)]
+        [Obsolete("Please refer to the culture of the selected language of the site", true)]
         public string Culture { get; set; }
 
         /// <summary>

diff --git a/data/Piranha.Data.EF/Repositories/SiteRepository.cs b/data/Piranha.Data.EF/Repositories/SiteRepository.cs
@@ -71,7 +71,6 @@ public SiteRepository(IDb db, IContentServiceFactory factory)
                     Logo = site.LogoId.HasValue ? site.LogoId.Value : new ImageField(),
                     Hostnames = site.Hostnames,
                     IsDefault = site.IsDefault,
-                    Culture = site.Culture,
                     ContentLastModified = site.ContentLastModified,
                     Created = site.Created,
                     LastModified = site.LastModified
@@ -111,7 +110,6 @@ public SiteRepository(IDb db, IContentServiceFactory factory)
                     Logo = site.LogoId.HasValue ? site.LogoId.Value : new ImageField(),
                     Hostnames = site.Hostnames,
                     IsDefault = site.IsDefault,
-                    Culture = site.Culture,
                     ContentLastModified = site.ContentLastModified,
                     Created = site.Created,
                     LastModified = site.LastModified
@@ -151,7 +149,6 @@ public SiteRepository(IDb db, IContentServiceFactory factory)
                     Logo = site.LogoId.HasValue ? site.LogoId.Value : new ImageField(),
                     Hostnames = site.Hostnames,
                     IsDefault = site.IsDefault,
-                    Culture = site.Culture,
                     ContentLastModified = site.ContentLastModified,
                     Created = site.Created,
                     LastModified = site.LastModified
@@ -190,7 +187,6 @@ public SiteRepository(IDb db, IContentServiceFactory factory)
                     Logo = site.LogoId.HasValue ? site.LogoId.Value : new ImageField(),
                     Hostnames = site.Hostnames,
                     IsDefault = site.IsDefault,
-                    Culture = site.Culture,
                     ContentLastModified = site.ContentLastModified,
                     Created = site.Created,
                     LastModified = site.LastModified
@@ -293,7 +289,6 @@ public async Task Save(Models.Site model)
             site.Description = model.Description;
             site.LogoId = model.Logo?.Id;
             site.Hostnames = model.Hostnames;
-            site.Culture = model.Culture;
             site.IsDefault = model.IsDefault;
             site.ContentLastModified = model.ContentLastModified;
             site.LastModified = DateTime.Now;