2006/unicorn/WebContent/WEB-INF/resources/templates text.vm,1.4,1.5

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

Modified Files:
	text.vm 
Log Message:
completed internationalization

Index: text.vm
===================================================================
RCS file: /sources/public/2006/unicorn/WebContent/WEB-INF/resources/templates/text.vm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- text.vm	28 Sep 2009 16:40:48 -0000	1.4
+++ text.vm	1 Oct 2009 10:01:03 -0000	1.5
@@ -29,25 +29,25 @@
 #set ($errorCount = $observation.getErrorCount())
 #set ($warningCount = $observation.getWarningCount())
 ==================================================================================================================================================
-=> #if($observation.isPassed())$test_ok_1#else$test_fail_1#end $unicorncall.getObserverName($observationName, $lang)#if($observation.Rating) ($observation.Rating/100)#end
+#if($observation.isPassed())$test_ok#else$test_fail#end $unicorncall.getObserverName($observationName, $lang)#if($observation.Rating) ($observation.Rating/100)#end
 
-#if($infoCount && $infoCount > 0)   Infos: $infoCount
-#end#if($errorCount && $errorCount > 0)   Errors: $errorCount
-#end#if($warningCount && $warningCount > 0)   Warnings: $warningCount
-#end#if($observation.getFilteredRequestUri())   Direct Link: $observation.getFilteredRequestUri()
-#else   Direct Link: $observation.getBaseURI($observationName)#end
+#if($infoCount && $infoCount > 0)$info_label: $infoCount
+#end#if($errorCount && $errorCount > 0)$error_label: $errorCount
+#end#if($warningCount && $warningCount > 0)$warning_label: $warningCount
+#end#if($observation.getFilteredRequestUri())$direct_link_label: $observation.getFilteredRequestUri()
+#{else}$direct_link_label: $observation.getBaseURI($observationName)#end
 #if ($infoCount && $infoCount > 0)
 --------------------------------------------------------------------------------------------------------------------------------------------------
-Infos ($infoCount)
+$info_label ($infoCount)
 --------------------------------------------------------------------------------------------------------------------------------------------------
 #foreach($result in $observation.getResultsList())
 #if(!$result.Infos.isEmpty())
-#if ($unicorncall.getInputMethod() == "URI")=> URI : $result.Uri#end
-#if ($unicorncall.getInputMethod() == "UPLOAD")=> File : $result.Uri#end
-#if ($unicorncall.getInputMethod() == "DIRECT")=> File : Direct Input#end
+#if ($unicorncall.getInputMethod() == "URI")=> $uri_token: $result.Uri#end
+#if ($unicorncall.getInputMethod() == "UPLOAD")=> $file_token: $result.Uri#end
+#if ($unicorncall.getInputMethod() == "DIRECT")=> $submitted_file#end
 
 #foreach($info in $result.Infos)
-   -#if($info.Line) Line:$info.Line#end#if($info.Column) Column:$info.Column#end#if($info.Context) Context:$info.Context#end
+   -#if($info.Line) $line_token:$info.Line#end#if($info.Column) $column_token:$info.Column#end#if($info.Context) $context_token:$info.Context#end
 #if ($info.Line || $info.Column || $info.Context)
 
     #end
@@ -66,16 +66,16 @@
 #end
 #if ($errorCount && $errorCount > 0)
 --------------------------------------------------------------------------------------------------------------------------------------------------
-Errors ($errorCount)
+$error_label ($errorCount)
 --------------------------------------------------------------------------------------------------------------------------------------------------
 #foreach($result in $observation.getResultsList())
 #if(!$result.Errors.isEmpty())
-#if ($unicorncall.getInputMethod() == "URI")=> URI : $result.Uri#end
-#if ($unicorncall.getInputMethod() == "UPLOAD")=> File : $result.Uri#end
-#if ($unicorncall.getInputMethod() == "DIRECT")=> File : Direct Input#end
+#if ($unicorncall.getInputMethod() == "URI")=> $uri_token: $result.Uri#end
+#if ($unicorncall.getInputMethod() == "UPLOAD")=> $file_token: $result.Uri#end
+#if ($unicorncall.getInputMethod() == "DIRECT")=> $submitted_file#end
 
 #foreach($error in $result.Errors)
-   -#if($error.Line) Line:$error.Line#end#if($error.Column) Column:$error.Column#end#if($error.Context) Context:$error.Context#end
+   -#if($error.Line) $line_token:$error.Line#end#if($error.Column) $column_token:$error.Column#end#if($error.Context) $context_token:$error.Context#end
 #if ($error.Line || $error.Column || $error.Context)
 
     #end
@@ -94,16 +94,16 @@
 #end
 #if ($warningCount && $warningCount > 0)
 --------------------------------------------------------------------------------------------------------------------------------------------------
-Warnings ($warningCount)
+$warning_label ($warningCount)
 --------------------------------------------------------------------------------------------------------------------------------------------------
 #foreach($result in $observation.getResultsList())
 #if(!$result.Warnings.isEmpty())
-#if ($unicorncall.getInputMethod() == "URI")=> URI : $result.Uri#end
-#if ($unicorncall.getInputMethod() == "UPLOAD")=> File : $result.Uri#end
-#if ($unicorncall.getInputMethod() == "DIRECT")=> File : Direct Input#end
+#if ($unicorncall.getInputMethod() == "URI")=> $uri_token: $result.Uri#end
+#if ($unicorncall.getInputMethod() == "UPLOAD")=> $file_token: $result.Uri#end
+#if ($unicorncall.getInputMethod() == "DIRECT")=> $submitted_file#end
 
 #foreach($warning in $result.Warnings)
-   -#if($warning.Line) Line:$warning.Line#end#if($warning.Column) Column:$warning.Column#end#if($warning.Context) Context:$warning.Context#end
+   -#if($warning.Line) $line_token:$warning.Line#end#if($warning.Column) $column_token:$warning.Column#end#if($warning.Context) $context_token:$warning.Context#end
 #if ($warning.Line || $warning.Column || $warning.Context)
 
     #end

Received on Thursday, 1 October 2009 10:01:07 UTC