2006/unicorn/WebContent/WEB-INF/resources/templates index.vm,1.12,1.13 xhtml10.vm,1.23,1.24

Update of /sources/public/2006/unicorn/WebContent/WEB-INF/resources/templates
In directory hutz:/tmp/cvs-serv31360/WebContent/WEB-INF/resources/templates

Modified Files:
	index.vm xhtml10.vm 
Log Message:
internationalized lots of strings

Index: index.vm
===================================================================
RCS file: /sources/public/2006/unicorn/WebContent/WEB-INF/resources/templates/index.vm,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- index.vm	30 Sep 2009 09:32:00 -0000	1.12
+++ index.vm	30 Sep 2009 13:43:13 -0000	1.13
@@ -19,7 +19,7 @@
 					<legend>$select-a-task</legend>
 					<div class="input">
 						<p>
-							<label><span>$task:</span>
+							<label><span>$task_label:</span>
 								<select name="${param_prefix}task" id="tasks">
 #foreach( $task in $tasklist )
 									<option value="$task.getID()" title="$task.getDescription($lang)" #if ($task == $current_task) selected="selected" #end>$task.getLongName("${lang}")</option>
@@ -39,7 +39,7 @@
 					<div class="input">
 						<p class="instructions">$instruction-by-uri</p>
 						<p>
-							<label title="$uri_title" for="ucn_uri"><span>$uri:</span>
+							<label title="$uri_title" for="ucn_uri"><span>$uri_label:</span>
 								<input type="text" name="${param_prefix}uri" id="ucn_uri" size="45" value="$!param_uri"/>
 							</label>
 						</p>
@@ -54,7 +54,7 @@
 					<div class="input">
 						<p class="instructions">$instruction-by-upload</p>
 						<p>
-							<label title="$instruction-by-upload" for="ucn_file"><span>$local_file:</span>
+							<label title="$instruction-by-upload" for="ucn_file"><span>$local_file_label:</span>
 								<input type="file" id="ucn_file" name="${param_prefix}file" size="30" />
 							</label>
 						</p>

Index: xhtml10.vm
===================================================================
RCS file: /sources/public/2006/unicorn/WebContent/WEB-INF/resources/templates/xhtml10.vm,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- xhtml10.vm	29 Sep 2009 10:17:09 -0000	1.23
+++ xhtml10.vm	30 Sep 2009 13:43:13 -0000	1.24
@@ -40,27 +40,27 @@
 <div class="observer section #if($observation.isPassed()) valid #else invalid #end" id="$observationName">
 	<h2 class="title">
 		<span class="icons">
-			#if ($infoCount && $infoCount > 0)<a class="infos" href="#${observationName}_info"><span class="legend">Infos:</span><span class="count">$infoCount</span></a> #end
-			#if ($errorCount && $errorCount > 0)<a class="errors" href="#${observationName}_error"><span class="legend">Errors:</span><span class="count">$errorCount</span></a> #end
-			#if ($warningCount && $warningCount > 0)<a class="warnings" href="#${observationName}_warning"><span class="legend">Warnings:</span><span class="count">$warningCount</span></a> #end
-			<a class="anchor smooth" href="#$observationName" title="anchor to this observation">[anchor]</a>
+			#if ($infoCount && $infoCount > 0)<a class="infos" href="#${observationName}_info" title="$info_label:$infoCount"><span class="legend">$info_label</span><span class="count">$infoCount</span></a> #end
+			#if ($errorCount && $errorCount > 0)<a class="errors" href="#${observationName}_error" title="$error_label:$errorCount"><span class="legend">$error_label</span><span class="count">$errorCount</span></a> #end
+			#if ($warningCount && $warningCount > 0)<a class="warnings" href="#${observationName}_warning" title="$warning_label:$warningCount"><span class="legend">$warning_label</span><span class="count">$warningCount</span></a> #end
+			<a class="anchor smooth" href="#$observationName" title="$anchor_observation">a</a>
 		</span>
 		#if($observation.isPassed())
-		$test_ok_1
+		$test_ok
 		#else
-		$test_fail_1
+		$test_fail
 		#end
 		<span class="name">$unicorncall.getObserverName($observationName, $lang) #if ($observation.Rating) ($observation.Rating/100) #end</span>
-		#if ($observation.getFilteredRequestUri())<a class="direct_link" href="$observation.getFilteredRequestUri()" title="revalidate this document on the validator website">[direct link]</a>
-		#else <a class="direct_link" href="$observation.getBaseURI($observationName)" title="link to this validator website">[direct link]</a>#end
+		#if ($observation.getFilteredRequestUri())<a class="direct_link" href="$observation.getFilteredRequestUri()" title="direct_link_title_1">$direct_link_label</a>
+		#else <a class="direct_link" href="$observation.getBaseURI($observationName)" title="direct_link_title_2">$direct_link_label</a>#end
 	</h2>
 	
 	<div class="results block">
 	#if ($infoCount && $infoCount > 0)
 		<div class="section infos" id="${observationName}_info">
 			<h3 class="title">
