From 7d1b238c1910966e144ff17e211f3fecbdfd3485 Mon Sep 17 00:00:00 2001 From: Carlos Eduardo Ramos Date: Mon, 16 Aug 2010 18:25:08 -0300 Subject: Implement gettext() calls on pfsense-utils.inc --- etc/inc/pfsense-utils.inc | 62 +++++++++++++++++++++++------------------------ 1 file changed, 31 insertions(+), 31 deletions(-) (limited to 'etc/inc/pfsense-utils.inc') diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc index fa7da13..89eac5b 100644 --- a/etc/inc/pfsense-utils.inc +++ b/etc/inc/pfsense-utils.inc @@ -433,11 +433,11 @@ function get_carp_interface_status($carpinterface) { $carp_query = split("\n", `/sbin/ifconfig $carpinterface | grep carp`); foreach($carp_query as $int) { if(stristr($int, "MASTER")) - return "MASTER"; + return gettext("MASTER"); if(stristr($int, "BACKUP")) - return "BACKUP"; + return gettext("BACKUP"); if(stristr($int, "INIT")) - return "INIT"; + return gettext("INIT"); } return; } @@ -466,7 +466,7 @@ function add_rule_to_anchor($anchor, $rule, $label) { function remove_text_from_file($file, $text) { global $fd_log; if($fd_log) - fwrite($fd_log, "Adding needed text items:\n"); + fwrite($fd_log, sprintf(gettext("Adding needed text items:%s"), "\n")); $filecontents = file_get_contents($file); $textTMP = str_replace($text, "", $filecontents); $text = $textTMP; @@ -515,7 +515,7 @@ function after_sync_bump_adv_skew() { } } if($processed_skew == 1) - write_config("After synch increase advertising skew"); + write_config(gettext("After synch increase advertising skew")); } /* @@ -560,16 +560,16 @@ function WakeOnLan($addr, $mac) // send it to the broadcast address using UDP $s = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP); if ($s == false) { - log_error("Error creating socket!"); - log_error("Error code is '".socket_last_error($s)."' - " . socket_strerror(socket_last_error($s))); + log_error(gettext("Error creating socket!")); + log_error(sprintf(gettext("Error code is '%s' - %s"), socket_last_error($s), socket_strerror(socket_last_error($s)))); } else { // setting a broadcast option to socket: $opt_ret = socket_set_option($s, 1, 6, TRUE); if($opt_ret < 0) - log_error("setsockopt() failed, error: " . strerror($opt_ret)); + log_error(sprintf(gettext("setsockopt() failed, error: %s"), strerror($opt_ret))); $e = socket_sendto($s, $msg, strlen($msg), 0, $addr, 2050); socket_close($s); - log_error("Magic Packet sent ({$e}) to {$addr} MAC={$mac}"); + log_error(sprintf(gettext("Magic Packet sent (%s) to {%s} MAC=%s"), $e, $addr, $mac)); return true; } @@ -646,7 +646,7 @@ function restore_config_section($section, $new_contents) { @unlink($g['tmp_path'] . "/tmpxml"); if(file_exists("{$g['tmp_path']}/config.cache")) unlink("{$g['tmp_path']}/config.cache"); - write_config("Restored {$section} of config file (maybe from CARP partner)"); + write_config(sprintf(gettext("Restored %s of config file (maybe from CARP partner)"), $section)); conf_mount_ro(); return; } @@ -667,7 +667,7 @@ function merge_config_section($section, $new_contents) { $section_xml = parse_xml_config($fname, $section); $config[$section] = $section_xml; unlink($fname); - write_config("Restored {$section} of config file (maybe from CARP partner)"); + write_config(sprintf(gettext("Restored %s of config file (maybe from CARP partner)"), $section)); conf_mount_ro(); return; } @@ -812,10 +812,10 @@ function call_pfsense_method($method, $params, $timeout = 0) { } $resp = $cli->send($msg, $timeout); if(!$resp) { - log_error("XMLRPC communication error: " . $cli->errstr); + log_error(sprintf(gettext("XMLRPC communication error: %s"), $cli->errstr)); return false; } elseif($resp->faultCode()) { - log_error("XMLRPC request failed with error " . $resp->faultCode() . ": " . $resp->faultString()); + log_error(sprintf(gettext("XMLRPC request failed with error %s: %s"), $resp->faultCode(), $resp->faultString())); return false; } else { return XML_RPC_Decode($resp->value()); @@ -890,13 +890,13 @@ function reload_interfaces_sync() { /* XXX: Use locks?! */ if (file_exists("{$g['tmp_path']}/reloading_all")) { - log_error("WARNING: Recursive call to interfaces sync!"); + log_error(gettext("WARNING: Recursive call to interfaces sync!")); return; } touch("{$g['tmp_path']}/reloading_all"); if($g['debug']) - log_error("reload_interfaces_sync() is starting."); + log_error(gettext("reload_interfaces_sync() is starting.")); /* parse config.xml again */ $config = parse_config(true); @@ -904,17 +904,17 @@ function reload_interfaces_sync() { /* enable routing */ system_routing_enable(); if($g['debug']) - log_error("Enabling system routing"); + log_error(gettext("Enabling system routing")); if($g['debug']) - log_error("Cleaning up Interfaces"); + log_error(gettext("Cleaning up Interfaces")); /* set up interfaces */ interfaces_configure(); /* remove reloading_all trigger */ if($g['debug']) - log_error("Removing {$g['tmp_path']}/reloading_all"); + log_error(sprintf(gettext("Removing %s/reloading_all"), $g['tmp_path'])); /* start devd back up */ mwexec("/bin/rm {$g['tmp_path']}/reload*"); @@ -961,7 +961,7 @@ function reload_all_sync() { /* XXX: Use locks?! */ if (file_exists("{$g['tmp_path']}/reloading_all")) { - log_error("WARNING: Recursive call to reload all sync!"); + log_error(gettext("WARNING: Recursive call to reload all sync!")); return; } touch("{$g['tmp_path']}/reloading_all"); @@ -1031,7 +1031,7 @@ function auto_login() { } if (!$fd) { conf_mount_ro(); - log_error("Enabling auto login was not possible."); + log_error(gettext("Enabling auto login was not possible.")); return; } foreach($getty_split as $gs) { @@ -1179,7 +1179,7 @@ function get_ppp_uptime($port){ } return convert_seconds_to_hms($sec); } else { - $total_time = "No history data found!"; + $total_time = gettext("No history data found!"); return $total_time; } } @@ -1287,7 +1287,7 @@ function get_interface_info($ifdescr) { break; if (!file_exists($dev)) { $ifinfo['nodevice'] = 1; - $ifinfo['pppinfo'] = $dev . " device not present! Is the modem attached to the system?"; + $ifinfo['pppinfo'] = $dev . " " . gettext("device not present! Is the modem attached to the system?"); } // Calculate cumulative uptime for PPP link. Useful for connections that have per minute/hour contracts so you don't go over! if (isset($ppp['uptime'])) @@ -1327,8 +1327,8 @@ function get_interface_info($ifdescr) { if (preg_match("/status: (.*)$/", $ici, $matches)) { if ($matches[1] != "active") $ifinfo['status'] = $matches[1]; - if($ifinfo['status'] == "running") - $ifinfo['status'] = "up"; + if($ifinfo['status'] == gettext("running")) + $ifinfo['status'] = gettext("up"); } if (preg_match("/channel (\S*)/", $ici, $matches)) { $ifinfo['channel'] = $matches[1]; @@ -1363,13 +1363,13 @@ function get_interface_info($ifdescr) { if($bridge) { $bridge_text = `/sbin/ifconfig {$bridge}`; if(stristr($bridge_text, "blocking") <> false) { - $ifinfo['bridge'] = "blocking - check for ethernet loops"; + $ifinfo['bridge'] = "" . gettext("blocking") . " - " . gettext("check for ethernet loops"); $ifinfo['bridgeint'] = $bridge; } else if(stristr($bridge_text, "learning") <> false) { - $ifinfo['bridge'] = "learning"; + $ifinfo['bridge'] = gettext("learning"); $ifinfo['bridgeint'] = $bridge; } else if(stristr($bridge_text, "forwarding") <> false) { - $ifinfo['bridge'] = "forwarding"; + $ifinfo['bridge'] = gettext("forwarding"); $ifinfo['bridgeint'] = $bridge; } } @@ -1480,7 +1480,7 @@ function compare_hostname_to_dnscache($hostname) { if(trim($oldcontents) != trim($contents)) { if($g['debug']) { - log_error("DNSCACHE: Found old IP {$oldcontents} and new IP {$contents}"); + log_error(sprintf(gettext("DNSCACHE: Found old IP %s and new IP %s"), $oldcontents, $contents)); } return ($oldcontents); } else { @@ -1647,11 +1647,11 @@ function update_alias_names_upon_change($section, $subsection, $fielda, $fieldb, if($debug) fwrite($fd, print_r($pconfig, true)); if($fieldb) { - if($debug) fwrite($fd, "fieldb exists\n"); + if($debug) fwrite($fd, sprintf(gettext("fieldb exists%s"), "\n")); for ($i = 0; isset($config["$section"]["$subsection"][$i]["$fielda"]); $i++) { if($debug) fwrite($fd, "$i\n"); if($config["$section"]["$subsection"][$i]["$fielda"]["$fieldb"] == $origname) { - if($debug) fwrite($fd, "Setting old alias value $origname to $new_alias_name\n"); + if($debug) fwrite($fd, sprintf(gettext("Setting old alias value %s to %s%s"), $origname, $new_alias_name, "\n")); $config["$section"]["$subsection"][$i]["$fielda"]["$fieldb"] = $new_alias_name; } } @@ -1660,7 +1660,7 @@ function update_alias_names_upon_change($section, $subsection, $fielda, $fieldb, for ($i = 0; isset($config["$section"]["$subsection"][$i]["$fielda"]); $i++) { if($config["$section"]["$subsection"][$i]["$fielda"] == $origname) { $config["$section"]["$subsection"][$i]["$fielda"] = $new_alias_name; - if($debug) fwrite($fd, "Setting old alias value $origname to $new_alias_name\n"); + if($debug) fwrite($fd, sprintf(gettext("Setting old alias value %s to %s%s"), $origname, $new_alias_name, "\n")); } } } -- cgit v1.1 From 47f12397b3ec7f6fa860d21136a7deca9f6573e8 Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Mon, 30 Aug 2010 20:36:30 -0300 Subject: Fix gettext calls with printf to permit change strings order --- etc/inc/pfsense-utils.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'etc/inc/pfsense-utils.inc') diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc index 37cb340..833c802 100644 --- a/etc/inc/pfsense-utils.inc +++ b/etc/inc/pfsense-utils.inc @@ -483,7 +483,7 @@ function WakeOnLan($addr, $mac) $s = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP); if ($s == false) { log_error(gettext("Error creating socket!")); - log_error(sprintf(gettext("Error code is '%s' - %s"), socket_last_error($s), socket_strerror(socket_last_error($s)))); + log_error(sprintf(gettext("Error code is '%1$s' - %2$s"), socket_last_error($s), socket_strerror(socket_last_error($s)))); } else { // setting a broadcast option to socket: $opt_ret = socket_set_option($s, 1, 6, TRUE); @@ -491,7 +491,7 @@ function WakeOnLan($addr, $mac) log_error(sprintf(gettext("setsockopt() failed, error: %s"), strerror($opt_ret))); $e = socket_sendto($s, $msg, strlen($msg), 0, $addr, 2050); socket_close($s); - log_error(sprintf(gettext("Magic Packet sent (%s) to {%s} MAC=%s"), $e, $addr, $mac)); + log_error(sprintf(gettext("Magic Packet sent (%1$s) to {%2$s} MAC=%3$s"), $e, $addr, $mac)); return true; } @@ -737,7 +737,7 @@ function call_pfsense_method($method, $params, $timeout = 0) { log_error(sprintf(gettext("XMLRPC communication error: %s"), $cli->errstr)); return false; } elseif($resp->faultCode()) { - log_error(sprintf(gettext("XMLRPC request failed with error %s: %s"), $resp->faultCode(), $resp->faultString())); + log_error(sprintf(gettext("XMLRPC request failed with error %1$s: %2$s"), $resp->faultCode(), $resp->faultString())); return false; } else { return XML_RPC_Decode($resp->value()); @@ -1402,7 +1402,7 @@ function compare_hostname_to_dnscache($hostname) { if(trim($oldcontents) != trim($contents)) { if($g['debug']) { - log_error(sprintf(gettext("DNSCACHE: Found old IP %s and new IP %s"), $oldcontents, $contents)); + log_error(sprintf(gettext("DNSCACHE: Found old IP %1$s and new IP %2$s"), $oldcontents, $contents)); } return ($oldcontents); } else { @@ -1573,7 +1573,7 @@ function update_alias_names_upon_change($section, $subsection, $fielda, $fieldb, for ($i = 0; isset($config["$section"]["$subsection"][$i]["$fielda"]); $i++) { if($debug) fwrite($fd, "$i\n"); if($config["$section"]["$subsection"][$i]["$fielda"]["$fieldb"] == $origname) { - if($debug) fwrite($fd, sprintf(gettext("Setting old alias value %s to %s%s"), $origname, $new_alias_name, "\n")); + if($debug) fwrite($fd, sprintf(gettext("Setting old alias value %1$s to %2$s%3$s"), $origname, $new_alias_name, "\n")); $config["$section"]["$subsection"][$i]["$fielda"]["$fieldb"] = $new_alias_name; } } @@ -1582,7 +1582,7 @@ function update_alias_names_upon_change($section, $subsection, $fielda, $fieldb, for ($i = 0; isset($config["$section"]["$subsection"][$i]["$fielda"]); $i++) { if($config["$section"]["$subsection"][$i]["$fielda"] == $origname) { $config["$section"]["$subsection"][$i]["$fielda"] = $new_alias_name; - if($debug) fwrite($fd, sprintf(gettext("Setting old alias value %s to %s%s"), $origname, $new_alias_name, "\n")); + if($debug) fwrite($fd, sprintf(gettext("Setting old alias value %1$s to %2$s%3$s"), $origname, $new_alias_name, "\n")); } } } -- cgit v1.1 From addc0439931fb28c626c7024b1e9857adfe29f29 Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Fri, 1 Oct 2010 10:17:13 -0300 Subject: Fix quotes to use %N$X on gettext calls --- etc/inc/pfsense-utils.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'etc/inc/pfsense-utils.inc') diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc index 8e0233e..8bfb3ec 100644 --- a/etc/inc/pfsense-utils.inc +++ b/etc/inc/pfsense-utils.inc @@ -483,7 +483,7 @@ function WakeOnLan($addr, $mac) $s = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP); if ($s == false) { log_error(gettext("Error creating socket!")); - log_error(sprintf(gettext("Error code is '%1$s' - %2$s"), socket_last_error($s), socket_strerror(socket_last_error($s)))); + log_error(sprintf(gettext("Error code is '%1\$s' - %2\$s"), socket_last_error($s), socket_strerror(socket_last_error($s)))); } else { // setting a broadcast option to socket: $opt_ret = socket_set_option($s, 1, 6, TRUE); @@ -491,7 +491,7 @@ function WakeOnLan($addr, $mac) log_error(sprintf(gettext("setsockopt() failed, error: %s"), strerror($opt_ret))); $e = socket_sendto($s, $msg, strlen($msg), 0, $addr, 2050); socket_close($s); - log_error(sprintf(gettext("Magic Packet sent (%1$s) to {%2$s} MAC=%3$s"), $e, $addr, $mac)); + log_error(sprintf(gettext('Magic Packet sent (%1$s) to {%2$s} MAC=%3$s'), $e, $addr, $mac)); return true; } @@ -737,7 +737,7 @@ function call_pfsense_method($method, $params, $timeout = 0) { log_error(sprintf(gettext("XMLRPC communication error: %s"), $cli->errstr)); return false; } elseif($resp->faultCode()) { - log_error(sprintf(gettext("XMLRPC request failed with error %1$s: %2$s"), $resp->faultCode(), $resp->faultString())); + log_error(sprintf(gettext('XMLRPC request failed with error %1$s: %2$s'), $resp->faultCode(), $resp->faultString())); return false; } else { return XML_RPC_Decode($resp->value()); @@ -1402,7 +1402,7 @@ function compare_hostname_to_dnscache($hostname) { if(trim($oldcontents) != trim($contents)) { if($g['debug']) { - log_error(sprintf(gettext("DNSCACHE: Found old IP %1$s and new IP %2$s"), $oldcontents, $contents)); + log_error(sprintf(gettext('DNSCACHE: Found old IP %1$s and new IP %2$s'), $oldcontents, $contents)); } return ($oldcontents); } else { @@ -1573,7 +1573,7 @@ function update_alias_names_upon_change($section, $subsection, $fielda, $fieldb, for ($i = 0; isset($config["$section"]["$subsection"][$i]["$fielda"]); $i++) { if($debug) fwrite($fd, "$i\n"); if($config["$section"]["$subsection"][$i]["$fielda"]["$fieldb"] == $origname) { - if($debug) fwrite($fd, sprintf(gettext("Setting old alias value %1$s to %2$s%3$s"), $origname, $new_alias_name, "\n")); + if($debug) fwrite($fd, sprintf(gettext('Setting old alias value %1$s to %2$s%3$s'), $origname, $new_alias_name, "\n")); $config["$section"]["$subsection"][$i]["$fielda"]["$fieldb"] = $new_alias_name; } } @@ -1582,7 +1582,7 @@ function update_alias_names_upon_change($section, $subsection, $fielda, $fieldb, for ($i = 0; isset($config["$section"]["$subsection"][$i]["$fielda"]); $i++) { if($config["$section"]["$subsection"][$i]["$fielda"] == $origname) { $config["$section"]["$subsection"][$i]["$fielda"] = $new_alias_name; - if($debug) fwrite($fd, sprintf(gettext("Setting old alias value %1$s to %2$s%3$s"), $origname, $new_alias_name, "\n")); + if($debug) fwrite($fd, sprintf(gettext('Setting old alias value %1$s to %2$s%3$s'), $origname, $new_alias_name, "\n")); } } } -- cgit v1.1