Author: vbriand Date: 2010-12-31 17:27:15 +0100 (Fri, 31 Dec 2010) New Revision: 156 Url: http://chorem.org/repositories/revision/bow/156 Log: Nouvelles modifications pour i18n Modified: trunk/src/main/webapp/WEB-INF/decorators/main.jsp trunk/src/main/webapp/jsp/home.jsp trunk/src/main/webapp/jsp/inc/rightMenu.jsp Modified: trunk/src/main/webapp/WEB-INF/decorators/main.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/decorators/main.jsp 2010-12-31 15:48:49 UTC (rev 155) +++ trunk/src/main/webapp/WEB-INF/decorators/main.jsp 2010-12-31 16:27:15 UTC (rev 156) @@ -7,13 +7,17 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> - <title><decorator:title default="Bow" /></title> + <title>Bow : <decorator:title default="Bow" /></title> <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> <meta name="description" content="Bookmarks on the web" /> - <link rel="search" type="application/opensearchdescription+xml" title="bowTemporarySearchEngine" href="?action=temporaryXml" /> - <link rel="search" type="application/opensearchdescription+xml" title="bowPermanentSearchEngine" href="?action=permanentXml" /> - <link href="<s:url value='/css/global.css'/>" rel="stylesheet" type="text/css" media="all" /> - <script type="text/javascript" src="<s:url value='/js/bookmark.js' />"></script> + <s:url id="temporaryXml" action="temporaryXml" /> + <s:url id="permanentXml" action="permanentXml" /> + <link rel="search" type="application/opensearchdescription+xml" title="bowTemporarySearchEngine" href="${temporaryXml}" /> + <link rel="search" type="application/opensearchdescription+xml" title="bowPermanentSearchEngine" href="${permanentXml}" /> + <s:url id="globalCSS" value="/css/global.css" /> + <link href="${globalCSS}" rel="stylesheet" type="text/css" media="all" /> + <s:url id="bookmarkJS" value="/js/bookmark.js" /> + <script type="text/javascript" src="${bookmarkJS}"></script> <decorator:head /> </head> <body id="page-home"> Modified: trunk/src/main/webapp/jsp/home.jsp =================================================================== --- trunk/src/main/webapp/jsp/home.jsp 2010-12-31 15:48:49 UTC (rev 155) +++ trunk/src/main/webapp/jsp/home.jsp 2010-12-31 16:27:15 UTC (rev 156) @@ -49,7 +49,7 @@ </head> <body> <div class="menu clearfix"> - <h2><s:property value="%{getText('mostUsedBookmarks')}" /></h2> + <h2><s:text name="bow.home.mostUsedBookmarks" /></h2> </div> <div class="content"> <% @@ -75,12 +75,12 @@ } } else { %> - <p class="nobookmarks"><s:property value="%{getText('noBookmarks')}" /></p><s:set var="formAction" value="%{formAction}" /> + <p class="nobookmarks"><s:text name="bow.home.noBookmarks" /></p> <% } %> </div> <div class="menu clearfix"> - <h2><s:property value="%{getText('latestBookmarks')}" /></h2> + <h2><s:text name="bow.home.latestBookmarks" /></h2> </div> <div class="content"> <% @@ -101,7 +101,7 @@ } } else { %> - <p class="nobookmarks"><s:property value="%{getText('noBookmarks')}" /></p> + <p class="nobookmarks"><s:text name="bow.home.noBookmarks" /></p> <% } %> </div> <jsp:include page="/jsp/inc/rightMenu.jsp" /> Modified: trunk/src/main/webapp/jsp/inc/rightMenu.jsp =================================================================== --- trunk/src/main/webapp/jsp/inc/rightMenu.jsp 2010-12-31 15:48:49 UTC (rev 155) +++ trunk/src/main/webapp/jsp/inc/rightMenu.jsp 2010-12-31 16:27:15 UTC (rev 156) @@ -81,39 +81,39 @@ xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <s:form action="/bow/logout.action"> + <s:form action="logout"> <div class="input"> - <s:submit value="%{getText('logout')}" /> + <s:submit name="bow.rightMenu.logout" /> </div> </s:form> - <a href="http://maven-site.chorem.org/bow/" class="help" target="_blank"><s:property value="%{getText('help')}" /></a> + <a href="http://maven-site.chorem.org/bow/" class="help" target="_blank"><s:text name="bow.rightMenu.help" /></a> </div> <div id="side"> <div id="colonneD"> <ul class="droite"> <% if (admin) { %> - <li><a href="/bow/admin.action"><s:property value="%{getText('admin')}" /></a></li> + <li><s:a action="admin"><s:text name="bow.rightMenu.admin" /></s:a></li> <% } %> - <li><a href="/bow/preferences.action"><s:property value="%{getText('preferences')}" /></a></li> - <li><a title="%{getText('temporaryLinkDescription')}" href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');if%20(nameAndTags!=(document.title+'|')){var%20link='<%=url%>/addUrl.action&token=<%=temporaryToken%>&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);}void(0);"><s:property value="%{getText('temporaryLink')}" /></a></li> - <li><a title="%{getText('permanentLinkDescription')}" href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');if%20(nameAndTags!=(document.title+'|')){var%20link='<%=url%>/addUrl.action&token=<%=permanentToken%>&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);}void(0);"><s:property value="%{getText('permanentLink')}" /></a></li> + <li><s:a action="preferences"><s:text name="bow.preferences.title" /></s:a></li> + <li><a title="%{getText('temporaryLinkDescription')}" href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');if%20(nameAndTags!=(document.title+'|')){var%20link='<%=url%>/addUrl.action&token=<%=temporaryToken%>&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);}void(0);"><s:text name="bow.rightMenu.bookmark.temporaryLink" /></a></li> + <li><a title="%{getText('permanentLinkDescription')}" href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');if%20(nameAndTags!=(document.title+'|')){var%20link='<%=url%>/addUrl.action&token=<%=permanentToken%>&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);}void(0);"><s:text name="bow.rightMenu.bookmark.permanentLink" /></a></li> </ul> <div id="extensions"> - <h2><s:property value="%{getText('extensions')}" /></h2> + <h2><s:text name="bow.rightMenu.extensions" /></h2> <ul class="droite"> <li><a href="extensions/bow4chromium.crx"><img src="img/chromium.png" class="extensionIcon" /><div class="extensionName">Extension pour Chromium</div></a></li> - <li><strong><s:property value="%{getText('permanentTokenId')}" /></strong> <%= permanentToken %></li> - <li><strong><s:property value="%{getText('sessionTokenId')}" /></strong> <%= temporaryToken %></li> + <li><strong><s:text name="bow.rightMenu.token.permanent" /></strong> <%= permanentToken %></li> + <li><strong><s:text name="bow.rightMenu.token.temporary" /></strong> <%= temporaryToken %></li> </ul> </div> <div id="add" class="clearfix"> - <h2><s:property value="%{getText('addModify')}" /></h2> - <s:form id="bookmarkForm" action="/bow/addUrl.action"> - <div class="input"><s:textfield key="link" name="link" label="%{getText('link')}" /></div><!-- <%=formLink%> --> - <div class="input"><s:textfield key="alias" name="alias" label="%{getText('alias')}" value="" /></div><!-- <%=formAlias%> --> - <div class="input"><s:textfield key="name" name="name" label="%{getText('name')}" value="" /></div><!-- <%=formName%> --> - <div class="input"><s:textfield key="tags" name="tags" label="%{getText('tags')}" value="" /></div><!-- <%=formTags%> --> - <div class="input"><s:submit value="%{getText('save')}" /></div> + <h2><s:text name="bow.rightMenu.bookmark.addModify" /></h2> + <s:form id="bookmarkForm" action="addUrl"> + <div class="input"><s:textfield key="bow.rightMenu.bookmark.link" name="link" /></div><!-- <%=formLink%> --> + <div class="input"><s:textfield key="bow.rightMenu.bookmark.alias" name="alias" /></div><!-- <%=formAlias%> --> + <div class="input"><s:textfield key="bow.rightMenu.bookmark.name" name="name" /></div><!-- <%=formName%> --> + <div class="input"><s:textfield key="bow.rightMenu.bookmark.tags" name="tags" /></div><!-- <%=formTags%> --> + <div class="input"><s:submit key="bow.rightMenu.bookmark.submit" /></div> </s:form> </div> <div id="nuage"> @@ -126,36 +126,36 @@ <% } %> </div> <div class="recherche"> - <h2><label for="searchLine"><s:property value="%{getText('search')}" /></label></h2> - <s:form action="/bow/search.action"> + <h2><label for="searchLine"><s:text name="bow.rightMenu.search" /></label></h2> + <s:form action="search"> <div class="input"> - <s:textfield key="searchLine" name="searchLine" /> - <s:submit value="%{getText('find')}" /> + <s:textfield key="bow.rightMenu.find.searchLine" name="searchLine" /> + <s:submit key="bow.rightMenu.find.submit" /> </div> </s:form> </div> <div class="recherche"> - <h2><label for="fullTextLine"><s:property value="%{getText('fullTextSearch')}" /></label></h2> - <s:form action="/bow/fullText.action"> + <h2><label for="fullTextLine"><s:text name="bow.rightMenu.fullTextSearch}" /></label></h2> + <s:form action="fullText"> <div class="input"> <% if (fullText != null) { %> - <s:textfield key="fullTextLine" name="fullTextLine" value="" /> <!-- <%=fullText%> --> + <s:textfield key="bow.rightMenu.search.fullTextLine" name="fullTextLine" value="" /> <!-- <%=fullText%> --> <% } else { %> - <s:textfield key="fullTextLine" name="fullTextLine" /> + <s:textfield key="bow.rightMenu.search.fullTextLine" name="fullTextLine" /> <% } %> - <s:submit value="%{getText('find')}" /> + <s:submit key="bow.rightMenu.find" /> </div> </s:form> </div> <div id="import"> - <h2><s:property value="%{getText('importBookmarks')}" /></h2> - <s:form action="/bow/importBookmarks.action" enctype="multipart/form-data"> + <h2><s:text name="bow.rightMenu.importBookmarks" /></h2> + <s:form action="importBookmarks" enctype="multipart/form-data"> <div class="input"> - <s:file name="upfile" size="15%" label="%{getText('file')}" /><br /> - <s:submit value="%{getText('import')}" /> + <s:file name="upfile" size="15%" key="bow.rightMenu.import.file" /><br /> + <s:submit key="bow.rightMenu.import.submit" /> </div> </s:form> - <a href="/bow/exportBookmarks.action"><s:property value="%{getText('exportBookmarks')}" /></a> + <s:a action="exportBookmarks"><s:text name="bow.rightMenu.exportBookmarks" /></s:a> </div> <div class="colonnebas"> <img src="img/piedmenu.jpg" width="401" height="77" alt="Pied de menu" />