Diplomarbeit-Absolventenverein/oqtane.framework
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into dev

Browse Source
This commit is contained in:
Leigh Pointer
2025-06-05 17:03:48 +02:00
parent 71be6d4ded 64ce69d1c7
commit a1011ed709
1 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Oqtane.Client/Modules/ModuleBase.cs
View File

@@ -500,10 +500,12 @@ namespace Oqtane.Modules
}; };
} }
// date methods // date conversion methods
public DateTime? UtcToLocal(DateTime? datetime) public DateTime? UtcToLocal(DateTime? datetime)
{ {
TimeZoneInfo timezone = null; TimeZoneInfo timezone = null;
try
{
if (PageState.User != null && !string.IsNullOrEmpty(PageState.User.TimeZoneId)) if (PageState.User != null && !string.IsNullOrEmpty(PageState.User.TimeZoneId))
{ {
timezone = TimeZoneInfo.FindSystemTimeZoneById(PageState.User.TimeZoneId); timezone = TimeZoneInfo.FindSystemTimeZoneById(PageState.User.TimeZoneId);
@@ -512,12 +514,19 @@ namespace Oqtane.Modules
{ {
timezone = TimeZoneInfo.FindSystemTimeZoneById(PageState.Site.TimeZoneId); timezone = TimeZoneInfo.FindSystemTimeZoneById(PageState.Site.TimeZoneId);
} }
}
catch
{
// The time zone ID was not found on the local computer
}
return Utilities.UtcAsLocalDateTime(datetime, timezone); return Utilities.UtcAsLocalDateTime(datetime, timezone);
} }
public DateTime? LocalToUtc(DateTime? datetime) public DateTime? LocalToUtc(DateTime? datetime)
{ {
TimeZoneInfo timezone = null; TimeZoneInfo timezone = null;
try
{
if (PageState.User != null && !string.IsNullOrEmpty(PageState.User.TimeZoneId)) if (PageState.User != null && !string.IsNullOrEmpty(PageState.User.TimeZoneId))
{ {
timezone = TimeZoneInfo.FindSystemTimeZoneById(PageState.User.TimeZoneId); timezone = TimeZoneInfo.FindSystemTimeZoneById(PageState.User.TimeZoneId);
@@ -526,6 +535,11 @@ namespace Oqtane.Modules
{ {
timezone = TimeZoneInfo.FindSystemTimeZoneById(PageState.Site.TimeZoneId); timezone = TimeZoneInfo.FindSystemTimeZoneById(PageState.Site.TimeZoneId);
} }
}
catch
{
// The time zone ID was not found on the local computer
}
return Utilities.LocalDateAndTimeAsUtc(datetime, timezone); return Utilities.LocalDateAndTimeAsUtc(datetime, timezone);
} }