# HG changeset patch
# User František Kučera <franta-hg@frantovo.cz>
# Date 1272405853 -7200
# Node ID b139d35b4fafa4180f3c4dc58709bccf7172b32a
# Parent  401cc563a0c122d49e27e664b46aa58dc4a17165
Validní SVG ~ hlasovani-svg.jsp

diff -r 401cc563a0c1 -r b139d35b4faf java/nekurak.net-lib/src/cz/frantovo/nekurak/preklady_cs.properties
--- a/java/nekurak.net-lib/src/cz/frantovo/nekurak/preklady_cs.properties	Tue Apr 27 22:41:04 2010 +0200
+++ b/java/nekurak.net-lib/src/cz/frantovo/nekurak/preklady_cs.properties	Wed Apr 28 00:04:13 2010 +0200
@@ -76,4 +76,6 @@
 hlasovani.graf.nadpis=M\u011Blo by se tu
 hlasovani.graf.zadneHlasy=(zat\u00EDm nikdo nehlasoval)
 hlasovani.graf.popisSloupce=hlas\u016F: {0}
+hlasovani.graf.kourit=kou\u0159it
+hlasovani.graf.nekourit=nekou\u0159it
 hlasovani.TODO=TODO: lokalizovat Javascript
diff -r 401cc563a0c1 -r b139d35b4faf java/nekurak.net-web/web/WEB-INF/tags/nekurak/hlasovani.tag
--- a/java/nekurak.net-web/web/WEB-INF/tags/nekurak/hlasovani.tag	Tue Apr 27 22:41:04 2010 +0200
+++ b/java/nekurak.net-web/web/WEB-INF/tags/nekurak/hlasovani.tag	Wed Apr 28 00:04:13 2010 +0200
@@ -3,6 +3,8 @@
 	  xmlns:c="http://java.sun.com/jsp/jstl/core"
 	  xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
 	  xmlns:fn="http://java.sun.com/jsp/jstl/functions"
+	  xmlns:svg="http://www.w3.org/2000/svg"
+	  xmlns:xlink="http://www.w3.org/1999/xlink"
 	  version="2.0">
 
     <jsp:directive.attribute name="podnik" type="java.lang.Integer" required="true" description="ID podniku"/>
@@ -25,9 +27,11 @@
 
     <c:choose>
 	<c:when test="${svgUvnitrXhtml}">
-	    <svg width="200" height="200"
+	    <svg version="1.1"
+		 baseProfile="full"
 		 xmlns="http://www.w3.org/2000/svg"
-		 xmlns:xlink="http://www.w3.org/1999/xlink">
+		 xmlns:xlink="http://www.w3.org/1999/xlink"
+		 width="200" height="200">
 
 
 		<style type="text/css">
@@ -118,7 +122,7 @@
 		    <fmt:param value="${hlasuNe}"/>
 		</fmt:message>
 		<a xlink:href="javascript:hlasovani.hlasuj(${podnik}, false);" xlink:title="${hlasuNeLokalizace}">
-		    <text x="30" y="195" class="ne">nekouřit</text>
+		    <text x="30" y="195" class="ne"><fmt:message key="hlasovani.graf.nekourit"/></text>
 		    <rect x="30" y="${180 - hlasuNeVyska}" width="50" height="${hlasuNeVyska}" class="ne"/>
 		</a>
 
@@ -127,7 +131,7 @@
 		    <fmt:param value="${hlasuAno}"/>
 		</fmt:message>
 		<a xlink:href="javascript:hlasovani.hlasuj(${podnik}, true);" xlink:title="${hlasuAnoLokalizace}">
-		    <text x="130" y="195" class="ano">kouřit</text>
+		    <text x="130" y="195" class="ano"><fmt:message key="hlasovani.graf.kourit"/></text>
 		    <rect x="120" y="${180 - hlasuAnoVyska}" width="50" height="${hlasuAnoVyska}" class="ano"/>
 		</a>
 	    </svg>
diff -r 401cc563a0c1 -r b139d35b4faf java/nekurak.net-web/web/hlasovani-svg.jsp
--- a/java/nekurak.net-web/web/hlasovani-svg.jsp	Tue Apr 27 22:41:04 2010 +0200
+++ b/java/nekurak.net-web/web/hlasovani-svg.jsp	Wed Apr 28 00:04:13 2010 +0200
@@ -3,9 +3,13 @@
 	  xmlns:c="http://java.sun.com/jsp/jstl/core"
 	  xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
 	  xmlns:nk="urn:jsptagdir:/WEB-INF/tags/nekurak"
+	  xmlns:svg="http://www.w3.org/2000/svg"
+	  xmlns:xlink="http://www.w3.org/1999/xlink"
 	  version="2.0">
     <jsp:directive.page contentType="image/svg+xml"/>
 
+    <fmt:setBundle basename="cz.frantovo.nekurak.preklady" scope="application"/>
+
     <!-- na této úrovni nemusíme ošetřovat vstup – jako parametry projdou jen správné datové typy -->
     <nk:hlasovani svgUvnitrXhtml="true" hlasuAno="${param.hlasuAno}" hlasuNe="${param.hlasuNe}" podnik="${param.podnik}"/>