VladPolskiy/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2025-08-16 14:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix to combine evals into a single statement

Browse Source
This commit is contained in:
iliajie
2023-02-04 12:49:13 +02:00
parent 37e91698a9
commit 21a9df8cc7
3 changed files with 100 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
usermin/edit_lang.cgi
View File

@ -21,21 +21,15 @@ print &ui_table_row($text{'lang_lang'},
# Old datetime format or a new locale
my $locale;
eval "use DateTime::Locale";
eval "use DateTime; use DateTime::Locale; use DateTime::TimeZone;";
if (!$@) {
eval "use DateTime::TimeZone";
if (!$@) {
eval "use DateTime";
if (!$@) {
$locale++;
my $locales = &webmin::list_locales();
my %localesrev = reverse %{$locales};
print &ui_table_row($text{'lang_locale'},
&ui_select("locale", $uconfig{'locale'} || "en-US",
[ map { [ $localesrev{$_}, $_ ] } sort values %{$locales} ]).
&ui_hidden("dateformat", $uconfig{'dateformat'}));
}
}
$locale++;
my $locales = &webmin::list_locales();
my %localesrev = reverse %{$locales};
print &ui_table_row($text{'lang_locale'},
&ui_select("locale", $uconfig{'locale'} || "en-US",
[ map { [ $localesrev{$_}, $_ ] } sort values %{$locales} ]).
&ui_hidden("dateformat", $uconfig{'dateformat'}));
}
if (!$locale) {