smeserver-trac/contribs7/smeserver-trac-0.4-add2general.patch

--- smeserver-trac-0.4/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/trac.pm.add2general 2008-04-26 09:18:47.000000000 -0600
+++ smeserver-trac-0.4/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/trac.pm     2008-04-26 09:14:48.000000000 -0600
@@ -129,18 +129,18 @@
        my $q = $fm->{cgi};
 
        # Setup the various localised text field for the trac project table
-       my $name        = $fm->localise('TRAC_TABLE_HEADER_NAME');
-       my $description = $fm->localise('TRAC_TABLE_HEADER_DESCRIPTION');
-       my $domains     = $fm->localise('TRAC_TABLE_HEADER_DOMAINS');
-       my $repository  = $fm->localise('TRAC_TABLE_HEADER_REPOSITORY');
-       my $path        = $fm->localise('TRAC_TABLE_HEADER_PATH');
-       my $access      = $fm->localise('TRAC_TABLE_HEADER_ACCESS');
-       my $action_h    = $fm->localise('TRAC_TABLE_HEADER_ACTION');
-       my $view        = $fm->localise('TRAC_ACTION_VIEW');
-       my $modify      = $fm->localise('TRAC_ACTION_MODIFY');
-       my $remove      = $fm->localise('TRAC_ACTION_REMOVE');
-       my $backup      = $fm->localise('TRAC_ACTION_BACKUP');
-       my $restore     = $fm->localise('TRAC_ACTION_RESTORE');
+       my $name        = $fm->localise('NAME');
+       my $description = $fm->localise('DESCRIPTION');
+       my $domains     = $fm->localise('DOMAINS');
+       my $repository  = $fm->localise('REPOSITORY');
+       my $path        = $fm->localise('PATH');
+       my $access      = $fm->localise('DESCRIPTION');
+       my $action_h    = $fm->localise('ACTION');
+       my $view        = $fm->localise('VIEW');
+       my $modify      = $fm->localise('MODIFY');
+       my $remove      = $fm->localise('REMOVE');
+       my $backup      = $fm->localise('BACKUP');
+       my $restore     = $fm->localise('RESTORE');
 
        print $q->start_table({-class => 'sme-noborder'}), "\n";
 
@@ -417,7 +417,7 @@
                $out .=     "      <td colspan=2>" . $fm->localise('TRAC_FIELD_DOMAINS_DESCRIPTION') . "</td>";
                $out .=     "    </tr>\n";
                $out .=     "    <tr>\n";
-               $out .=     "      <td class=\"sme-noborders-label\">" . $fm->localise('TRAC_FIELD_DOMAINS') . "</td>\n";
+               $out .=     "      <td class=\"sme-noborders-label\">" . $fm->localise('DOMAINS') . "</td>\n";
                $out .=     "      <td>\n";
                $out .=     "        <table border='0' cellspacing='0' cellpadding='0'>\n";
                $out .=     "          <tr>\n";
@@ -454,7 +454,7 @@
                $out .=     "      <td colspan=2>" . $fm->localise('TRAC_FIELD_DOMAIN_DESCRIPTION') . "</td>";
                $out .=     "    </tr>\n";
                $out .=     "    <tr>\n";
-               $out .=     "      <td class=\"sme-noborders-label\">" . $fm->localise('TRAC_FIELD_DOMAIN') . "</td>\n";
+               $out .=     "      <td class=\"sme-noborders-label\">" . $fm->localise('DOMAIN') . "</td>\n";
                $out .=     "      <td><input type=\"hidden\" name=\"tracDomains\" value=\"" . $domainname . "\">";
                $out .=                $domainname . "</td>\n";
                $out .=     "    </tr>\n";
--- smeserver-trac-0.4/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/trac.add2general 2008-04-26 09:18:47.000000000 -0600
+++ smeserver-trac-0.4/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/trac     2008-04-26 09:14:48.000000000 -0600
@@ -129,20 +129,6 @@
        </entry>
 
        <entry>
-               <base>TRAC_FIELD_PROJECT_DESCRIPTION</base>
-               <trans>
-                       Description
-               </trans>
-       </entry>
-
-       <entry>
-               <base>TRAC_FIELD_DOMAIN</base>
-               <trans>
-                       Domain
-               </trans>
-       </entry>
-
-       <entry>
                <base>TRAC_FIELD_DOMAIN_DESCRIPTION</base>
                <trans>
                        When you have more than one domain configured on this server, you can
