lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-17 10:04:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

system: timezones conversion for #1256

Browse Source 
Some minor tweaks in the file, e.g. we shouldn't use gettext()
for most tings, don't need translations in config files or for
strings that are hardly translatable (OpenVPN).
This commit is contained in:
Franco Fichtner 2016-11-13 17:16:20 +01:00
parent 408ebbef48
commit 33d1edc8e0
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/etc/inc/plugins.inc.d/if_openvpn.inc
View File

@ -49,12 +49,11 @@ function if_openvpn_services()
foreach ($config['openvpn']["openvpn-{$mode}"] as $setting) {
if (!isset($setting['disable'])) {
$pconfig = array();
/* XXX clean up name print */
$pconfig['description'] = gettext("OpenVPN") . " ".$mode.": ".htmlspecialchars($setting['description']);
$pconfig['description'] = "OpenVPN {$mode}: " . htmlspecialchars($setting['description']);
$pconfig['pidfile'] = "/var/run/openvpn_{$mode}{$setting['vpnid']}.pid";
$pconfig['php']['restart'] = array('openvpn_restart_by_id');
$pconfig['php']['start'] = array('openvpn_restart_by_id');
$pconfig['php']['args'] = array('mode', 'id');
$pconfig['pidfile'] = "/var/run/openvpn_{$mode}{$setting['vpnid']}.pid";
$pconfig['id'] = $setting['vpnid'];
$pconfig['name'] = 'openvpn';
$pconfig['mode'] = $mode;

18
src/etc/inc/system.inc
View File

@ -769,7 +769,6 @@ function system_syslogd_start($verbose = false)
{
global $config, $g;
/* XXX temporary hook for newsyslog.conf regeneration */
configd_run('template reload OPNsense/Syslog');
mwexec('/etc/rc.d/hostid start');
@ -991,7 +990,7 @@ function system_webgui_configure()
log_error("Creating SSL Certificate for this host");
$cert = array();
$cert['refid'] = uniqid();
$cert['descr'] = gettext("webConfigurator default");
$cert['descr'] = 'webConfigurator default';
mwexec(
/* XXX ought to be replaced by PHP calls */
'/usr/local/bin/openssl req -new ' .
@ -1306,7 +1305,7 @@ EOD;
fclose($fd);
}
$lighty_config .= "\n";
$lighty_config .= "## " . gettext("ssl configuration") . "\n";
$lighty_config .= "## ssl configuration\n";
$lighty_config .= "ssl.engine = \"enable\"\n";
$lighty_config .= "ssl.pemfile = \"/var/etc/{$cert_location}\"\n\n";
@ -1387,14 +1386,15 @@ function system_firmware_configure()
}
}
function system_timezone_configure()
function system_timezone_configure($verbose = false)
{
global $config;
$syscfg = $config['system'];
if (file_exists("/var/run/booting")) {
echo gettext("Setting timezone...");
if ($verbose) {
echo 'Setting timezone...';
flush();
}
/* extract appropriate timezone file */
@ -1410,8 +1410,8 @@ function system_timezone_configure()
/* apply timezone */
copy(sprintf('/usr/share/zoneinfo/%s', $timezone), '/etc/localtime');
if (file_exists("/var/run/booting")) {
echo gettext("done.") . "\n";
if ($verbose) {
echo "done.\n";
}
}
@ -1837,7 +1837,7 @@ function get_possible_traffic_source_addresses($include_ipv6_link_local=false) {
if (!isset($setting['disable'])) {
$vpn = array();
$vpn['value'] = 'ovpn' . substr($mode, 0, 1) . $setting['vpnid'];
$vpn['name'] = gettext("OpenVPN") . " ".$mode.": ".htmlspecialchars($setting['description']);
$vpn['name'] = "OpenVPN {$mode}: " . htmlspecialchars($setting['description']);
$sourceips[] = $vpn;
}
}

2
src/etc/rc.bootup
View File

@ -119,7 +119,7 @@ system_setup_sysctl();
echo "done.\n";
/* set up our timezone */
system_timezone_configure();
system_timezone_configure(true);
/* set up firmware configuration */
system_firmware_configure();