Sort formatting for english lex and add localise to tables columns

Templates/html_controls.html.ep.xml

@@ -28,7 +28,7 @@
 
 	<Date><![CDATA[
 		<span class=label>
-			%=$%=l('${prefix}_${Label}')
+			%=l('${prefix}_${Label}')
 		</span><span class=data>
 			%=date_field '${Name}' =>$$${Name}, pattern=>${regexp | .*}
 		</span><br>
@@ -44,12 +44,12 @@
 	]]></Textinput>
 
 	<SubHeader><![CDATA[
-		<h2>${value}</h2>]]>
+		<h2><%=l('${value}')%></h2>]]>
 	</SubHeader>
 	
 	<Paragraph><![CDATA[
 		<p>
-			%= l('${prefix}_${value}')
+			%= l('${value}')
 		</p>
 	]]></Paragraph>
 
@@ -69,7 +69,7 @@
 	
 	<url><![CDATA[
 		<p><span class=label>
-			%=l('${prefix}_${Label}')
+			%=l('${Label}')
 		</span><span class=data>
 		</span>span></p>
 		]]>
@@ -77,7 +77,7 @@
 
 	<tel><![CDATA[
 		<p><span class=label>
-			%=l('${prefix}_${Label}')
+			%=l('${Label}')
 		</span><span class=data>
 		</span>span></p>
 		]]>
@@ -85,7 +85,7 @@
 
 	<email><![CDATA[
 		<p><span class=label>
-			%=l('${prefix}_${Label}')
+			%=l('${Label}')
 		</span><span class=data>
 		</span>span></p>
 		]]>
@@ -93,7 +93,7 @@
 
 	<password><![CDATA[
 		<p><span class=label>
-			%=l('${prefix}_${Label}')
+			%=l('${Label}')
 		</span><span class=data>
 		</span>span></p>
 		]]>
@@ -103,7 +103,7 @@
 		<br /><table class="sme-border TableSort">
 			<thead>
 				<tr><tal:block tal:repeat="ColHead TopHeadings">
-					<th class='sme-border'>${ColHead}</th></tal:block>
+					<th class='sme-border'><%=l('${ColHead}')%></th></tal:block>
 				</tr>
 			</thead>
 			<tbody>