-				<a class="smooth anchor" title="anchor to this uri" href="#${observationName}_info">[anchor]</a>
-				Infos ($infoCount)
+				<a class="smooth anchor" title="$anchor_uri" href="#${observationName}_info">a</a>
+				$info_label ($infoCount)
 			</h3>
 			<div class="block result">
 				<table>
@@ -71,18 +71,18 @@
 						#set ($i = $i + 1)
 						<tr>
 							<td colspan="4" class="uri" id="${observationName}_info_${i}">
-							#if ($unicorncall.getInputMethod() == "URI")<span>URI : </span><a href="$result.Uri">$result.Uri</a>#end
-							#if ($unicorncall.getInputMethod() == "UPLOAD")<span>File : </span>$result.Uri#end
-							#if ($unicorncall.getInputMethod() == "DIRECT")<span>File : </span>Direct Input#end
+							#if ($unicorncall.getInputMethod() == "URI")<span>$uri_token</span><a href="$result.Uri">$result.Uri</a>#end
+							#if ($unicorncall.getInputMethod() == "UPLOAD")<span>$file_token</span>$result.Uri#end
+							#if ($unicorncall.getInputMethod() == "DIRECT")<span>$submitted_file</span>#end
 							</td>
-							<td class="anchor uri"><a class="smooth" title="anchor to this uri" href="#${observationName}_info_${i}">[anchor]</a></td>
+							<td class="anchor uri"><a class="smooth" title="$anchor_uri" href="#${observationName}_info_${i}">a</a></td>
 						</tr>
 #foreach($info in $result.Infos)
 #set ($messageId = "${observationName}_info_${i}_$velocityCount")
 						<tr>
-							<td class="linenumber" title="#if($info.Line)Line:$info.Line#end">#if($info.Line)$info.Line#end</td>
-							<td class="colnumber" title="#if($info.Column)Column:$info.Column#end">#if($info.Column)$info.Column #end</td>
-							<td class="codeContext"> #if($info.Context) $info.Context #end </td>
+							<td class="linenumber" title="#if($info.Line)$line_token: $info.Line#end">$!info.Line</td>
+							<td class="colnumber" title="#if($info.Column)$column_token: $info.Column#end">$!info.Column</td>
+							<td class="codeContext" title="$context_token">$!{info.Context}</td>
 							<td class="info" id="$messageId">
 							#foreach($message in $info.Message)<span class="msg">$message</span>#end
 							#foreach($longMessage in $info.Longmessage)
@@ -93,7 +93,7 @@
 							</p>
 							#end
 							</td>
-							<td class="anchor"><a class="smooth" title="anchor to this message" href="#$messageId">[anchor]</a></td>
+							<td class="anchor"><a class="smooth" title="$anchor_message" href="#$messageId">a</a></td>
 						</tr>
 #end
 						#end
@@ -107,8 +107,8 @@
 	#if ($errorCount && $errorCount > 0)
 		<div class="section errors" id="${observationName}_error">
 			<h3 class="title">
-				<a class="smooth anchor" title="anchor to this uri" href="#${observationName}_error">[anchor]</a>
-				Errors ($errorCount)
+				<a class="smooth anchor" title="$anchor_uri" href="#${observationName}_error">a</a>
+				$error_label ($errorCount)
 			</h3>
 			<div class="block result">
 				<table>
@@ -119,18 +119,18 @@
 						#set ($i = $i + 1)
 						<tr>
 							<td colspan="4" class="uri" id="${observationName}_error_${i}">
-							#if ($unicorncall.getInputMethod() == "URI")<span>URI : </span><a href="$result.Uri">$result.Uri</a>#end
-							#if ($unicorncall.getInputMethod() == "UPLOAD")<span>File : </span>$result.Uri#end
-							#if ($unicorncall.getInputMethod() == "DIRECT")<span>File : </span>Direct Input#end
+							#if ($unicorncall.getInputMethod() == "URI")<span>$uri_token</span><a href="$result.Uri">$result.Uri</a>#end
+							#if ($unicorncall.getInputMethod() == "UPLOAD")<span>$file_token</span>$result.Uri#end
+							#if ($unicorncall.getInputMethod() == "DIRECT")<span>$submitted_file</span>#end
 							</td>
