# HG changeset patch
# User František Kučera <franta-hg@frantovo.cz>
# Date 1267110042 -3600
# Node ID 77c8271add7d80bf7367f95f6c821a011e3b0a0c
# Parent  2c3451cc396c76c5c12a63c86dc923cf38e9a3c4
Doplnění překladů + lokalizace chybových stránek.

diff -r 2c3451cc396c -r 77c8271add7d java/nekurak.net-web/src/java/cz/frantovo/nekurak/preklady_cs.properties
--- a/java/nekurak.net-web/src/java/cz/frantovo/nekurak/preklady_cs.properties	Thu Feb 25 09:10:01 2010 +0100
+++ b/java/nekurak.net-web/src/java/cz/frantovo/nekurak/preklady_cs.properties	Thu Feb 25 16:00:42 2010 +0100
@@ -2,10 +2,42 @@
 
 nazev=Neku\u0159\u00E1k.net
 popis=Datab\u00E1ze neku\u0159\u00E1ck\u00FDch restaurac\u00ED.
+licence=\u00A9 2010 nekurak.net. Licence: Affero GPL.
 
-odradkovani=Prvn\u00ED \u0159\u00E1dek\nDruh\u00FD \u0159\u00E1dek
-dlouhyRadek=n\u011Bjak\u00FD stra\u0161n\u011B \
-dlouh\u00FD text
-dalsiKlic=hodnota
+uvod=\u00DAvod
+prihlasitSe=P\u0159ihl\u00E1sit se
+odhlasitSe=Odhl\u00E1sit se
+pridatPodnik=P\u0159idat podnik
+prihlasenyUzivatel=P\u0159ihl\u00E1\u0161en\u00FD u\u017Eivatel
 
