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

Merge pull request #93 from oqtane/dev

Browse Source 
sync
This commit is contained in:
Shaun Walker 2021-04-23 16:10:06 -04:00 committed by GitHub
commit ffafe5d14c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,6 +61,10 @@ else
{ {
AddModuleMessage(Localizer["The Only Supported Culture That Has Been Defined Is English"], MessageType.Warning); AddModuleMessage(Localizer["The Only Supported Culture That Has Been Defined Is English"], MessageType.Warning);
} }
else
{
_supportedCultures = _supportedCultures.Where(c => !c.Name.Equals(Constants.DefaultCulture));
}
} }
private async Task SaveLanguage() private async Task SaveLanguage()

4
Oqtane.Client/Themes/Controls/Theme/LanguageSwitcher.razor
View File

@ -27,6 +27,10 @@
protected override async Task OnParametersSetAsync() protected override async Task OnParametersSetAsync()
{ {
var languages = await LanguageService.GetLanguagesAsync(PageState.Site.SiteId); var languages = await LanguageService.GetLanguagesAsync(PageState.Site.SiteId);
var defaultCulture = CultureInfo.GetCultureInfo(Constants.DefaultCulture);
languages.Add(new Language { Code = defaultCulture.Name, Name = defaultCulture.DisplayName });
_supportedCultures = languages.Select(l => new Culture { Name = l.Code, DisplayName = l.Name }); _supportedCultures = languages.Select(l => new Culture { Name = l.Code, DisplayName = l.Name });
} }

4
Oqtane.Server/Repository/AliasRepository.cs
View File

@ -65,8 +65,8 @@ namespace Oqtane.Repository
break; // found a matching alias break; // found a matching alias
} }
} }
// return fallback alias
return alias; return alias ?? aliases.Find(item => item.Name.Equals("*"));
} }
public void DeleteAlias(int aliasId) public void DeleteAlias(int aliasId)

3
Oqtane.Server/appsettings.json
View File

@ -16,7 +16,6 @@
"DefaultContainer": "" "DefaultContainer": ""
}, },
"Localization": { "Localization": {
"DefaultCulture": "", "DefaultCulture": "en"
"SupportedCultures": []
} }
} }

2
Oqtane.Shared/Shared/Constants.cs
View File

@ -71,6 +71,6 @@ namespace Oqtane.Shared {
public static readonly string SatelliteAssemblyExtension = ".resources.dll"; public static readonly string SatelliteAssemblyExtension = ".resources.dll";
public static readonly string DefaultCulture = CultureInfo.InstalledUICulture.Name; public static readonly string DefaultCulture = "en";
} }
} }