Re: [xwiki-users] non-english languages

Andrey V. Karlov wrote: I attach my patch. This patch dully recode document name, parent, and user request parameters from ISO to UTF-8. Tested in Tomcat 5.0.28, 5.5.12. (but it is not work in Jetty 5.1.5rc2, i don't know why) I use this changes on http://usunet.ru/xwiki/ (temporary unavailable) in Russian. All works fine, except ru search (i will see it soon). You may contact me for some support xwiki in _Russian_. But i'm only "google summer of code" student in xwiki. The main problem is that Servlet API(tomcat, jetty, etc) recode request parameters only for POST submit. It does not recode request URI && GET parameters. patch created from: -------- Original Message -------- Subject: [xwiki-dev] Re: UTF-8 characters (again) Date: Sat, 23 Jul 2005 20:52:57 +0600 From: Artem Melentev &lt;amelentev(a)gmail.com&gt; Reply-To: xwiki-dev(a)objectweb.org To: xwiki-dev(a)objectweb.org CC: xavier.moghrabi(a)objectweb.org Xavier MOGHRABI wrote: example is on configure Whether use of non-English _names_ of documents is possible? I have made all that is written in http://www.xwiki.org/xwiki/bin/view/Dev/CharactersSets But Russian names of documents displays incorrectly. On zh.objectweb.org too. From a code I have understood, it of that request.getPathInfo and getParametr (for parameters in uri) are not decoded in utf. It so, or I have incorrectly setup xwiki? (or it is servlet api bug?) I set SetCharacterEncodingFilter off by add ignore=false and rewrite XWikiServletRequest.get, getPathInfo, getParameter to decode from ISO-8859-1 tо UTF-8 Names now working fine, but i found next problem: when i click on new,unedited link [newlink], open edit form. In this form field "Parent" fills not decoded. PrepareEditForm.setParent called 2 times, first call is decoded (from PrepareEditForm.reset), second - not decoded (from beenutils). Main questions: 1 That second PrepareEditForm.setParent call for? 2 Why it is not decoded? 3 How i may decode it? Now i`m decode in setParent. This is bad idea, but works.. Soon i will open http://usunet.ru/wiki/ - Ural State University XWiki. ~Environment~: Gentoo Linux, LANG="ru_RU.UTF-8" Sun JDK 1.5.0.04, JAVAOPTS="-Dfile.encoding=UTF-8" Tomcat 5.0.27-r6 DB: empty unicode db on PostgreSQL v8.0.3 (Sorry my English) -- -- Artem Melentev, UralSU, CS301. http://usunet.ru/xwiki/ jabber: amelentev(a)jabber.ru | icq: 175349029 Index: /home/mart/workspace/xwiki/src/main/java/com/xpn/xwiki/web/PrepareEditForm.java =================================================================== --- /home/mart/workspace/xwiki/src/main/java/com/xpn/xwiki/web/PrepareEditForm.java (revision 912) +++ /home/mart/workspace/xwiki/src/main/java/com/xpn/xwiki/web/PrepareEditForm.java (working copy) @@ -17,7 +17,7 @@ * Created by * User: Ludovic Dubost - * Date: 30 d�c. 2003 + * Date: 30 d�c. 2003 * Time: 09:12:48 */ package com.xpn.xwiki.web; @@ -53,7 +53,7 @@ } public void setParent(String parent) { - this.parent = parent; + this.parent = XWikiServletRequest._decode( parent ); } public String getCreator() { Index: /home/mart/workspace/xwiki/src/main/java/com/xpn/xwiki/web/XWikiServletRequest.java =================================================================== --- /home/mart/workspace/xwiki/src/main/java/com/xpn/xwiki/web/XWikiServletRequest.java (revision 912) +++ /home/mart/workspace/xwiki/src/main/java/com/xpn/xwiki/web/XWikiServletRequest.java (working copy) @@ -46,6 +46,15 @@ public class XWikiServletRequest implements XWikiRequest { private HttpServletRequest request; + + public final static String _decode(String s) { + if (s==null) return s; + try { + return new String(s.getBytes("ISO-8859-1")); + } catch (UnsupportedEncodingException e) { + return s; + } + } public XWikiServletRequest(HttpServletRequest request) { this.request = request; @@ -51,9 +60,9 @@ this.request = request; } - public String get(String name) { - return request.getParameter(name); - } + public String get(String name) { + return _decode( request.getParameter(name) ); + } public HttpServletRequest getHttpServletRequest() { return request; @@ -75,9 +84,10 @@ return request.getHeader(s); } - public Enumeration getHeaders(String s) { - return request.getHeaders(s); - } + /** not recoded! */ + public Enumeration getHeaders(String s) { + return request.getHeaders(s); + } public Enumeration getHeaderNames() { return request.getHeaderNames(); @@ -91,9 +101,9 @@ return request.getMethod(); } - public String getPathInfo() { - return request.getPathInfo(); - } + public String getPathInfo() { + return _decode( request.getPathInfo() ); + } public String getPathTranslated() { return request.getPathTranslated(); @@ -150,7 +160,6 @@ return request.isRequestedSessionIdValid(); } - public boolean isRequestedSessionIdFromCookie() { return request.isRequestedSessionIdFromCookie(); } @@ -194,21 +203,24 @@ return request.getInputStream(); } - public String getParameter(String s) { - return request.getParameter(s); - } + public String getParameter(String s) { + return _decode( request.getParameter(s) ); + } - public Enumeration getParameterNames() { - return request.getParameterNames(); - } + /** not recoded! */ + public Enumeration getParameterNames() { + return request.getParameterNames(); + } - public String[] getParameterValues(String s) { - return request.getParameterValues(s); - } + /** not recoded! */ + public String[] getParameterValues(String s) { + return request.getParameterValues(s); + } - public Map getParameterMap() { - return request.getParameterMap(); - } + /** not recoded! */ + public Map getParameterMap() { + return request.getParameterMap(); + } public String getProtocol() { return request.getProtocol(); @@ -285,9 +297,9 @@ return request.getLocalPort(); } - /* - * Portlet Functions. They do nothing in the servlet environement - */ + /* + * Portlet Functions. They do nothing in the servlet environement + */ public boolean isWindowStateAllowed(WindowState windowState) { return false; @@ -345,5 +357,3 @@ return null; } } - - Index: /home/mart/workspace/xwiki/src/main/web.xml =================================================================== --- /home/mart/workspace/xwiki/src/main/web.xml (revision 912) +++ /home/mart/workspace/xwiki/src/main/web.xml (working copy) @@ -14,7 +14,11 @@ <filter-class>com.xpn.xwiki.web.SetCharacterEncodingFilter</filter-class> <init-param> <param-name>encoding</param-name> - <param-value>ISO-8859-1</param-value> + <param-value>UTF-8</param-value> + </init-param> + <init-param> + <param-name>ignore</param-name> + <param-value>false</param-value> </init-param> </filter>