-pocetEmailu={0,choice,0#Nem\u00E1te \u017E\u00E1dnou novou zpr\u00E1vu.|1#M\u00E1te jednu nep\u0159e\u010Dtenou zpr\u00E1vu.|2#M\u00E1te {0} nep\u0159e\u010Dten\u00E9 zpr\u00E1vy.|4<M\u00E1te {0} nep\u0159e\u010Dten\u00FDch zpr\u00E1v.}
+chybovaStranka.404.nazev=404 Str\u00E1nka nenalezena
+chybovaStranka.404.popis=Takovou str\u00E1nku tu bohu\u017Eel nem\u00E1me.
+chybovaStranka.500.nazev=500 Intern\u00ED chyba serveru
+chybovaStranka.500.popis=N\u011Bco se bohu\u017Eel nepovedlo.
+
+uvod.naposledyPridanePodniky=Naposledy p\u0159idan\u00E9 podniky
+uvod.www=www str\u00E1nka
+uvod.adresa=Adresa
+
+
+prihlaseni.odhlaseniUspesne=Odhl\u00E1\u0161en\u00ED prob\u011Bhlo \u00FAsp\u011B\u0161n\u011B.
+prihlaseni.nadpis=P\u0159ihl\u00E1\u0161en\u00ED
+prihlaseni.zadejte=Zadejte jm\u00E9no a heslo.
+prihlaseni.chyba=Nespr\u00E1vn\u00E9 jm\u00E9no nebo heslo, zkuste to pros\u00EDm znovu.
+prihlaseni.jmeno=Jm\u00E9no
+prihlaseni.heslo=Heslo
+prihlaseni.tlacitko=P\u0159ihl\u00E1sit se
+
+pridatPodnik.nadpis=P\u0159id\u00E1n\u00ED nov\u00E9ho podniku
+pridatPodnik.bylPridan=Podnik byl \u00FAsp\u011B\u0161n\u011B p\u0159id\u00E1n.
+pridatPodnik.tlacitko=P\u0159idat podnik
+
+dto.podnik.nazev=N\u00E1zev
+dto.podnik.popis=Popis
+dto.podnik.url=URL
+dto.podnik.url.tip=www str\u00E1nka
+dto.podnik.datum=Datum
+dto.podnik.ulice=Ulice
+dto.podnik.cisloPopisne=\u010D.p.
+dto.podnik.cisloPopisne.tip=\u010D\u00EDslo popisn\u00E9
+dto.podnik.mesto=M\u011Bsto
diff -r 2c3451cc396c -r 77c8271add7d java/nekurak.net-web/src/java/cz/frantovo/nekurak/preklady_en.properties
--- a/java/nekurak.net-web/src/java/cz/frantovo/nekurak/preklady_en.properties	Thu Feb 25 09:10:01 2010 +0100
+++ b/java/nekurak.net-web/src/java/cz/frantovo/nekurak/preklady_en.properties	Thu Feb 25 16:00:42 2010 +0100
@@ -2,10 +2,41 @@
 
 nazev=Neku\u0159\u00E1k.net
 popis=Database of nonsmoking restaurants.
+licence=\u00A9 2010 nekurak.net. License: Affero GPL.
 
-odradkovani=First row\nSecond row
-dlouhyRadek=some very \
-long row
-dalsiKlic=value
+chybovaStranka.404.nazev=404 Page not found
+chybovaStranka.404.popis=Sorry, we do not have that page here.
+chybovaStranka.500.nazev=500 Internal server error
+chybovaStranka.500.popis=Sorry, something went bad.
 
-pocetEmailu={0,choice,0#You do not have any new mail.|1#You have one new mail.|1<You have {0} new mails.}
+uvod=Overview
+prihlasitSe=Log in
+odhlasitSe=Log out
+pridatPodnik=Add place
+prihlasenyUzivatel=Your username
+
+uvod.naposledyPridanePodniky=Recently added places
+uvod.www=web page
+uvod.adresa=Address
+
+prihlaseni.odhlaseniUspesne=Logged out successfully.
+prihlaseni.nadpis=Log in
+prihlaseni.zadejte=Type your name and password.
+prihlaseni.chyba=Wrong name or password, try again please.
+prihlaseni.jmeno=Name
+prihlaseni.heslo=Password
+prihlaseni.tlacitko=Log in
+
+pridatPodnik.nadpis=Adding new place
+pridatPodnik.bylPridan=Place was added successfully.
+pridatPodnik.tlacitko=Add place
+
+dto.podnik.nazev=Name
+dto.podnik.popis=Description
+dto.podnik.url=URL
+dto.podnik.url.tip=web page
+dto.podnik.datum=Date
+dto.podnik.ulice=Street
+dto.podnik.cisloPopisne=no.
+dto.podnik.cisloPopisne.tip=street number
+dto.podnik.mesto=City
diff -r 2c3451cc396c -r 77c8271add7d java/nekurak.net-web/web/WEB-INF/casti/pridatPodnik.jsp
--- a/java/nekurak.net-web/web/WEB-INF/casti/pridatPodnik.jsp	Thu Feb 25 09:10:01 2010 +0100
+++ b/java/nekurak.net-web/web/WEB-INF/casti/pridatPodnik.jsp	Thu Feb 25 16:00:42 2010 +0100
@@ -8,26 +8,28 @@
     <jsp:useBean id="podnik" class="cz.frantovo.nekurak.dto.Podnik" scope="request"/>
     <jsp:useBean id="pridatPodnik" class="cz.frantovo.nekurak.web.PridatPodnik" scope="request"/>
 
-    <h1>Přidání nového podniku</h1>
+    <h1><fmt:message key="pridatPodnik.nadpis"/></h1>
 
     <c:choose>
 	<c:when test="${param.akcePridat == 'pridej'}">
 	    <jsp:setProperty name="podnik" property="*"/>
 	    <jsp:setProperty name="pridatPodnik" property="podnik" value="${podnik}"/>
 	    <c:if test="${pridatPodnik.pridano}">
-		<p>Podnik byl přidán.</p>
+		<p><fmt:message key="pridatPodnik.bylPridan"/></p>
 	    </c:if>
 	</c:when>
 	<c:otherwise>
 	    <form method="post" action="?akce=pridatPodnik&amp;amp;akcePridat=pridej">
 		<fieldset>
-		    <label>Název: <input type="text" name="nazev" maxlength="255"/></label><br/>
-		    <label>Popis: <input type="text" name="popis" maxlength="255"/></label><br/>
-		    <label title="www stránka">URL: <input type="text" name="url" maxlength="255"/></label><br/>
-		    <label>Ulice: <input type="text" name="ulice" maxlength="64"/></label><br/>
-		    <label title="číslo popisné">č.p.: <input type="text" name="cisloPopisne" maxlength="5"/></label><br/>
-		    <label>Město: <input type="text" name="mesto" maxlength="64"/></label><br/>
-		    <button value="submit">Přidat podnik</button>
+		    <label><fmt:message key="dto.podnik.nazev"/>: <input type="text" name="nazev" maxlength="255"/></label><br/>
+		    <label><fmt:message key="dto.podnik.popis"/>: <input type="text" name="popis" maxlength="255"/></label><br/>
+		    <fmt:message key="dto.podnik.url.tip" var="urlTip"/>
+		    <label title="${urlTip}"><fmt:message key="dto.podnik.url"/>: <input type="text" name="url" maxlength="255"/></label><br/>
+		    <label><fmt:message key="dto.podnik.ulice"/>: <input type="text" name="ulice" maxlength="64"/></label><br/>
+		    <fmt:message key="dto.podnik.cisloPopisne.tip" var="cisloPopisneTip"/>
+		    <label title="${cisloPopisneTip}"><fmt:message key="dto.podnik.cisloPopisne"/>: <input type="text" name="cisloPopisne" maxlength="5"/></label><br/>
+		    <label><fmt:message key="dto.podnik.mesto"/>: <input type="text" name="mesto" maxlength="64"/></label><br/>
+		    <button value="submit"><fmt:message key="pridatPodnik.tlacitko"/></button>
 		</fieldset>
 	    </form>
 	</c:otherwise>
diff -r 2c3451cc396c -r 77c8271add7d java/nekurak.net-web/web/WEB-INF/casti/prihlaseni.jsp
--- a/java/nekurak.net-web/web/WEB-INF/casti/prihlaseni.jsp	Thu Feb 25 09:10:01 2010 +0100
+++ b/java/nekurak.net-web/web/WEB-INF/casti/prihlaseni.jsp	Thu Feb 25 16:00:42 2010 +0100
@@ -11,21 +11,21 @@
 
     <c:choose>
 	<c:when test="${param.odhlasit == 'ano'}">
-	    <p>Odhlášení proběhlo úspěšně</p>
+	    <p><fmt:message key="prihlaseni.odhlaseniUspesne"/></p>
 	</c:when>
 	<c:otherwise>
-	    <h1>Přihlášení</h1>
-	    <p>Zadejte jméno a heslo</p>
+	    <h1><fmt:message key="prihlaseni.nadpis"/></h1>
+	    <p><fmt:message key="prihlaseni.zadejte"/></p>
 
 	    <c:if test="${param.chyba == 'ano'}">
-		<p>Nesprávné jméno nebo heslo, zkuste to prosím znovu.</p>
+		<p><fmt:message key="prihlaseni.chyba"/></p>
 	    </c:if>
 
 	    <form method="post" action="j_security_check">
 		<fieldset>
-		    <label>Jméno: <input type="text" name="j_username"/></label><br/>
-		    <label>Heslo: <input type="password" name="j_password"/></label><br/>
-		    <button value="submit">Přihlásit se</button>
+		    <label><fmt:message key="prihlaseni.jmeno"/>: <input type="text" name="j_username"/></label><br/>
+		    <label><fmt:message key="prihlaseni.heslo"/>: <input type="password" name="j_password"/></label><br/>
+		    <button value="submit"><fmt:message key="prihlaseni.tlacitko"/></button>
 		</fieldset>
 	    </form>
 	</c:otherwise>
diff -r 2c3451cc396c -r 77c8271add7d java/nekurak.net-web/web/WEB-INF/casti/uvod.jsp
--- a/java/nekurak.net-web/web/WEB-INF/casti/uvod.jsp	Thu Feb 25 09:10:01 2010 +0100
+++ b/java/nekurak.net-web/web/WEB-INF/casti/uvod.jsp	Thu Feb 25 16:00:42 2010 +0100
@@ -7,20 +7,20 @@
 
     <jsp:useBean id="uvod" class="cz.frantovo.nekurak.web.Uvod" scope="request"/>
 
-    <p>Naposledy přidané podniky:</p>
+    <p><fmt:message key="uvod.naposledyPridanePodniky"/>:</p>
 
     <c:forEach var="p" items="${uvod.podniky}">
 	<div class="podnik">
 	    <a href="?akce=detail&amp;amp;podnik=${p.id}"><h2><c:out value="${p.nazev}"/></h2></a>
 	    <p><c:out value="${p.popis}"/></p>
 	    <p>
-	    Adresa:<br/>
+	    <fmt:message key="uvod.adresa"/>:<br/>
 		<c:out value="${p.ulice}"/>&amp;#160;
 		<c:out value="${p.cisloPopisne}"/><br/>
 		<c:out value="${p.mesto}"/>
 	    </p>
 	    <c:if test="${p.url != null}">
-		<p><a href="${fn:escapeXml(p.url)}">www stránka</a></p>
+		<p><a href="${fn:escapeXml(p.url)}"><fmt:message key="uvod.www"/></a></p>
 	    </c:if>
 	</div>
     </c:forEach>
diff -r 2c3451cc396c -r 77c8271add7d java/nekurak.net-web/web/WEB-INF/chyby/404.jsp
--- a/java/nekurak.net-web/web/WEB-INF/chyby/404.jsp	Thu Feb 25 09:10:01 2010 +0100
+++ b/java/nekurak.net-web/web/WEB-INF/chyby/404.jsp	Thu Feb 25 16:00:42 2010 +0100
@@ -1,20 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
-	  xmlns:c="http://java.sun.com/jsp/jstl/core"
+	  xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
 	  version="2.0">
-    <jsp:directive.page contentType="application/xhtml+xml" isErrorPage="true"/>
-    <jsp:output doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"
-		doctype-root-element="html"
-		omit-xml-declaration="false"/>
 
-    <html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-	    <title>404 Stránka nenalezena</title>
-	</head>
-	<body>
-	    <h1>404 Stránka nenalezena</h1>
-	    <p>Takovou stránku tu bohužel nemáme.</p>
-	</body>
-    </html>
+    <fmt:setBundle basename="cz.frantovo.nekurak.preklady" scope="application"/>
+
+    <fmt:message key="chybovaStranka.404.nazev" var="nazev"/>
+    <fmt:message key="chybovaStranka.404.popis" var="popis"/>
+    
+    <jsp:include page="sablona.jsp" flush="false">
+	<jsp:param name="nazev" value="${nazev}"/>
+	<jsp:param name="popis" value="${popis}"/>
+    </jsp:include>
 
 </jsp:root>
diff -r 2c3451cc396c -r 77c8271add7d java/nekurak.net-web/web/WEB-INF/chyby/500.jsp
--- a/java/nekurak.net-web/web/WEB-INF/chyby/500.jsp	Thu Feb 25 09:10:01 2010 +0100
+++ b/java/nekurak.net-web/web/WEB-INF/chyby/500.jsp	Thu Feb 25 16:00:42 2010 +0100
@@ -1,20 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
-	  xmlns:c="http://java.sun.com/jsp/jstl/core"
+	  xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
 	  version="2.0">
-    <jsp:directive.page contentType="application/xhtml+xml" isErrorPage="true"/>
-    <jsp:output doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"
-		doctype-root-element="html"
-		omit-xml-declaration="false"/>
 
-    <html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-	    <title>500 Interní chyba serveru</title>
-	</head>
-	<body>
-	    <h1>500 Interní chyba serveru</h1>
-	    <p>Něco se bohužel nepovedlo.</p>
-	</body>
-    </html>
+    <fmt:setBundle basename="cz.frantovo.nekurak.preklady" scope="application"/>
+
+    <fmt:message key="chybovaStranka.500.nazev" var="nazev"/>
+    <fmt:message key="chybovaStranka.500.popis" var="popis"/>
+    
+    <jsp:include page="sablona.jsp" flush="false">
+	<jsp:param name="nazev" value="${nazev}"/>
+	<jsp:param name="popis" value="${popis}"/>
+    </jsp:include>
 
 </jsp:root>
diff -r 2c3451cc396c -r 77c8271add7d java/nekurak.net-web/web/WEB-INF/chyby/sablona.jsp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/java/nekurak.net-web/web/WEB-INF/chyby/sablona.jsp	Thu Feb 25 16:00:42 2010 +0100
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
+	  version="2.0">
+    <jsp:directive.page contentType="application/xhtml+xml" isErrorPage="true"/>
+    <jsp:output doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"
+		doctype-root-element="html"
+		omit-xml-declaration="false"/>
+
+    <html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+	    <title>${param.nazev}</title>
+	</head>
+	<body>
+	    <h1>${param.nazev}</h1>
+	    <p>${param.popis}</p>
+	</body>
+    </html>
+
+</jsp:root>
diff -r 2c3451cc396c -r 77c8271add7d java/nekurak.net-web/web/WEB-INF/web.xml
--- a/java/nekurak.net-web/web/WEB-INF/web.xml	Thu Feb 25 09:10:01 2010 +0100
+++ b/java/nekurak.net-web/web/WEB-INF/web.xml	Thu Feb 25 16:00:42 2010 +0100
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
     <session-config>
-        <session-timeout>
-	    30
-	</session-timeout>
+        <session-timeout>30</session-timeout>
     </session-config>
+
     <welcome-file-list>
         <welcome-file>index.jsp</welcome-file>
     </welcome-file-list>
+
     <error-page>
         <!-- Stránka nenalezena -->
         <error-code>404</error-code>
@@ -18,11 +18,13 @@
         <error-code>500</error-code>
         <location>/WEB-INF/chyby/500.jsp</location>
     </error-page>
+    
     <context-param>
         <!-- Pro případ, že chybí hlavička „Accept-language“ v HTTP požadavku -->
         <param-name>javax.servlet.jsp.jstl.fmt.fallbackLocale</param-name>
         <param-value>cs</param-value>
     </context-param>
+
     <!--  <zabezpečení> -->
     <security-role>
         <role-name>opravneny</role-name>
@@ -45,4 +47,5 @@
 	</form-login-config>
     </login-config>
     <!--  </zabezpečení> -->
+
 </web-app>
diff -r 2c3451cc396c -r 77c8271add7d java/nekurak.net-web/web/index.jsp
--- a/java/nekurak.net-web/web/index.jsp	Thu Feb 25 09:10:01 2010 +0100
+++ b/java/nekurak.net-web/web/index.jsp	Thu Feb 25 16:00:42 2010 +0100
@@ -10,7 +10,7 @@
 
     <!-- <lokalizace> -->
     <c:if test="${param.jazyk != null}">
-	<fmt:setLocale value="${param.jazyk}"/>
+	<fmt:setLocale value="${param.jazyk}" scope="session"/>
     </c:if>
     <fmt:setBundle basename="cz.frantovo.nekurak.preklady" scope="application"/>
     <!-- </lokalizace> -->
@@ -44,16 +44,16 @@
 		</div>
 
 		<ul id="nabidka">
-		    <li><a href="?">Úvod</a></li>
+		    <li><a href="?"><fmt:message key="uvod"/></a></li>
 
 		    <c:choose>
 			<c:when test="${prihlasenyUzivatel == null}">
-			    <li><a href="?akce=prihlaseni">Přihlásit se</a></li>
+			    <li><a href="?akce=prihlaseni"><fmt:message key="prihlasitSe"/></a></li>
 			</c:when>
 			<c:otherwise>
-			    <li><a href="?akce=pridatPodnik">Přidat podnik</a></li>
-			    <li id="prihlasenyUzivatel">Přihlášený uživatel: ${pageContext.request.userPrincipal.name}</li>
-			    <li><a href="?akce=prihlaseni&amp;amp;odhlasit=ano">Odhlásit se</a></li>
+			    <li><a href="?akce=pridatPodnik"><fmt:message key="pridatPodnik"/></a></li>
+			    <li id="prihlasenyUzivatel"><fmt:message key="prihlasenyUzivatel"/>: ${prihlasenyUzivatel}</li>
+			    <li><a href="?akce=prihlaseni&amp;amp;odhlasit=ano"><fmt:message key="odhlasitSe"/></a></li>
 			</c:otherwise>
 		    </c:choose>
 
@@ -80,9 +80,9 @@
 
 		<div id="paticka">
 		    <p>
-			© 2010 nekurak.net. Licence: Affero GPL.
-			<a href="${pageContext.servletContext.contextPath}/nekurak.net-src.zip">nekurak.net-src.zip</a>
-			<a href="${pageContext.servletContext.contextPath}/nekurak.net-src.zip.SHA-512">.</a>
+			<fmt:message key="licence"/>
+			<a href="nekurak.net-src.zip">nekurak.net-src.zip</a>
+			<a href="nekurak.net-src.zip.SHA-512">.</a>
 		    </p>
 		</div>
 
diff -r 2c3451cc396c -r 77c8271add7d java/nekurak.net-web/web/styl.css
--- a/java/nekurak.net-web/web/styl.css	Thu Feb 25 09:10:01 2010 +0100
+++ b/java/nekurak.net-web/web/styl.css	Thu Feb 25 16:00:42 2010 +0100
@@ -104,4 +104,5 @@
 
 input	{
 	width:200px;
+	margin-left: 2px;
 }