--- e-smith-backup-2.2.0/root/etc/e-smith/web/functions/backup.localise_fix 2008-10-07 11:34:33.000000000 -0600 +++ e-smith-backup-2.2.0/root/etc/e-smith/web/functions/backup 2008-10-09 14:32:01.000000000 -0600 @@ -975,13 +975,13 @@ unless(system("/sbin/e-smith/signal-event", "pre-restore") == 0) { - $rec->set_prop('errmsg', $fm->localize('ERR_PRE_RESTORE')); + $rec->set_prop('errmsg', $fm->localise('ERR_PRE_RESTORE')); $rec->delete_prop('state'); die ($fm->localise('ERR_PRE_RESTORE'),"\n"); } unless(system("/sbin/e-smith/signal-event", "restore-tape") == 0) { - $rec->set_prop('errmsg', $fm->localize('ERR_RESTORING_FROM_TAPE')); + $rec->set_prop('errmsg', $fm->localise('ERR_RESTORING_FROM_TAPE')); $rec->delete_prop('state'); die ($fm->localise('ERR_RESTORING_FROM_TAPE')."\n"); } @@ -993,19 +993,19 @@ unless(system("/usr/sbin/groupmod", "-g", "$www_gid", "www") == 0) { $rec->set_prop('errmsg', $rec->prop('errmsg').'
'. - $fm->localize('ERR_RESTORING_GID')); + $fm->localise('ERR_RESTORING_GID')); warn ($fm->localise('ERR_RESTORING_GID')."\n"); } unless(system("/usr/sbin/usermod", "-g", "$www_gid", "www") == 0) { $rec->set_prop('errmsg', $rec->prop('errmsg').'
'. - $fm->localize('ERR_RESTORING_INITIAL_GRP')); + $fm->localise('ERR_RESTORING_INITIAL_GRP')); warn ($fm->localise('ERR_RESTORING_INITIAL_GRP')."\n"); } unless(system("/sbin/e-smith/signal-event", "post-upgrade") == 0) { $rec->set_prop('errmsg', $rec->prop('errmsg').'
'. - $fm->localize('ERR_UPDATING_CONF_AFTER_TAPE_RESTORE')); + $fm->localise('ERR_UPDATING_CONF_AFTER_TAPE_RESTORE')); $rec->delete_prop('state'); die ($fm->localise('ERR_UPDATING_CONF_AFTER_TAPE_RESTORE')); } @@ -1027,7 +1027,7 @@ # Error $rec->delete_prop('state'); - $rec->set_prop('errmsg', $fm->localize('COULD_NOT_FORK')); + $rec->set_prop('errmsg', $fm->localise('COULD_NOT_FORK')); die ($fm->localise("COULD_NOT_FORK")."$!\n"); } } @@ -1777,7 +1777,7 @@ or die($fm->localise('ERR_WHILE_UNMOUNTING'),"\n"); } esmith::cgi::genResult( - $q, $fm->localise('ERR_NO_HOST_DIR'.$id) + $q, $fm->localise('ERR_NO_HOST_DIR'), $id ); return; } @@ -1892,7 +1892,7 @@ system("/bin/umount", "$mntdir") == 0 or die($fm->localise('ERR_WHILE_UNMOUNTING'),"\n"); } - esmith::cgi::genResult($q, $fm->localise('ERR_NO_HOST_DIR'.$id)); + esmith::cgi::genResult($q, $fm->localise('ERR_NO_HOST_DIR'), $id); return; } @@ -2028,7 +2028,7 @@ system("/bin/umount", "$mntdir") == 0 or die($fm->localise('ERR_WHILE_UNMOUNTING'),"\n"); } - esmith::cgi::genResult($q, $fm->localise('ERR_NO_HOST_DIR'.$id)); + esmith::cgi::genResult($q, $fm->localise('ERR_NO_HOST_DIR'), $id); return; } @@ -2183,7 +2183,7 @@ or die($fm->localise('ERR_WHILE_UNMOUNTING'),"\n"); } esmith::cgi::genResult( - $q, $fm->localise('ERR_NO_HOST_DIR'.$id) + $q, $fm->localise('ERR_NO_HOST_DIR'), $id ); return; } @@ -2417,7 +2417,7 @@ or die($fm->localise('ERR_WHILE_UNMOUNTING'),"\n"); } esmith::cgi::genResult( - $q, $fm->localise('ERR_NO_HOST_DIR'.$id) + $q, $fm->localise('ERR_NO_HOST_DIR'), $id ); return; } @@ -2645,7 +2645,7 @@ or die($fm->localise('ERR_WHILE_UNMOUNTING'),"\n"); } esmith::cgi::genResult( - $q, $fm->localise('ERR_NO_HOST_DIR'.$id) + $q, $fm->localise('ERR_NO_HOST_DIR'), $id ); return; } @@ -2813,7 +2813,7 @@ or die($fm->localise('ERR_WHILE_UNMOUNTING'),"\n"); } esmith::cgi::genResult( - $q, $fm->localise('ERR_NO_HOST_DIR'.$id) + $q, $fm->localise('ERR_NO_HOST_DIR'), $id ); return; }