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

Put dateformat in the right place and change section name

Browse Source
This commit is contained in:
iliajie
2023-02-03 20:12:59 +02:00
parent df4bff0a58
commit 0f4fe0e64c
6 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
usermin/change_lang.cgi
View File

@ -9,6 +9,7 @@ $access{'lang'} || &error($text{'acl_ecannot'});
&get_usermin_config(\%uconfig);
$uconfig{'lang'} = $in{'lang'};
$uconfig{'acceptlang'} = $in{'acceptlang'};
$uconfig{'dateformat'} = $in{'dateformat'};
&put_usermin_config(\%uconfig);
&unlock_file($usermin_config);
&webmin_log("lang", undef, undef, \%in);

6
usermin/edit_lang.cgi
View File

@ -23,6 +23,12 @@ print &ui_table_row($text{'lang_lang'},
print &ui_table_row($text{'lang_accept'},
&ui_yesno_radio("acceptlang", int($uconfig{'acceptlang'})));
# Old datetime format or a new locale
print &ui_table_row($text{'lang_dateformat'},
&ui_select("dateformat", $uconfig{'dateformat'} || "dd/mon/yyyy",
[ map { [ $_, $text{'lang_dateformat_'.$_} ] }
@webmin::webmin_date_formats ]));
print &ui_table_end();
print &ui_form_end([ [ "", $text{'lang_ok'} ] ]);

4
usermin/lang/en
View File

@ -52,8 +52,8 @@ os_usermin=Operating system according to Usermin
os_iusermin=Internal OS code used by Usermin
os_update=Update Usermin to use detected OS
lang_title=Language
lang_title2=Usermin Language
lang_title=Language and Locale
lang_title2=Usermin Language and Locale
lang_intro=This page allows you to choose which language Usermin will use for displaying titles, prompts and messages
session_title=Authentication

1
webmin/change_lang.cgi
View File

@ -9,6 +9,7 @@ require './webmin-lib.pl';
$gconfig{'lang'} = $in{'lang'};
$gconfig{'langauto'} = int($in{'langauto'});
$gconfig{'acceptlang'} = $in{'acceptlang'};
$gconfig{'dateformat'} = $in{'dateformat'};
$gconfig{'charset'} = 'UTF-8';
&write_file("$config_directory/config", \%gconfig);
&unlock_file("$config_directory/config");

6
webmin/edit_lang.cgi
View File

@ -24,6 +24,12 @@ print &ui_table_row($text{'lang_lang'},
print &ui_table_row($text{'lang_accept'},
&ui_yesno_radio("acceptlang", int($gconfig{'acceptlang'})));
# Old datetime format or a new locale
print &ui_table_row($text{'lang_dateformat'},
&ui_select("dateformat", $gconfig{'dateformat'} || "dd/mon/yyyy",
[ map { [ $_, $text{'lang_dateformat_'.$_} ] }
@webmin_date_formats ]), undef, [ "valign=middle","valign=middle" ]);
print &ui_table_end();
print &ui_form_end([ [ "", $text{'lang_ok'} ] ]);

14
webmin/lang/en
View File

@ -190,11 +190,6 @@ ui_edbwidth=Missing or invalid chooser window width
ui_edbheight=Missing or invalid chooser window height
ui_showlogin=Prepend username to page titles?
ui_showhost=Prepend hostname to page titles?
ui_dateformat=Format for displayed dates
ui_dateformat_dd/mon/yyyy=dd/mon/yyyy (ie. 16/Sep/2001)
ui_dateformat_dd/mm/yyyy=dd/mm/yyyy (ie. 16/09/2001)
ui_dateformat_mm/dd/yyyy=mm/dd/yyyy (ie. 09/16/2001)
ui_dateformat_yyyy/mm/dd=yyyy/mm/dd (ie. 2001/09/16)
ui_ehostnamedisplay=Missing or invalid display hostname
mods_title=Webmin Modules
@ -316,8 +311,8 @@ os_release_notes=Release notes
os_fix=Update Detected Operating System
os_usermin=Also update Usermin OS
lang_title=Language
lang_title2=Webmin Language
lang_title=Language and Locale
lang_title2=Webmin Language and Locale
lang_lang=Display in language
lang_intro=This page allows you to choose which language Webmin will use for displaying titles, prompts and messages
lang_ok=Change Language
@ -327,6 +322,11 @@ lang_chardef=Determined by language
lang_charover=Force character set
lang_err=Failed to save language
lang_echarset=Missing or invalid-looking character set
lang_dateformat=Format for displayed dates
lang_dateformat_dd/mon/yyyy=dd/mon/yyyy (i.e. 16/Sep/2001)
lang_dateformat_dd/mm/yyyy=dd/mm/yyyy (i.e. 16/09/2001)
lang_dateformat_mm/dd/yyyy=mm/dd/yyyy (i.e. 09/16/2001)
lang_dateformat_yyyy/mm/dd=yyyy/mm/dd (i.e. 2001/09/16)
ssl_title=SSL Encryption
ssl_essl=The Net::SSLeay perl module does not appear to be installed on your system. To install the OpenSSL library and Net::SSLeay, follow <a href='$1'>these instructions</a> from the Webmin website.