@@ -152,13 +138,6 @@
        </entry>
 
        <entry>
-               <base>TRAC_FIELD_DOMAINS</base>
-               <trans>
-                       Domains
-               </trans>
-       </entry>
-
-       <entry>
                <base>TRAC_FIELD_DOMAINS_DESCRIPTION</base>
                <trans>
                        There are multiple domains configured on this server. You can select
@@ -241,90 +220,29 @@
        </entry>
 
        <entry>
-               <base>TRAC_TABLE_HEADER_NAME</base>
-               <trans>
-                       Name
-               </trans>
-       </entry>
-
-       <entry>
-               <base>TRAC_TABLE_HEADER_DESCRIPTION</base>
-               <trans>
-                       Description
-               </trans>
-       </entry>
-
-       <entry>
-               <base>TRAC_TABLE_HEADER_DOMAINS</base>
-               <trans>
-                       Domains
-               </trans>
-       </entry>
-
-       <entry>
-               <base>TRAC_TABLE_HEADER_REPOSITORY</base>
+               <base>REPOSITORY</base>
                <trans>
                        Repository
                </trans>
        </entry>
 
        <entry>
-               <base>TRAC_TABLE_HEADER_PATH</base>
+               <base>PATH</base>
                <trans>
                        Path
                </trans>
        </entry>
 
        <entry>
-               <base>TRAC_TABLE_HEADER_ACCESS</base>
-               <trans>
-                       Access
-               </trans>
-       </entry>
 
        <entry>
-               <base>TRAC_TABLE_HEADER_ACTION</base>
-               <trans>
-                       Action
-               </trans>
-       </entry>
-
-       <entry>
-               <base>TRAC_ACTION_VIEW</base>
+               <base>VIEW</base>
                <trans>
                        View Trac Project
                </trans>
        </entry>
 
        <entry>
-               <base>TRAC_ACTION_MODIFY</base>
-               <trans>
-                       Modify
-               </trans>
-       </entry>
-
-       <entry>
-               <base>TRAC_ACTION_REMOVE</base>
-               <trans>
-                       Remove
-               </trans>
-       </entry>
-
-       <entry>
-               <base>TRAC_ACTION_BACKUP</base>
-               <trans>
-                       Backup
-               </trans>
-       </entry>
-
-       <entry>
-               <base>TRAC_ACTION_RESTORE</base>
-               <trans>
-                       Restore
-               </trans>
-       </entry>
-
-       <entry>
                <base>ERROR_WHILE_CREATING_TRAC_PROJECT</base>
                <trans>
                        An error occurred while creating the Trac project environment.
@@ -364,13 +282,6 @@
        </entry>
 
        <entry>
-               <base>DESCRIPTION_ERROR</base>
-               <trans>
-                       Unexpected characters in description.
-               </trans>
-       </entry>
-
-       <entry>
                <base>NO_DOMAINS</base>
                <trans>
                        There are no domains selected for the Trac project environment. 
@@ -481,15 +392,5 @@
                <trans>Local Network Only</trans>
        </entry>
 
-       <entry>
-               <base>YES</base>
-               <trans>Yes</trans>
-       </entry>
-
-       <entry>
-               <base>NO</base>
-               <trans>No</trans>
-       </entry>
-
 </lexicon>
 
--- smeserver-trac-0.4/root/etc/e-smith/web/functions/trac.add2general  2008-04-26 09:18:47.000000000 -0600
+++ smeserver-trac-0.4/root/etc/e-smith/web/functions/trac      2008-04-26 09:14:48.000000000 -0600
@@ -103,7 +103,7 @@
                        type="text"
                        id="tracDescription"
                        validation="validate_description">
-                       <label>TRAC_FIELD_PROJECT_DESCRIPTION</label>
+                       <label>DESCRIPTION</label>
                </field>
 
                <field
@@ -168,7 +168,7 @@
                        type="text"
                        id="tracDescription"
                        validation="validate_description">
-                       <label>TRAC_FIELD_PROJECT_DESCRIPTION</label>
+                       <label>DESCRIPTION</label>
                </field>
 
 