-							<td class="anchor uri"><a class="smooth" title="anchor to this uri" href="#${observationName}_error_${i}">[anchor]</a></td>
+							<td class="anchor uri"><a class="smooth" title="$anchor_uri" href="#${observationName}_error_${i}">a</a></td>
 						</tr>
 #foreach($error in $result.Errors)
 #set ($messageId = "${observationName}_error_${i}_$velocityCount")
 						<tr>
-							<td class="linenumber" title="#if($error.Line)Line: $error.Line#end">#if($error.Line)$error.Line#end</td>
-							<td class="colnumber" title="#if($error.Column)Column: $error.Column#end">#if($error.Column)$error.Column #end</td>
-							<td class="codeContext">#if($error.Context) $error.Context #end</td>
+							<td class="linenumber" title="#if($error.Line)$line_token: $error.Line#end">$!error.Line</td>
+							<td class="colnumber" title="#if($error.Column)$column_token: $error.Column#end">$!error.Column</td>
+							<td class="codeContext" title="$context_token">$!error.Context</td>
 							<td class="error" id="$messageId">
 							#foreach($message in $error.Message)<span class="msg">$message</span>#end
 							#foreach($longMessage in $error.Longmessage)
@@ -141,7 +141,7 @@
 							</p>
 							#end
 							</td>
-							<td class="anchor"><a class="smooth" title="anchor to this message" href="#$messageId">[anchor]</a></td>
+							<td class="anchor"><a class="smooth" title="$anchor_message" href="#$messageId">a</a></td>
 						</tr>
 #end
 						#end
@@ -155,8 +155,8 @@
 	#if ($warningCount && $warningCount > 0)
 		<div class="section warnings" id="${observationName}_warning">
 			<h3 class="title">
-				<a class="smooth anchor" title="anchor to this uri" href="#${observationName}_warning">[anchor]</a>
-				Warnings ($warningCount)
+				<a class="smooth anchor" title="$anchor_uri" href="#${observationName}_warning">a</a>
+				$warning_label ($warningCount)
 			</h3>
 			<div class="block result">
 				<table>
@@ -167,18 +167,18 @@
 						#set ($i = $i + 1)
 						<tr>
 							<td colspan="4" class="uri" id="${observationName}_warning_${i}">
-							#if ($unicorncall.getInputMethod() == "URI")<span>URI : </span><a href="$result.Uri">$result.Uri</a>#end
-							#if ($unicorncall.getInputMethod() == "UPLOAD")<span>File : </span>$result.Uri#end
-							#if ($unicorncall.getInputMethod() == "DIRECT")<span>File : </span>Direct Input#end
+							#if ($unicorncall.getInputMethod() == "URI")<span>$uri_token</span><a href="$result.Uri">$result.Uri</a>#end
+							#if ($unicorncall.getInputMethod() == "UPLOAD")<span>$file_token</span>$result.Uri#end
+							#if ($unicorncall.getInputMethod() == "DIRECT")<span>$submitted_file</span>#end
 							</td>
-							<td class="anchor uri"><a class="smooth" title="anchor to this uri" href="#${observationName}_warning_${i}">[anchor]</a></td>
+							<td class="anchor uri"><a class="smooth" title="$anchor_uri" href="#${observationName}_warning_${i}">a</a></td>
 						</tr>
 #foreach($warning in $result.Warnings)
 #set ($messageId = "${observationName}_warning_${i}_$velocityCount")
 						<tr>
-							<td class="linenumber" title="#if($warning.Line)Line: $warning.Line#end">#if($warning.Line)$warning.Line#end</td>
-							<td class="colnumber" title="#if($warning.Column)Column: $warning.Column#end">#if($warning.Column)$warning.Column #end</td>
-							<td class="codeContext">#if($warning.Context) $warning.Context #end</td>
+							<td class="linenumber" title="#if($warning.Line)$line_token: $warning.Line#end">$!warning.Line</td>
+							<td class="colnumber" title="#if($warning.Column)$column_token: $warning.Column#end">$!warning.Column</td>
+							<td class="codeContext" title="$context_token">$!warning.Context</td>
 							<td class="warning level$warning.getLevel()" id="$messageId">
 							#foreach($message in $warning.Message)<span class="msg">$message</span>#end
 							#foreach($longMessage in $warning.Longmessage)
@@ -189,7 +189,7 @@
 							</p>
 							#end
 							</td>
-							<td class="anchor"><a class="smooth" title="anchor to this message" href="#$messageId">[anchor]</a></td>
+							<td class="anchor"><a class="smooth" title="$anchor_message" href="#$messageId">a</a></td>
 						</tr>
 #end
 						#end
@@ -203,4 +203,4 @@
 </div>
 #end
 </div>
-#parse( 'includes/footer.vm' )
+#parse('includes/footer.vm')

Received on Wednesday, 30 September 2009 13:43:17 UTC