1 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-domains-1.4.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/domains mezzanine_patched_e-smith-domains-1.4.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/domains |
2 |
--- e-smith-domains-1.4.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/domains 2008-04-27 00:29:49.000000000 +0200 |
3 |
+++ mezzanine_patched_e-smith-domains-1.4.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/domains 2008-04-27 00:22:44.000000000 +0200 |
4 |
@@ -33,18 +33,6 @@ |
5 |
</trans> |
6 |
</entry> |
7 |
<entry> |
8 |
- <base>DOMAIN</base> |
9 |
- <trans> |
10 |
- Domain |
11 |
- </trans> |
12 |
- </entry> |
13 |
- <entry> |
14 |
- <base>DESCRIPTION</base> |
15 |
- <trans> |
16 |
- Description |
17 |
- </trans> |
18 |
- </entry> |
19 |
- <entry> |
20 |
<base>PRIMARY_SITE</base> |
21 |
<trans> |
22 |
primary site |
23 |
@@ -63,18 +51,6 @@ |
24 |
</trans> |
25 |
</entry> |
26 |
<entry> |
27 |
- <base>DOMAIN_NAME_LABEL</base> |
28 |
- <trans> |
29 |
- Domain name |
30 |
- </trans> |
31 |
- </entry> |
32 |
- <entry> |
33 |
- <base>DESCRIPTION_LABEL</base> |
34 |
- <trans> |
35 |
- Brief description |
36 |
- </trans> |
37 |
- </entry> |
38 |
- <entry> |
39 |
<base>CONTENT_FIELD_DESCRIPTION</base> |
40 |
<trans> |
41 |
For the web site, you may choose your primary web site or any |
42 |
@@ -82,12 +58,6 @@ |
43 |
</trans> |
44 |
</entry> |
45 |
<entry> |
46 |
- <base>CONTENT_LABEL</base> |
47 |
- <trans> |
48 |
- Content |
49 |
- </trans> |
50 |
- </entry> |
51 |
- <entry> |
52 |
<base>DOMAIN_NAME_VALIDATION_ERROR</base> |
53 |
<trans> |
54 |
Error: unexpected or missing characters in domain name |
55 |
@@ -181,10 +151,6 @@ |
56 |
until the web server restart is complete. |
57 |
</trans> |
58 |
</entry> |
59 |
- <entry> |
60 |
- <base>Domains</base> |
61 |
- <trans>Domains</trans> |
62 |
- </entry> |
63 |
|
64 |
<entry> |
65 |
<base>DESC_CORPORATE_DNS_CURRENT</base> |
66 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-domains-1.4.0/root/etc/e-smith/web/functions/domains mezzanine_patched_e-smith-domains-1.4.0/root/etc/e-smith/web/functions/domains |
67 |
--- e-smith-domains-1.4.0/root/etc/e-smith/web/functions/domains 2008-04-27 00:29:49.000000000 +0200 |
68 |
+++ mezzanine_patched_e-smith-domains-1.4.0/root/etc/e-smith/web/functions/domains 2008-04-27 00:28:04.000000000 +0200 |
69 |
@@ -3,7 +3,7 @@ |
70 |
# vim: ts=4 sw=4 et: |
71 |
#---------------------------------------------------------------------- |
72 |
# heading : Configuration |
73 |
-# description : Domains |
74 |
+# description : DOMAINS |
75 |
# navigation : 6000 6600 |
76 |
#---------------------------------------------------------------------- |
77 |
#---------------------------------------------------------------------- |
78 |
@@ -91,18 +91,18 @@ |
79 |
<description>CREATE_TITLE</description> |
80 |
|
81 |
<field type="text" id="Domain" validation="validate_Domain"> |
82 |
- <label>DOMAIN_NAME_LABEL</label> |
83 |
+ <label>DOMAIN_NAME</label> |
84 |
</field> |
85 |
|
86 |
<field type="text" id="Description" validation="nonblank"> |
87 |
- <label>DESCRIPTION_LABEL</label> |
88 |
+ <label>DESCRIPTION_BRIEF</label> |
89 |
</field> |
90 |
|
91 |
<field type="select" id="Content" |
92 |
options="get_content_options()" |
93 |
value="get_content_value()"> |
94 |
|
95 |
- <label>CONTENT_LABEL</label> |
96 |
+ <label>CONTENT</label> |
97 |
<description>CONTENT_FIELD_DESCRIPTION</description> |
98 |
</field> |
99 |
|
100 |
@@ -124,20 +124,20 @@ |
101 |
<description>MODIFY_TITLE</description> |
102 |
|
103 |
<field type="literal" id="Domain" > |
104 |
- <label>DOMAIN_NAME_LABEL</label> |
105 |
+ <label>DOMAIN_NAME</label> |
106 |
</field> |
107 |
|
108 |
<field type="text" id="Description" |
109 |
value="get_description_value()" |
110 |
validation="nonblank"> |
111 |
- <label>DESCRIPTION_LABEL</label> |
112 |
+ <label>DESCRIPTION_BRIEF</label> |
113 |
</field> |
114 |
|
115 |
<field type="select" id="Content" |
116 |
options="get_content_options()" |
117 |
value="get_content_value()"> |
118 |
|
119 |
- <label>CONTENT_LABEL</label> |
120 |
+ <label>CONTENT</label> |
121 |
<description>CONTENT_FIELD_DESCRIPTION</description> |
122 |
</field> |
123 |
|
124 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-domains-1.4.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/domains.pm mezzanine_patched_e-smith-domains-1.4.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/domains.pm |
125 |
--- e-smith-domains-1.4.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/domains.pm 2008-04-27 00:29:49.000000000 +0200 |
126 |
+++ mezzanine_patched_e-smith-domains-1.4.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/domains.pm 2008-04-27 00:27:02.000000000 +0200 |
127 |
@@ -124,10 +124,10 @@ |
128 |
|
129 |
field_attr => { |
130 |
Domain => { label => |
131 |
- $self->localise('DOMAIN_NAME_LABEL') }, |
132 |
+ $self->localise('DOMAIN_NAME') }, |
133 |
Description => { label => |
134 |
- $self->localise('DESCRIPTION_LABEL') }, |
135 |
- Content => { label => $self->localise('CONTENT_LABEL') }, |
136 |
+ $self->localise('DESCRIPTION_BRIEF') }, |
137 |
+ Content => { label => $self->localise('CONTENT') }, |
138 |
Nameservers => { label => $self->localise('LABEL_NAMESERVERS') }, |
139 |
Modify => { label => $self->localise('MODIFY'), |
140 |
link => \&modify_link }, |