1	--- smeserver-trac-0.4/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/trac.pm.add2general 2008-04-26 09:18:47.000000000 -0600
2	+++ smeserver-trac-0.4/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/trac.pm 2008-04-26 09:14:48.000000000 -0600
3	@@ -129,18 +129,18 @@
4	my $q = $fm->{cgi};
5
6	# Setup the various localised text field for the trac project table
7	- my $name = $fm->localise('TRAC_TABLE_HEADER_NAME');
8	- my $description = $fm->localise('TRAC_TABLE_HEADER_DESCRIPTION');
9	- my $domains = $fm->localise('TRAC_TABLE_HEADER_DOMAINS');
10	- my $repository = $fm->localise('TRAC_TABLE_HEADER_REPOSITORY');
11	- my $path = $fm->localise('TRAC_TABLE_HEADER_PATH');
12	- my $access = $fm->localise('TRAC_TABLE_HEADER_ACCESS');
13	- my $action_h = $fm->localise('TRAC_TABLE_HEADER_ACTION');
14	- my $view = $fm->localise('TRAC_ACTION_VIEW');
15	- my $modify = $fm->localise('TRAC_ACTION_MODIFY');
16	- my $remove = $fm->localise('TRAC_ACTION_REMOVE');
17	- my $backup = $fm->localise('TRAC_ACTION_BACKUP');
18	- my $restore = $fm->localise('TRAC_ACTION_RESTORE');
19	+ my $name = $fm->localise('NAME');
20	+ my $description = $fm->localise('DESCRIPTION');
21	+ my $domains = $fm->localise('DOMAINS');
22	+ my $repository = $fm->localise('REPOSITORY');
23	+ my $path = $fm->localise('PATH');
24	+ my $access = $fm->localise('DESCRIPTION');
25	+ my $action_h = $fm->localise('ACTION');
26	+ my $view = $fm->localise('VIEW');
27	+ my $modify = $fm->localise('MODIFY');
28	+ my $remove = $fm->localise('REMOVE');
29	+ my $backup = $fm->localise('BACKUP');
30	+ my $restore = $fm->localise('RESTORE');
31
32	print $q->start_table({-class => 'sme-noborder'}), "\n";
33
34	@@ -417,7 +417,7 @@
35	$out .= " <td colspan=2>" . $fm->localise('TRAC_FIELD_DOMAINS_DESCRIPTION') . "</td>";
36	$out .= " </tr>\n";
37	$out .= " <tr>\n";
38	- $out .= " <td class=\"sme-noborders-label\">" . $fm->localise('TRAC_FIELD_DOMAINS') . "</td>\n";
39	+ $out .= " <td class=\"sme-noborders-label\">" . $fm->localise('DOMAINS') . "</td>\n";
40	$out .= " <td>\n";
41	$out .= " <table border='0' cellspacing='0' cellpadding='0'>\n";
42	$out .= " <tr>\n";
43	@@ -454,7 +454,7 @@
44	$out .= " <td colspan=2>" . $fm->localise('TRAC_FIELD_DOMAIN_DESCRIPTION') . "</td>";
45	$out .= " </tr>\n";
46	$out .= " <tr>\n";
47	- $out .= " <td class=\"sme-noborders-label\">" . $fm->localise('TRAC_FIELD_DOMAIN') . "</td>\n";
48	+ $out .= " <td class=\"sme-noborders-label\">" . $fm->localise('DOMAIN') . "</td>\n";
49	$out .= " <td><input type=\"hidden\" name=\"tracDomains\" value=\"" . $domainname . "\">";
50	$out .= $domainname . "</td>\n";
51	$out .= " </tr>\n";
52	--- smeserver-trac-0.4/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/trac.add2general 2008-04-26 09:18:47.000000000 -0600
53	+++ smeserver-trac-0.4/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/trac 2008-04-26 09:14:48.000000000 -0600
54	@@ -129,20 +129,6 @@
55	</entry>
56
57	<entry>
58	- <base>TRAC_FIELD_PROJECT_DESCRIPTION</base>
59	- <trans>
60	- Description
61	- </trans>
62	- </entry>
63	-
64	- <entry>
65	- <base>TRAC_FIELD_DOMAIN</base>
66	- <trans>
67	- Domain
68	- </trans>
69	- </entry>
70	-
71	- <entry>
72	<base>TRAC_FIELD_DOMAIN_DESCRIPTION</base>
73	<trans>
74	When you have more than one domain configured on this server, you can
75	@@ -152,13 +138,6 @@
76	</entry>
77
78	<entry>
79	- <base>TRAC_FIELD_DOMAINS</base>
80	- <trans>
81	- Domains
82	- </trans>
83	- </entry>
84	-
85	- <entry>
86	<base>TRAC_FIELD_DOMAINS_DESCRIPTION</base>
87	<trans>
88	There are multiple domains configured on this server. You can select
89	@@ -241,90 +220,29 @@
90	</entry>
91
92	<entry>
93	- <base>TRAC_TABLE_HEADER_NAME</base>
94	- <trans>
95	- Name
96	- </trans>
97	- </entry>
98	-
99	- <entry>
100	- <base>TRAC_TABLE_HEADER_DESCRIPTION</base>
101	- <trans>
102	- Description
103	- </trans>
104	- </entry>
105	-
106	- <entry>
107	- <base>TRAC_TABLE_HEADER_DOMAINS</base>
108	- <trans>
109	- Domains
110	- </trans>
111	- </entry>
112	-
113	- <entry>
114	- <base>TRAC_TABLE_HEADER_REPOSITORY</base>
115	+ <base>REPOSITORY</base>
116	<trans>
117	Repository
118	</trans>
119	</entry>
120
121	<entry>
122	- <base>TRAC_TABLE_HEADER_PATH</base>
123	+ <base>PATH</base>
124	<trans>
125	Path
126	</trans>
127	</entry>
128
129	<entry>
130	- <base>TRAC_TABLE_HEADER_ACCESS</base>
131	- <trans>
132	- Access
133	- </trans>
134	- </entry>
135
136	<entry>
137	- <base>TRAC_TABLE_HEADER_ACTION</base>
138	- <trans>
139	- Action
140	- </trans>
141	- </entry>
142	-
143	- <entry>
144	- <base>TRAC_ACTION_VIEW</base>
145	+ <base>VIEW</base>
146	<trans>
147	View Trac Project
148	</trans>
149	</entry>
150
151	<entry>
152	- <base>TRAC_ACTION_MODIFY</base>
153	- <trans>
154	- Modify
155	- </trans>
156	- </entry>
157	-
158	- <entry>
159	- <base>TRAC_ACTION_REMOVE</base>
160	- <trans>
161	- Remove
162	- </trans>
163	- </entry>
164	-
165	- <entry>
166	- <base>TRAC_ACTION_BACKUP</base>
167	- <trans>
168	- Backup
169	- </trans>
170	- </entry>
171	-
172	- <entry>
173	- <base>TRAC_ACTION_RESTORE</base>
174	- <trans>
175	- Restore
176	- </trans>
177	- </entry>
178	-
179	- <entry>
180	<base>ERROR_WHILE_CREATING_TRAC_PROJECT</base>
181	<trans>
182	An error occurred while creating the Trac project environment.
183	@@ -364,13 +282,6 @@
184	</entry>
185
186	<entry>
187	- <base>DESCRIPTION_ERROR</base>
188	- <trans>
189	- Unexpected characters in description.
190	- </trans>
191	- </entry>
192	-
193	- <entry>
194	<base>NO_DOMAINS</base>
195	<trans>
196	There are no domains selected for the Trac project environment.
197	@@ -481,15 +392,5 @@
198	<trans>Local Network Only</trans>
199	</entry>
200
201	- <entry>
202	- <base>YES</base>
203	- <trans>Yes</trans>
204	- </entry>
205	-
206	- <entry>
207	- <base>NO</base>
208	- <trans>No</trans>
209	- </entry>
210	-
211	</lexicon>
212
213	--- smeserver-trac-0.4/root/etc/e-smith/web/functions/trac.add2general 2008-04-26 09:18:47.000000000 -0600
214	+++ smeserver-trac-0.4/root/etc/e-smith/web/functions/trac 2008-04-26 09:14:48.000000000 -0600
215	@@ -103,7 +103,7 @@
216	type="text"
217	id="tracDescription"
218	validation="validate_description">
219	- <label>TRAC_FIELD_PROJECT_DESCRIPTION</label>
220	+ <label>DESCRIPTION</label>
221	</field>
222
223	<field
224	@@ -168,7 +168,7 @@
225	type="text"
226	id="tracDescription"
227	validation="validate_description">
228	- <label>TRAC_FIELD_PROJECT_DESCRIPTION</label>
229	+ <label>DESCRIPTION</label>
230	</field>
231
232