Skip to content

Commit

Permalink
fixed cultures order
Browse files Browse the repository at this point in the history
  • Loading branch information
pavelbannov committed Dec 12, 2023
1 parent d0c8a81 commit 7b86b3f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
4 changes: 2 additions & 2 deletions web/ASC.Web.Api/Api/Settings/SettingsController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -363,9 +363,9 @@ public async Task<object> SaveUserQuotaSettingsAsync(UserQuotaSettingsRequestsDt
[AllowAnonymous]
[AllowNotPayment]
[HttpGet("cultures")]
public IEnumerable<object> GetSupportedCultures()
public IEnumerable<string> GetSupportedCultures()
{
return _setupInfo.EnabledCultures.Select(r => r.Name).OrderBy(s => s).ToArray();
return _setupInfo.EnabledCultures.Select(r => r.Name).ToList();
}

/// <summary>
Expand Down
1 change: 0 additions & 1 deletion web/ASC.Web.Core/SetupInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,6 @@ public SetupInfo(IConfiguration configuration)
.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries)
.Distinct()
.Select(l => CultureInfo.GetCultureInfo(l.Trim()))
.OrderBy(l => l.DisplayName)
.ToList();

EnabledCulturesPersonal = GetAppSettings("web:cultures:personal", GetAppSettings("web:cultures", "en-US"))
Expand Down

0 comments on commit 7b86b3f

Please sign in to comment.