michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-03-20 16:50:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix to use offset rather than zone name https://github.com/virtualmin/virtualmin-gpl/issues/552

Browse Source
This commit is contained in:
iliajie
2023-04-26 11:30:53 +03:00
parent 4b3ef986bf
commit da1ee58a7c
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
web-lib-funcs.pl
View File

@@ -1996,14 +1996,21 @@ if (!$@) {
my $opts = ref($only) ? $only : {};
my $locale_default = &get_default_system_locale();
my $locale_auto = &parse_accepted_language();
my $locale_name = $opts->{'locale'} || $gconfig{'locale_'.$remote_user} || $locale_auto || $gconfig{'locale'} || &get_default_system_locale();
my $locale_name = $opts->{'locale'} || $gconfig{'locale_'.$remote_user} ||
$locale_auto || $gconfig{'locale'} || &get_default_system_locale();
my $tz = $opts->{'tz'};
if (!$tz) {
eval {
$tz = DateTime::TimeZone->new( name => 'local' )->name(); # Asia/Nicosia
$tz =
DateTime::TimeZone->new(name => strftime("%z", localtime()))->name(); # +0200
};
if ($@) {
$tz = DateTime::TimeZone->new( name => 'UTC' )->name(); # UTC
eval {
$tz = DateTime::TimeZone->new(name => 'local')->name(); # Asia/Nicosia
};
if ($@) {
$tz = DateTime::TimeZone->new(name => 'UTC')->name(); # UTC
}
}
}
my $locale = DateTime::Locale->load($locale_name);