1 |
slords |
1.1 |
--- e-smith-backup-2.2.0/root/etc/e-smith/web/functions/backup.localise_fix 2008-10-07 11:34:33.000000000 -0600 |
2 |
|
|
+++ e-smith-backup-2.2.0/root/etc/e-smith/web/functions/backup 2008-10-09 14:32:01.000000000 -0600 |
3 |
|
|
@@ -975,13 +975,13 @@ |
4 |
|
|
|
5 |
|
|
unless(system("/sbin/e-smith/signal-event", "pre-restore") == 0) |
6 |
|
|
{ |
7 |
|
|
- $rec->set_prop('errmsg', $fm->localize('ERR_PRE_RESTORE')); |
8 |
|
|
+ $rec->set_prop('errmsg', $fm->localise('ERR_PRE_RESTORE')); |
9 |
|
|
$rec->delete_prop('state'); |
10 |
|
|
die ($fm->localise('ERR_PRE_RESTORE'),"\n"); |
11 |
|
|
} |
12 |
|
|
unless(system("/sbin/e-smith/signal-event", "restore-tape") == 0) |
13 |
|
|
{ |
14 |
|
|
- $rec->set_prop('errmsg', $fm->localize('ERR_RESTORING_FROM_TAPE')); |
15 |
|
|
+ $rec->set_prop('errmsg', $fm->localise('ERR_RESTORING_FROM_TAPE')); |
16 |
|
|
$rec->delete_prop('state'); |
17 |
|
|
die ($fm->localise('ERR_RESTORING_FROM_TAPE')."\n"); |
18 |
|
|
} |
19 |
|
|
@@ -993,19 +993,19 @@ |
20 |
|
|
unless(system("/usr/sbin/groupmod", "-g", "$www_gid", "www") == 0) |
21 |
|
|
{ |
22 |
|
|
$rec->set_prop('errmsg', $rec->prop('errmsg').'<br>'. |
23 |
|
|
- $fm->localize('ERR_RESTORING_GID')); |
24 |
|
|
+ $fm->localise('ERR_RESTORING_GID')); |
25 |
|
|
warn ($fm->localise('ERR_RESTORING_GID')."\n"); |
26 |
|
|
} |
27 |
|
|
unless(system("/usr/sbin/usermod", "-g", "$www_gid", "www") == 0) |
28 |
|
|
{ |
29 |
|
|
$rec->set_prop('errmsg', $rec->prop('errmsg').'<br>'. |
30 |
|
|
- $fm->localize('ERR_RESTORING_INITIAL_GRP')); |
31 |
|
|
+ $fm->localise('ERR_RESTORING_INITIAL_GRP')); |
32 |
|
|
warn ($fm->localise('ERR_RESTORING_INITIAL_GRP')."\n"); |
33 |
|
|
} |
34 |
|
|
unless(system("/sbin/e-smith/signal-event", "post-upgrade") == 0) |
35 |
|
|
{ |
36 |
|
|
$rec->set_prop('errmsg', $rec->prop('errmsg').'<br>'. |
37 |
|
|
- $fm->localize('ERR_UPDATING_CONF_AFTER_TAPE_RESTORE')); |
38 |
|
|
+ $fm->localise('ERR_UPDATING_CONF_AFTER_TAPE_RESTORE')); |
39 |
|
|
$rec->delete_prop('state'); |
40 |
|
|
die ($fm->localise('ERR_UPDATING_CONF_AFTER_TAPE_RESTORE')); |
41 |
|
|
} |
42 |
|
|
@@ -1027,7 +1027,7 @@ |
43 |
|
|
# Error |
44 |
|
|
|
45 |
|
|
$rec->delete_prop('state'); |
46 |
|
|
- $rec->set_prop('errmsg', $fm->localize('COULD_NOT_FORK')); |
47 |
|
|
+ $rec->set_prop('errmsg', $fm->localise('COULD_NOT_FORK')); |
48 |
|
|
die ($fm->localise("COULD_NOT_FORK")."$!\n"); |
49 |
|
|
} |
50 |
|
|
} |
51 |
|
|
@@ -1777,7 +1777,7 @@ |
52 |
|
|
or die($fm->localise('ERR_WHILE_UNMOUNTING'),"\n"); |
53 |
|
|
} |
54 |
|
|
esmith::cgi::genResult( |
55 |
|
|
- $q, $fm->localise('ERR_NO_HOST_DIR'.$id) |
56 |
|
|
+ $q, $fm->localise('ERR_NO_HOST_DIR'), $id |
57 |
|
|
); |
58 |
|
|
return; |
59 |
|
|
} |
60 |
|
|
@@ -1892,7 +1892,7 @@ |
61 |
|
|
system("/bin/umount", "$mntdir") == 0 |
62 |
|
|
or die($fm->localise('ERR_WHILE_UNMOUNTING'),"\n"); |
63 |
|
|
} |
64 |
|
|
- esmith::cgi::genResult($q, $fm->localise('ERR_NO_HOST_DIR'.$id)); |
65 |
|
|
+ esmith::cgi::genResult($q, $fm->localise('ERR_NO_HOST_DIR'), $id); |
66 |
|
|
return; |
67 |
|
|
} |
68 |
|
|
|
69 |
|
|
@@ -2028,7 +2028,7 @@ |
70 |
|
|
system("/bin/umount", "$mntdir") == 0 |
71 |
|
|
or die($fm->localise('ERR_WHILE_UNMOUNTING'),"\n"); |
72 |
|
|
} |
73 |
|
|
- esmith::cgi::genResult($q, $fm->localise('ERR_NO_HOST_DIR'.$id)); |
74 |
|
|
+ esmith::cgi::genResult($q, $fm->localise('ERR_NO_HOST_DIR'), $id); |
75 |
|
|
return; |
76 |
|
|
} |
77 |
|
|
|
78 |
|
|
@@ -2183,7 +2183,7 @@ |
79 |
|
|
or die($fm->localise('ERR_WHILE_UNMOUNTING'),"\n"); |
80 |
|
|
} |
81 |
|
|
esmith::cgi::genResult( |
82 |
|
|
- $q, $fm->localise('ERR_NO_HOST_DIR'.$id) |
83 |
|
|
+ $q, $fm->localise('ERR_NO_HOST_DIR'), $id |
84 |
|
|
); |
85 |
|
|
return; |
86 |
|
|
} |
87 |
|
|
@@ -2417,7 +2417,7 @@ |
88 |
|
|
or die($fm->localise('ERR_WHILE_UNMOUNTING'),"\n"); |
89 |
|
|
} |
90 |
|
|
esmith::cgi::genResult( |
91 |
|
|
- $q, $fm->localise('ERR_NO_HOST_DIR'.$id) |
92 |
|
|
+ $q, $fm->localise('ERR_NO_HOST_DIR'), $id |
93 |
|
|
); |
94 |
|
|
return; |
95 |
|
|
} |
96 |
|
|
@@ -2645,7 +2645,7 @@ |
97 |
|
|
or die($fm->localise('ERR_WHILE_UNMOUNTING'),"\n"); |
98 |
|
|
} |
99 |
|
|
esmith::cgi::genResult( |
100 |
|
|
- $q, $fm->localise('ERR_NO_HOST_DIR'.$id) |
101 |
|
|
+ $q, $fm->localise('ERR_NO_HOST_DIR'), $id |
102 |
|
|
); |
103 |
|
|
return; |
104 |
|
|
} |
105 |
|
|
@@ -2813,7 +2813,7 @@ |
106 |
|
|
or die($fm->localise('ERR_WHILE_UNMOUNTING'),"\n"); |
107 |
|
|
} |
108 |
|
|
esmith::cgi::genResult( |
109 |
|
|
- $q, $fm->localise('ERR_NO_HOST_DIR'.$id) |
110 |
|
|
+ $q, $fm->localise('ERR_NO_HOST_DIR'), $id |
111 |
|
|
); |
112 |
|
|
return; |
113 |
|
|
} |