kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix #4733 - remove Name column from Language table and populate value dynamically

Browse Source
This commit is contained in:
sbwalker 2024-10-15 15:58:17 -04:00
parent c31c88ed1f
commit bcf7866fe2
4 changed files with 39 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Oqtane.Client/Modules/Admin/Languages/Add.razor
View File

@ -94,7 +94,6 @@ else
var language = new Language var language = new Language
{ {
SiteId = PageState.Page.SiteId, SiteId = PageState.Page.SiteId,
Name = CultureInfo.GetCultureInfo(_code).DisplayName,
Code = _code, Code = _code,
IsDefault = (_default == null ? false : Boolean.Parse(_default)) IsDefault = (_default == null ? false : Boolean.Parse(_default))
}; };

5
Oqtane.Server/Controllers/LanguageController.cs
View File

@ -55,6 +55,10 @@ namespace Oqtane.Controllers
else else
{ {
languages = _languages.GetLanguages(SiteId).ToList(); languages = _languages.GetLanguages(SiteId).ToList();
foreach (Language language in languages)
{
language.Name = CultureInfo.GetCultureInfo(language.Code).DisplayName;
}
if (!string.IsNullOrEmpty(packagename)) if (!string.IsNullOrEmpty(packagename))
{ {
foreach (var file in Directory.EnumerateFiles(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), $"{packagename}*{Constants.SatelliteAssemblyExtension}", SearchOption.AllDirectories)) foreach (var file in Directory.EnumerateFiles(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), $"{packagename}*{Constants.SatelliteAssemblyExtension}", SearchOption.AllDirectories))
@ -85,6 +89,7 @@ namespace Oqtane.Controllers
var language = _languages.GetLanguage(id); var language = _languages.GetLanguage(id);
if (language != null && language.SiteId == _alias.SiteId) if (language != null && language.SiteId == _alias.SiteId)
{ {
language.Name = CultureInfo.GetCultureInfo(language.Code).DisplayName;
return language; return language;
} }
else else

28
Oqtane.Server/Migrations/Tenant/05020401_RemoveLanguageName.cs Normal file
View File

@ -0,0 +1,28 @@
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Oqtane.Databases.Interfaces;
using Oqtane.Migrations.EntityBuilders;
using Oqtane.Repository;
namespace Oqtane.Migrations.Tenant
{
[DbContext(typeof(TenantDBContext))]
[Migration("Tenant.05.02.04.01")]
public class RemoveLanguageName : MultiDatabaseMigration
{
public RemoveLanguageName(IDatabase database) : base(database)
{
}
protected override void Up(MigrationBuilder migrationBuilder)
{
var languageEntityBuilder = new LanguageEntityBuilder(migrationBuilder, ActiveDatabase);
languageEntityBuilder.DropColumn("Name");
}
protected override void Down(MigrationBuilder migrationBuilder)
{
// not implemented
}
}
}

11
Oqtane.Shared/Models/Language.cs
View File

@ -19,11 +19,6 @@ namespace Oqtane.Models
/// </summary> /// </summary>
public int? SiteId { get; set; } public int? SiteId { get; set; }
/// <summary>
/// Language Name - corresponds to <see cref="Culture.DisplayName"/>, _not_ <see cref="Culture.Name"/>
/// </summary>
public string Name { get; set; }
/// <summary> /// <summary>
/// Language / Culture code, like 'en-US' - corresponds to <see cref="Culture.Name"/> /// Language / Culture code, like 'en-US' - corresponds to <see cref="Culture.Name"/>
/// </summary> /// </summary>
@ -34,6 +29,12 @@ namespace Oqtane.Models
/// </summary> /// </summary>
public bool IsDefault { get; set; } public bool IsDefault { get; set; }
[NotMapped]
/// <summary>
/// Language Name - corresponds to <see cref="Culture.DisplayName"/>, _not_ <see cref="Culture.Name"/>
/// </summary>
public string Name { get; set; }
[NotMapped] [NotMapped]
/// <summary> /// <summary>
/// Version of the satellite assembly /// Version of the satellite assembly