1 |
snetram |
1.1 |
--- smeserver-vacation-1.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/uservacations.pm.add2general 2006-12-29 03:17:52.000000000 +0100 |
2 |
|
|
+++ smeserver-vacation-1.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/uservacations.pm 2008-04-26 22:56:24.000000000 +0200 |
3 |
|
|
@@ -53,11 +53,11 @@ |
4 |
|
|
my $q = $self->{cgi}; |
5 |
|
|
|
6 |
|
|
my @users = $adb->users; |
7 |
|
|
- return $self->localise("NO_ACCOUNTS") if (@users == 0); |
8 |
|
|
+ return $self->localise("ACCOUNT_USER_NONE") if (@users == 0); |
9 |
|
|
|
10 |
|
|
my $vacation_table = |
11 |
|
|
{ |
12 |
|
|
- title => $self->localise('CURRENT_LIST_OF_USERS'), |
13 |
|
|
+ title => $self->localise('USER_LIST_CURRENT'), |
14 |
|
|
|
15 |
|
|
stripe => '#D4D0C8', |
16 |
|
|
|
17 |
|
|
@@ -66,9 +66,9 @@ |
18 |
|
|
labels => 1, |
19 |
|
|
|
20 |
|
|
field_attr => { |
21 |
|
|
- User => { label => $self->localise('LABEL_USER') }, |
22 |
|
|
+ User => { label => $self->localise('ACCOUNT') }, |
23 |
|
|
|
24 |
|
|
- FullName => { label => $self->localise('LABEL_FULLNAME') }, |
25 |
|
|
+ FullName => { label => $self->localise('USER_NAME') }, |
26 |
|
|
|
27 |
|
|
status => { label => $self->localise('LABEL_VACATION') }, |
28 |
|
|
|
29 |
|
|
--- smeserver-vacation-1.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/uservacations.add2general 2008-04-26 22:49:47.000000000 +0200 |
30 |
|
|
+++ smeserver-vacation-1.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/uservacations 2008-04-26 22:58:45.000000000 +0200 |
31 |
|
|
@@ -1,5 +1,4 @@ |
32 |
|
|
<lexicon lang="en-us"> |
33 |
|
|
- |
34 |
|
|
<entry> |
35 |
|
|
<base>User vacations</base> |
36 |
|
|
<trans>User vacations</trans> |
37 |
|
|
@@ -20,18 +19,6 @@ |
38 |
|
|
</trans> |
39 |
|
|
</entry> |
40 |
|
|
<entry> |
41 |
|
|
- <base>CURRENT_LIST_OF_USERS</base> |
42 |
|
|
- <trans>Current list of users</trans> |
43 |
|
|
- </entry> |
44 |
|
|
- <entry> |
45 |
|
|
- <base>LABEL_USER</base> |
46 |
|
|
- <trans>Account</trans> |
47 |
|
|
- </entry> |
48 |
|
|
- <entry> |
49 |
|
|
- <base>LABEL_FULLNAME</base> |
50 |
|
|
- <trans>User Name</trans> |
51 |
|
|
- </entry> |
52 |
|
|
- <entry> |
53 |
|
|
<base>LABEL_VACATION</base> |
54 |
|
|
<trans>Vacation</trans> |
55 |
|
|
</entry> |
56 |
|
|
@@ -65,10 +52,6 @@ |
57 |
|
|
<trans>Enable vacation messages</trans> |
58 |
|
|
</entry> |
59 |
|
|
<entry> |
60 |
|
|
- <base>SUCCESS</base> |
61 |
|
|
- <trans>Success</trans> |
62 |
|
|
- </entry> |
63 |
|
|
- <entry> |
64 |
|
|
<base>FROM</base> |
65 |
|
|
<trans>From:</trans> |
66 |
|
|
</entry> |
67 |
|
|
@@ -88,12 +71,4 @@ |
68 |
|
|
]]> |
69 |
|
|
</trans> |
70 |
|
|
</entry> |
71 |
|
|
- <entry> |
72 |
|
|
- <base>INVALID_USER</base> |
73 |
|
|
- <trans>Invalid user</trans> |
74 |
|
|
- </entry> |
75 |
|
|
- <entry> |
76 |
|
|
- <base>NO_ACCOUNTS</base> |
77 |
|
|
- <trans>There are no user accounts in the system.</trans> |
78 |
|
|
- </entry> |
79 |
|
|
</lexicon> |
80 |
|
|
--- smeserver-vacation-1.0/root/etc/e-smith/web/functions/uservacations.add2general 2006-10-30 14:53:36.000000000 +0100 |
81 |
|
|
+++ smeserver-vacation-1.0/root/etc/e-smith/web/functions/uservacations 2008-04-26 22:54:38.000000000 +0200 |
82 |
|
|
@@ -48,11 +48,11 @@ |
83 |
|
|
<description>MODIFY_DESCRIPTION</description> |
84 |
|
|
|
85 |
|
|
<field type="literal" id="User" > |
86 |
|
|
- <label>LABEL_USER</label> |
87 |
slords |
1.2 |
+ <label>ACCOUNT</label> |
88 |
snetram |
1.1 |
</field> |
89 |
|
|
|
90 |
|
|
<field type="literal" id="FullName"> |
91 |
|
|
- <label>LABEL_FULLNAME</label> |
92 |
slords |
1.2 |
+ <label>USER_NAME</label> |
93 |
snetram |
1.1 |
</field> |
94 |
|
|
|
95 |
|
|
<subroutine src="get_vacation_text()" /> |
96 |
|
|
--- smeserver-vacation-1.0/root/etc/e-smith/web/functions/userpanel-vacation.add2general 2006-08-24 07:03:44.000000000 +0200 |
97 |
|
|
+++ smeserver-vacation-1.0/root/etc/e-smith/web/functions/userpanel-vacation 2008-04-26 22:54:19.000000000 +0200 |
98 |
|
|
@@ -41,11 +41,11 @@ |
99 |
|
|
<description>MODIFY_DESCRIPTION</description> |
100 |
|
|
|
101 |
|
|
<field type="literal" id="User" value="get_panel_user()"> |
102 |
|
|
- <label>LABEL_USER</label> |
103 |
slords |
1.2 |
+ <label>ACCOUNT</label> |
104 |
snetram |
1.1 |
</field> |
105 |
|
|
|
106 |
|
|
<field type="literal" id="FullName" value="get_full_name()"> |
107 |
|
|
- <label>LABEL_FULLNAME</label> |
108 |
slords |
1.2 |
+ <label>USER_NAME</label> |
109 |
snetram |
1.1 |
</field> |
110 |
|
|
|
111 |
|
|
<subroutine src="userpanel_get_vacation_text()" /> |