Browse Source
Filter IANA timezones to exclude 'Etc' entries while allowing 'UTC'
pull/22236/head
maliming
2 years ago
No known key found for this signature in database
GPG Key ID: A646B9CB645ECEA4
1 changed files with
1 additions and
1 deletions
-
framework/src/Volo.Abp.Timing/Volo/Abp/Timing/TZConvertTimezoneProvider.cs
|
|
@ -15,7 +15,7 @@ public class TZConvertTimezoneProvider : ITimezoneProvider, ITransientDependency |
|
|
|
|
|
|
|
|
public virtual List<NameValue> GetIanaTimezones() |
|
|
public virtual List<NameValue> GetIanaTimezones() |
|
|
{ |
|
|
{ |
|
|
return TZConvert.KnownIanaTimeZoneNames.OrderBy(x => x).Where(x => x.Contains("/")).Select(x => new NameValue(x, x)).ToList(); |
|
|
return TZConvert.KnownIanaTimeZoneNames.OrderBy(x => x).Where(x => x.Contains("/") && !x.Contains("Etc") || x == "UTC").Select(x => new NameValue(x, x)).ToList(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
public virtual string WindowsToIana(string windowsTimeZoneId) |
|
|
public virtual string WindowsToIana(string windowsTimeZoneId) |
|
|
|
