smeserver/smeserver-manager
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Sun Jun 15 2025 Brian Read <brianr@koozali.org> 11.0.0-92.sme

Browse Source 
- rework datetime panel [SME: 13020]
- Fix errors in error messages for local networks panel [SME: 13044]
- Add in Config Db open in Proxy.pm needed after  UTF8 change [SME: 13046]
This commit is contained in:
Brian Read
2025-06-18 11:17:51 +01:00
parent 0733537064
commit d1f2013375
11 changed files with 850 additions and 490 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Datetime/datetime_en.lex
View File

@@ -18,7 +18,7 @@ manually set the date and time for your time zone.',
'dat_DECEMBER' => 'December',
'dat_NEW_M/D/Y' => 'New month/day/year:',
'dat_NEW_H/M/S' => 'New hour/min/sec:',
'dat_AM/PM_AND_TZ' => 'AM/PM and time zone:',
'dat_TZ' => 'Time zone:',
'dat_NTP_ENABLE_DESC' => 'The server can periodically synchronize the system clock to a network time protocol (NTP) server. If you select this option, enter the hostname or IP address of the NTP server below.',
'dat_NTP_CONFIGURE_DESC' => 'The server is periodically synchronizing the system clock to the network time protocol (NTP) server specified below. To synchronize to a different NTP server, enter a different hostname or IP address in the field below.',
'dat_NTP_DISABLE_DESC' => 'Choose this option to stop syncronizing the system clock to the NTP
@@ -38,9 +38,7 @@ server.When the NTP service is disabled, you can set the system date and time ma
'dat_INVALID_SECOND' => 'Error: invalid second',
'dat_MONTH_BETWEEN_1_AND_12' => 'Please choose a month value between 1 and 12.',
'dat_INVALID_MONTH' => 'Error: invalid month',
'dat_UPDATING_CLOCK' => 'System clock is being updated. Please wait for a few seconds,
then click <A HREF="datetime?page=1&wherenext=Verify" TARGET="main">here</A>
to verify changes.',
'dat_UPDATING_CLOCK' => 'System clock is being updated',
'dat_ERR_SETTING_CLOCK' => 'Error occurred while setting system time and hardware clock.',
'dat_SERVER_DISABLED' => 'Network time server disabled successfully',
'dat_SERVER_DISABLED_DESC' => 'You have disabled this service: The server will rely on its internal
@@ -57,3 +55,7 @@ clock, and <b>will not</b> try to synchronize from a time server.',
'dat_NTP_DISABLE_TITLE' => 'Disable Network Time Server',
'dat_CURRENT_SETTING' => 'Current setting',
'Date and time' => 'Date and time',
'dat_ntp_server' => 'NTP server',
'dat_manually_set' => 'Set manually',
'dat_NTP_Server_URL' =>'NTP Server URL:',
'dat_set_manually' =>'Set Date and Time:',

12
root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Localnetworks/localnetworks_en.lex
View File

@@ -12,13 +12,13 @@
'ln_REMOVE_CONFIRM' => 'Are you sure you wish to remove this network?',
'ln_DEFAULT' => 'default',
'ln_NUMBER_OF_HOSTS' => 'Number of hosts',
'ln_NOT_ACCESSIBLE_FROM_LOCAL_NETWORK' => 'Error: router address {$networkRouter} is not accessible from local network. Did not add network.',
'ln_NOT_ACCESSIBLE_FROM_LOCAL_NETWORK' => 'Error: router address [_3] is not accessible from local network. Did not add network.',
'ln_LOCALNETWORK_ADD'=>'Add network',
'ln_NETWORK_ALREADY_LOCAL' => ' Error: network {$network} (derived from network {$networkAddress} and subnet mask {$networkMask}) is already considered local. Did not add new network. ',
'ln_NETWORK_ALREADY_ADDED' => 'Error: network {$network} (derived from network {$networkAddress} and subnet mask {$networkMask}) has already been added. Did not add new network.',
'ln_NETWORK_ALREADY_LOCAL' => ' Error: network [_1] (derived from network [_1] and subnet mask [_2]) is already considered local. Did not add new network. ',
'ln_NETWORK_ALREADY_ADDED' => 'Error: network [_1] (derived from network [_1] and subnet mask [_2]) has already been added. Did not add new network.',
'ln_ERROR_CREATING_NETWORK' => 'Error occurred while creating network.',
'ln_SUCCESS' =>'Successfully added network [_1]/[_2] via router [_3].',
'ln_SUCCESS_SINGLE_ADDRESS' =>'Successfully added network {$network}/{$networkMask} via router {$networkRouter}. Your server will grant local access privileges to the single IP address {$network}. ',
'ln_SUCCESS_SINGLE_ADDRESS' =>'Successfully added network [_1]/[_2] via router [_3]. Your server will grant local access privileges to the single IP address [_1]. ',
'ln_SUCCESS_NETWORK_RANGE' =>'Successfully added network [_1]/[_2] via router [_3]. Your server will grant local access privileges to [_4] IP addresses in the range [_5] to [_6]. ',
'ln_NO_SUCH_NETWORK' =>'Network not found in network db',
'ln_SUCCESS_REMOVED_NETWORK' =>'Successfully removed network [_1]/[_2] via router [_3].',
@@ -26,5 +26,5 @@
'ln_NO_ADDITIONAL_NETWORKS' => 'No additional networks',
'ln_REMOVE_HOSTS_DESC' => 'Local hosts configured on the network you are about to remove have been detected. By default, they will also be removed. Uncheck this box if, for some reason, you do not wish this to happen. Note that they will not be treated as local, and may not even be reachable, after this network is removed. ',
'ln_REMOVE_HOSTS_LABEL' => 'Remove hosts on network',
'ln_extra' => '{$network}/{$networkMask} via router $networkRouter}.',
'ln_SUCCESS_NONSTANDARD_RANGE' =>'<p>Successfully added network [_1]/[_2] via router [_3].</p><p> Your server will grant local access privileges to [_4] IP addresses in the range [_5] to [_6].</p><p> Warning: the ProFTPd FTP server cannot handle this nonstandard subnet mask. The simpler specification <b>[_7]</b> will be used instead.</p>',
'ln_extra' => '[_1]/[_2] via router $networkRouter}.',
'ln_SUCCESS_NONSTANDARD_RANGE' =>'<p>Successfully added network [_1]/[_2] via router [_3].</p><p> Your server will grant local access privileges to [_4] IP addresses in the range [_5] to [_6].</p><p> Warning: the ProFTPd FTP server cannot handle this nonstandard subnet mask. The simpler specification <b>[_7]</b> will be used instead.</p>',