diff options
| author | Renato Botelho <renato.botelho@bluepex.com> | 2010-08-30 20:36:30 -0300 |
|---|---|---|
| committer | Renato Botelho <renato.botelho@bluepex.com> | 2010-08-30 20:36:30 -0300 |
| commit | 47f12397b3ec7f6fa860d21136a7deca9f6573e8 (patch) | |
| tree | 2f63de6cc3229518d8704d641ab085d63bfd12da /etc/inc/config.lib.inc | |
| parent | 701a250b6ede4936d1dd677b8e1813a440e90c71 (diff) | |
| download | pfsense-47f12397b3ec7f6fa860d21136a7deca9f6573e8.zip pfsense-47f12397b3ec7f6fa860d21136a7deca9f6573e8.tar.gz | |
Fix gettext calls with printf to permit change strings order
Diffstat (limited to 'etc/inc/config.lib.inc')
| -rw-r--r-- | etc/inc/config.lib.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/etc/inc/config.lib.inc b/etc/inc/config.lib.inc index f38cfd9..29576cb 100644 --- a/etc/inc/config.lib.inc +++ b/etc/inc/config.lib.inc @@ -201,8 +201,8 @@ function restore_backup($file) { conf_mount_rw(); unlink_if_exists("{$g['tmp_path']}/config.cache"); copy("$file","/cf/conf/config.xml"); - log_error(sprintf(gettext("%s is restoring the configuration %s"), $g['product_name'], $file)); - file_notice("config.xml", sprintf(gettext("%s is restoring the configuration %s"), $g['product_name'], $file), "pfSenseConfigurator", ""); + log_error(sprintf(gettext("%1$s is restoring the configuration %2$s"), $g['product_name'], $file)); + file_notice("config.xml", sprintf(gettext("%1$s is restoring the configuration %2$s"), $g['product_name'], $file), "pfSenseConfigurator", ""); conf_mount_ro(); } } @@ -404,7 +404,7 @@ function convert_config() { log_error(sprintf(gettext("Ended Configuration upgrade at %s"), $now)); if ($prev_version != $config['version']) - write_config(sprintf(gettext("Upgraded config version level from %s to %s"), $prev_version, $config['version'])); + write_config(sprintf(gettext("Upgraded config version level from %1$s to %2$s"), $prev_version, $config['version'])); if($g['booting']) echo gettext("Loading new configuration..."); @@ -640,7 +640,7 @@ function config_validate($conffile) { while ($data = fread($fp, 4096)) { if (!xml_parse($xml_parser, $data, feof($fp))) { - $xmlerr = sprintf(gettext("%s at line %d"), + $xmlerr = sprintf(gettext("%1$s at line %2$d"), xml_error_string(xml_get_error_code($xml_parser)), xml_get_current_line_number($xml_parser)); return false; |
