1.1 --- a/java/nekurak.net-web/src/java/cz/frantovo/nekurak/preklady_cs.properties Thu Feb 25 09:10:01 2010 +0100
1.2 +++ b/java/nekurak.net-web/src/java/cz/frantovo/nekurak/preklady_cs.properties Thu Feb 25 16:00:42 2010 +0100
1.3 @@ -2,10 +2,42 @@
1.4
1.5 nazev=Neku\u0159\u00E1k.net
1.6 popis=Datab\u00E1ze neku\u0159\u00E1ck\u00FDch restaurac\u00ED.
1.7 +licence=\u00A9 2010 nekurak.net. Licence: Affero GPL.
1.8
1.9 -odradkovani=Prvn\u00ED \u0159\u00E1dek\nDruh\u00FD \u0159\u00E1dek
1.10 -dlouhyRadek=n\u011Bjak\u00FD stra\u0161n\u011B \
1.11 -dlouh\u00FD text
1.12 -dalsiKlic=hodnota
1.13 +uvod=\u00DAvod
1.14 +prihlasitSe=P\u0159ihl\u00E1sit se
1.15 +odhlasitSe=Odhl\u00E1sit se
1.16 +pridatPodnik=P\u0159idat podnik
1.17 +prihlasenyUzivatel=P\u0159ihl\u00E1\u0161en\u00FD u\u017Eivatel
1.18
1.19 -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.}
1.20 +chybovaStranka.404.nazev=404 Str\u00E1nka nenalezena
1.21 +chybovaStranka.404.popis=Takovou str\u00E1nku tu bohu\u017Eel nem\u00E1me.
1.22 +chybovaStranka.500.nazev=500 Intern\u00ED chyba serveru
1.23 +chybovaStranka.500.popis=N\u011Bco se bohu\u017Eel nepovedlo.
1.24 +
1.25 +uvod.naposledyPridanePodniky=Naposledy p\u0159idan\u00E9 podniky
1.26 +uvod.www=www str\u00E1nka
1.27 +uvod.adresa=Adresa
1.28 +
1.29 +
1.30 +prihlaseni.odhlaseniUspesne=Odhl\u00E1\u0161en\u00ED prob\u011Bhlo \u00FAsp\u011B\u0161n\u011B.
1.31 +prihlaseni.nadpis=P\u0159ihl\u00E1\u0161en\u00ED
1.32 +prihlaseni.zadejte=Zadejte jm\u00E9no a heslo.
1.33 +prihlaseni.chyba=Nespr\u00E1vn\u00E9 jm\u00E9no nebo heslo, zkuste to pros\u00EDm znovu.
1.34 +prihlaseni.jmeno=Jm\u00E9no
1.35 +prihlaseni.heslo=Heslo
1.36 +prihlaseni.tlacitko=P\u0159ihl\u00E1sit se
1.37 +
1.38 +pridatPodnik.nadpis=P\u0159id\u00E1n\u00ED nov\u00E9ho podniku
1.39 +pridatPodnik.bylPridan=Podnik byl \u00FAsp\u011B\u0161n\u011B p\u0159id\u00E1n.
1.40 +pridatPodnik.tlacitko=P\u0159idat podnik
1.41 +
1.42 +dto.podnik.nazev=N\u00E1zev
1.43 +dto.podnik.popis=Popis
1.44 +dto.podnik.url=URL
1.45 +dto.podnik.url.tip=www str\u00E1nka
1.46 +dto.podnik.datum=Datum
1.47 +dto.podnik.ulice=Ulice
1.48 +dto.podnik.cisloPopisne=\u010D.p.
1.49 +dto.podnik.cisloPopisne.tip=\u010D\u00EDslo popisn\u00E9
1.50 +dto.podnik.mesto=M\u011Bsto
2.1 --- a/java/nekurak.net-web/src/java/cz/frantovo/nekurak/preklady_en.properties Thu Feb 25 09:10:01 2010 +0100
2.2 +++ b/java/nekurak.net-web/src/java/cz/frantovo/nekurak/preklady_en.properties Thu Feb 25 16:00:42 2010 +0100
2.3 @@ -2,10 +2,41 @@
2.4
2.5 nazev=Neku\u0159\u00E1k.net
2.6 popis=Database of nonsmoking restaurants.
2.7 +licence=\u00A9 2010 nekurak.net. License: Affero GPL.
2.8
2.9 -odradkovani=First row\nSecond row
2.10 -dlouhyRadek=some very \
2.11 -long row
2.12 -dalsiKlic=value
2.13 +chybovaStranka.404.nazev=404 Page not found
2.14 +chybovaStranka.404.popis=Sorry, we do not have that page here.
2.15 +chybovaStranka.500.nazev=500 Internal server error
2.16 +chybovaStranka.500.popis=Sorry, something went bad.
2.17
2.18 -pocetEmailu={0,choice,0#You do not have any new mail.|1#You have one new mail.|1<You have {0} new mails.}
2.19 +uvod=Overview
2.20 +prihlasitSe=Log in
2.21 +odhlasitSe=Log out
2.22 +pridatPodnik=Add place
2.23 +prihlasenyUzivatel=Your username
2.24 +
2.25 +uvod.naposledyPridanePodniky=Recently added places
2.26 +uvod.www=web page
2.27 +uvod.adresa=Address
2.28 +
2.29 +prihlaseni.odhlaseniUspesne=Logged out successfully.
2.30 +prihlaseni.nadpis=Log in
2.31 +prihlaseni.zadejte=Type your name and password.
2.32 +prihlaseni.chyba=Wrong name or password, try again please.
2.33 +prihlaseni.jmeno=Name
2.34 +prihlaseni.heslo=Password
2.35 +prihlaseni.tlacitko=Log in
2.36 +
2.37 +pridatPodnik.nadpis=Adding new place
2.38 +pridatPodnik.bylPridan=Place was added successfully.
2.39 +pridatPodnik.tlacitko=Add place
2.40 +
2.41 +dto.podnik.nazev=Name
2.42 +dto.podnik.popis=Description
2.43 +dto.podnik.url=URL
2.44 +dto.podnik.url.tip=web page
2.45 +dto.podnik.datum=Date
2.46 +dto.podnik.ulice=Street
2.47 +dto.podnik.cisloPopisne=no.
2.48 +dto.podnik.cisloPopisne.tip=street number
2.49 +dto.podnik.mesto=City
3.1 --- a/java/nekurak.net-web/web/WEB-INF/casti/pridatPodnik.jsp Thu Feb 25 09:10:01 2010 +0100
3.2 +++ b/java/nekurak.net-web/web/WEB-INF/casti/pridatPodnik.jsp Thu Feb 25 16:00:42 2010 +0100
3.3 @@ -8,26 +8,28 @@
3.4 <jsp:useBean id="podnik" class="cz.frantovo.nekurak.dto.Podnik" scope="request"/>
3.5 <jsp:useBean id="pridatPodnik" class="cz.frantovo.nekurak.web.PridatPodnik" scope="request"/>
3.6
3.7 - <h1>Přidání nového podniku</h1>
3.8 + <h1><fmt:message key="pridatPodnik.nadpis"/></h1>
3.9
3.10 <c:choose>
3.11 <c:when test="${param.akcePridat == 'pridej'}">
3.12 <jsp:setProperty name="podnik" property="*"/>
3.13 <jsp:setProperty name="pridatPodnik" property="podnik" value="${podnik}"/>
3.14 <c:if test="${pridatPodnik.pridano}">
3.15 - <p>Podnik byl přidán.</p>
3.16 + <p><fmt:message key="pridatPodnik.bylPridan"/></p>
3.17 </c:if>
3.18 </c:when>
3.19 <c:otherwise>
3.20 <form method="post" action="?akce=pridatPodnik&amp;akcePridat=pridej">
3.21 <fieldset>
3.22 - <label>Název: <input type="text" name="nazev" maxlength="255"/></label><br/>
3.23 - <label>Popis: <input type="text" name="popis" maxlength="255"/></label><br/>
3.24 - <label title="www stránka">URL: <input type="text" name="url" maxlength="255"/></label><br/>
3.25 - <label>Ulice: <input type="text" name="ulice" maxlength="64"/></label><br/>
3.26 - <label title="číslo popisné">č.p.: <input type="text" name="cisloPopisne" maxlength="5"/></label><br/>
3.27 - <label>Město: <input type="text" name="mesto" maxlength="64"/></label><br/>
3.28 - <button value="submit">Přidat podnik</button>
3.29 + <label><fmt:message key="dto.podnik.nazev"/>: <input type="text" name="nazev" maxlength="255"/></label><br/>
3.30 + <label><fmt:message key="dto.podnik.popis"/>: <input type="text" name="popis" maxlength="255"/></label><br/>
3.31 + <fmt:message key="dto.podnik.url.tip" var="urlTip"/>
3.32 + <label title="${urlTip}"><fmt:message key="dto.podnik.url"/>: <input type="text" name="url" maxlength="255"/></label><br/>
3.33 + <label><fmt:message key="dto.podnik.ulice"/>: <input type="text" name="ulice" maxlength="64"/></label><br/>
3.34 + <fmt:message key="dto.podnik.cisloPopisne.tip" var="cisloPopisneTip"/>
3.35 + <label title="${cisloPopisneTip}"><fmt:message key="dto.podnik.cisloPopisne"/>: <input type="text" name="cisloPopisne" maxlength="5"/></label><br/>
3.36 + <label><fmt:message key="dto.podnik.mesto"/>: <input type="text" name="mesto" maxlength="64"/></label><br/>
3.37 + <button value="submit"><fmt:message key="pridatPodnik.tlacitko"/></button>
3.38 </fieldset>
3.39 </form>
3.40 </c:otherwise>
4.1 --- a/java/nekurak.net-web/web/WEB-INF/casti/prihlaseni.jsp Thu Feb 25 09:10:01 2010 +0100
4.2 +++ b/java/nekurak.net-web/web/WEB-INF/casti/prihlaseni.jsp Thu Feb 25 16:00:42 2010 +0100
4.3 @@ -11,21 +11,21 @@
4.4
4.5 <c:choose>
4.6 <c:when test="${param.odhlasit == 'ano'}">
4.7 - <p>Odhlášení proběhlo úspěšně</p>
4.8 + <p><fmt:message key="prihlaseni.odhlaseniUspesne"/></p>
4.9 </c:when>
4.10 <c:otherwise>
4.11 - <h1>Přihlášení</h1>
4.12 - <p>Zadejte jméno a heslo</p>
4.13 + <h1><fmt:message key="prihlaseni.nadpis"/></h1>
4.14 + <p><fmt:message key="prihlaseni.zadejte"/></p>
4.15
4.16 <c:if test="${param.chyba == 'ano'}">
4.17 - <p>Nesprávné jméno nebo heslo, zkuste to prosím znovu.</p>
4.18 + <p><fmt:message key="prihlaseni.chyba"/></p>
4.19 </c:if>
4.20
4.21 <form method="post" action="j_security_check">
4.22 <fieldset>
4.23 - <label>Jméno: <input type="text" name="j_username"/></label><br/>
4.24 - <label>Heslo: <input type="password" name="j_password"/></label><br/>
4.25 - <button value="submit">Přihlásit se</button>
4.26 + <label><fmt:message key="prihlaseni.jmeno"/>: <input type="text" name="j_username"/></label><br/>
4.27 + <label><fmt:message key="prihlaseni.heslo"/>: <input type="password" name="j_password"/></label><br/>
4.28 + <button value="submit"><fmt:message key="prihlaseni.tlacitko"/></button>
4.29 </fieldset>
4.30 </form>
4.31 </c:otherwise>
5.1 --- a/java/nekurak.net-web/web/WEB-INF/casti/uvod.jsp Thu Feb 25 09:10:01 2010 +0100
5.2 +++ b/java/nekurak.net-web/web/WEB-INF/casti/uvod.jsp Thu Feb 25 16:00:42 2010 +0100
5.3 @@ -7,20 +7,20 @@
5.4
5.5 <jsp:useBean id="uvod" class="cz.frantovo.nekurak.web.Uvod" scope="request"/>
5.6
5.7 - <p>Naposledy přidané podniky:</p>
5.8 + <p><fmt:message key="uvod.naposledyPridanePodniky"/>:</p>
5.9
5.10 <c:forEach var="p" items="${uvod.podniky}">
5.11 <div class="podnik">
5.12 <a href="?akce=detail&amp;podnik=${p.id}"><h2><c:out value="${p.nazev}"/></h2></a>
5.13 <p><c:out value="${p.popis}"/></p>
5.14 <p>
5.15 - Adresa:<br/>
5.16 + <fmt:message key="uvod.adresa"/>:<br/>
5.17 <c:out value="${p.ulice}"/>&#160;
5.18 <c:out value="${p.cisloPopisne}"/><br/>
5.19 <c:out value="${p.mesto}"/>
5.20 </p>
5.21 <c:if test="${p.url != null}">
5.22 - <p><a href="${fn:escapeXml(p.url)}">www stránka</a></p>
5.23 + <p><a href="${fn:escapeXml(p.url)}"><fmt:message key="uvod.www"/></a></p>
5.24 </c:if>
5.25 </div>
5.26 </c:forEach>
6.1 --- a/java/nekurak.net-web/web/WEB-INF/chyby/404.jsp Thu Feb 25 09:10:01 2010 +0100
6.2 +++ b/java/nekurak.net-web/web/WEB-INF/chyby/404.jsp Thu Feb 25 16:00:42 2010 +0100
6.3 @@ -1,20 +1,16 @@
6.4 <?xml version="1.0" encoding="UTF-8"?>
6.5 <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
6.6 - xmlns:c="http://java.sun.com/jsp/jstl/core"
6.7 + xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
6.8 version="2.0">
6.9 - <jsp:directive.page contentType="application/xhtml+xml" isErrorPage="true"/>
6.10 - <jsp:output doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"
6.11 - doctype-root-element="html"
6.12 - omit-xml-declaration="false"/>
6.13
6.14 - <html xmlns="http://www.w3.org/1999/xhtml">
6.15 - <head>
6.16 - <title>404 Stránka nenalezena</title>
6.17 - </head>
6.18 - <body>
6.19 - <h1>404 Stránka nenalezena</h1>
6.20 - <p>Takovou stránku tu bohužel nemáme.</p>
6.21 - </body>
6.22 - </html>
6.23 + <fmt:setBundle basename="cz.frantovo.nekurak.preklady" scope="application"/>
6.24 +
6.25 + <fmt:message key="chybovaStranka.404.nazev" var="nazev"/>
6.26 + <fmt:message key="chybovaStranka.404.popis" var="popis"/>
6.27 +
6.28 + <jsp:include page="sablona.jsp" flush="false">
6.29 + <jsp:param name="nazev" value="${nazev}"/>
6.30 + <jsp:param name="popis" value="${popis}"/>
6.31 + </jsp:include>
6.32
6.33 </jsp:root>
7.1 --- a/java/nekurak.net-web/web/WEB-INF/chyby/500.jsp Thu Feb 25 09:10:01 2010 +0100
7.2 +++ b/java/nekurak.net-web/web/WEB-INF/chyby/500.jsp Thu Feb 25 16:00:42 2010 +0100
7.3 @@ -1,20 +1,16 @@
7.4 <?xml version="1.0" encoding="UTF-8"?>
7.5 <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
7.6 - xmlns:c="http://java.sun.com/jsp/jstl/core"
7.7 + xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
7.8 version="2.0">
7.9 - <jsp:directive.page contentType="application/xhtml+xml" isErrorPage="true"/>
7.10 - <jsp:output doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"
7.11 - doctype-root-element="html"
7.12 - omit-xml-declaration="false"/>
7.13
7.14 - <html xmlns="http://www.w3.org/1999/xhtml">
7.15 - <head>
7.16 - <title>500 Interní chyba serveru</title>
7.17 - </head>
7.18 - <body>
7.19 - <h1>500 Interní chyba serveru</h1>
7.20 - <p>Něco se bohužel nepovedlo.</p>
7.21 - </body>
7.22 - </html>
7.23 + <fmt:setBundle basename="cz.frantovo.nekurak.preklady" scope="application"/>
7.24 +
7.25 + <fmt:message key="chybovaStranka.500.nazev" var="nazev"/>
7.26 + <fmt:message key="chybovaStranka.500.popis" var="popis"/>
7.27 +
7.28 + <jsp:include page="sablona.jsp" flush="false">
7.29 + <jsp:param name="nazev" value="${nazev}"/>
7.30 + <jsp:param name="popis" value="${popis}"/>
7.31 + </jsp:include>
7.32
7.33 </jsp:root>
8.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
8.2 +++ b/java/nekurak.net-web/web/WEB-INF/chyby/sablona.jsp Thu Feb 25 16:00:42 2010 +0100
8.3 @@ -0,0 +1,19 @@
8.4 +<?xml version="1.0" encoding="UTF-8"?>
8.5 +<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
8.6 + version="2.0">
8.7 + <jsp:directive.page contentType="application/xhtml+xml" isErrorPage="true"/>
8.8 + <jsp:output doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"
8.9 + doctype-root-element="html"
8.10 + omit-xml-declaration="false"/>
8.11 +
8.12 + <html xmlns="http://www.w3.org/1999/xhtml">
8.13 + <head>
8.14 + <title>${param.nazev}</title>
8.15 + </head>
8.16 + <body>
8.17 + <h1>${param.nazev}</h1>
8.18 + <p>${param.popis}</p>
8.19 + </body>
8.20 + </html>
8.21 +
8.22 +</jsp:root>
9.1 --- a/java/nekurak.net-web/web/WEB-INF/web.xml Thu Feb 25 09:10:01 2010 +0100
9.2 +++ b/java/nekurak.net-web/web/WEB-INF/web.xml Thu Feb 25 16:00:42 2010 +0100
9.3 @@ -1,13 +1,13 @@
9.4 <?xml version="1.0" encoding="UTF-8"?>
9.5 <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">
9.6 <session-config>
9.7 - <session-timeout>
9.8 - 30
9.9 - </session-timeout>
9.10 + <session-timeout>30</session-timeout>
9.11 </session-config>
9.12 +
9.13 <welcome-file-list>
9.14 <welcome-file>index.jsp</welcome-file>
9.15 </welcome-file-list>
9.16 +
9.17 <error-page>
9.18 <!-- Stránka nenalezena -->
9.19 <error-code>404</error-code>
9.20 @@ -18,11 +18,13 @@
9.21 <error-code>500</error-code>
9.22 <location>/WEB-INF/chyby/500.jsp</location>
9.23 </error-page>
9.24 +
9.25 <context-param>
9.26 <!-- Pro případ, že chybí hlavička „Accept-language“ v HTTP požadavku -->
9.27 <param-name>javax.servlet.jsp.jstl.fmt.fallbackLocale</param-name>
9.28 <param-value>cs</param-value>
9.29 </context-param>
9.30 +
9.31 <!-- <zabezpečení> -->
9.32 <security-role>
9.33 <role-name>opravneny</role-name>
9.34 @@ -45,4 +47,5 @@
9.35 </form-login-config>
9.36 </login-config>
9.37 <!-- </zabezpečení> -->
9.38 +
9.39 </web-app>
10.1 --- a/java/nekurak.net-web/web/index.jsp Thu Feb 25 09:10:01 2010 +0100
10.2 +++ b/java/nekurak.net-web/web/index.jsp Thu Feb 25 16:00:42 2010 +0100
10.3 @@ -10,7 +10,7 @@
10.4
10.5 <!-- <lokalizace> -->
10.6 <c:if test="${param.jazyk != null}">
10.7 - <fmt:setLocale value="${param.jazyk}"/>
10.8 + <fmt:setLocale value="${param.jazyk}" scope="session"/>
10.9 </c:if>
10.10 <fmt:setBundle basename="cz.frantovo.nekurak.preklady" scope="application"/>
10.11 <!-- </lokalizace> -->
10.12 @@ -44,16 +44,16 @@
10.13 </div>
10.14
10.15 <ul id="nabidka">
10.16 - <li><a href="?">Úvod</a></li>
10.17 + <li><a href="?"><fmt:message key="uvod"/></a></li>
10.18
10.19 <c:choose>
10.20 <c:when test="${prihlasenyUzivatel == null}">
10.21 - <li><a href="?akce=prihlaseni">Přihlásit se</a></li>
10.22 + <li><a href="?akce=prihlaseni"><fmt:message key="prihlasitSe"/></a></li>
10.23 </c:when>
10.24 <c:otherwise>
10.25 - <li><a href="?akce=pridatPodnik">Přidat podnik</a></li>
10.26 - <li id="prihlasenyUzivatel">Přihlášený uživatel: ${pageContext.request.userPrincipal.name}</li>
10.27 - <li><a href="?akce=prihlaseni&amp;odhlasit=ano">Odhlásit se</a></li>
10.28 + <li><a href="?akce=pridatPodnik"><fmt:message key="pridatPodnik"/></a></li>
10.29 + <li id="prihlasenyUzivatel"><fmt:message key="prihlasenyUzivatel"/>: ${prihlasenyUzivatel}</li>
10.30 + <li><a href="?akce=prihlaseni&amp;odhlasit=ano"><fmt:message key="odhlasitSe"/></a></li>
10.31 </c:otherwise>
10.32 </c:choose>
10.33
10.34 @@ -80,9 +80,9 @@
10.35
10.36 <div id="paticka">
10.37 <p>
10.38 - © 2010 nekurak.net. Licence: Affero GPL.
10.39 - <a href="${pageContext.servletContext.contextPath}/nekurak.net-src.zip">nekurak.net-src.zip</a>
10.40 - <a href="${pageContext.servletContext.contextPath}/nekurak.net-src.zip.SHA-512">.</a>
10.41 + <fmt:message key="licence"/>
10.42 + <a href="nekurak.net-src.zip">nekurak.net-src.zip</a>
10.43 + <a href="nekurak.net-src.zip.SHA-512">.</a>
10.44 </p>
10.45 </div>
10.46
11.1 --- a/java/nekurak.net-web/web/styl.css Thu Feb 25 09:10:01 2010 +0100
11.2 +++ b/java/nekurak.net-web/web/styl.css Thu Feb 25 16:00:42 2010 +0100
11.3 @@ -104,4 +104,5 @@
11.4
11.5 input {
11.6 width:200px;
11.7 + margin-left: 2px;
11.8 }