Author: siren Date: Wed May 3 08:28:14 2006 New Revision: 399335 URL: http://svn.apache.org/viewcvs?rev=399335&view=rev Log: fixed handling of fallback locale
Removed: lucene/nutch/trunk/contrib/web2/src/main/resources/org/nutch/jsp/resources.properties Modified: lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/controller/I18NPageController.java lucene/nutch/trunk/contrib/web2/src/main/webapp/WEB-INF/web.xml Modified: lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/controller/I18NPageController.java URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/controller/I18NPageController.java?rev=399335&r1=399334&r2=399335&view=diff ============================================================================== --- lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/controller/I18NPageController.java (original) +++ lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/controller/I18NPageController.java Wed May 3 08:28:14 2006 @@ -68,12 +68,21 @@ // XXX this prevents plugins to provide content if (content == null) { content = new StringBuffer(); - List postfixes = calculateSuffixes(locale); - Iterator iterator = postfixes.iterator(); + List suffixes = calculateSuffixes(locale); + + if(!suffixes.contains(servletContext.getInitParameter("javax.servlet.jsp.jstl.fmt.fallbackLocale"))){ + System.out.println("Adding default suffix:" + servletContext.getInitParameter("javax.servlet.jsp.jstl.fmt.fallbackLocale")); + suffixes.add(servletContext.getInitParameter("javax.servlet.jsp.jstl.fmt.fallbackLocale")); + } + Iterator iterator = suffixes.iterator(); + while (iterator.hasNext()) { String postfix = (String) iterator.next(); String name = concatPostfix(baseName, postfix); + + System.out.println("reading:" + name); + InputStream is = servletContext.getResourceAsStream(name); if (is != null) { BufferedReader br = new BufferedReader(new InputStreamReader(is)); @@ -132,7 +141,6 @@ } return suffixes; - } /** @@ -153,20 +161,7 @@ if (postfix == null) { return name; } - return "/" + postfix + name; - - // Search file name extension. - // take care of Unix files starting with . - - /* - * int dotIndex = name.lastIndexOf("."); int lastNameStart = - * name.lastIndexOf(java.io.File.pathSeparator); if (dotIndex < 1 || - * dotIndex < lastNameStart) { return name + postfix; } - * - * String ext = name.substring(dotIndex); name = name.substring(0, - * dotIndex); return name + postfix + ext; - */ } - + } Modified: lucene/nutch/trunk/contrib/web2/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/contrib/web2/src/main/webapp/WEB-INF/web.xml?rev=399335&r1=399334&r2=399335&view=diff ============================================================================== --- lucene/nutch/trunk/contrib/web2/src/main/webapp/WEB-INF/web.xml (original) +++ lucene/nutch/trunk/contrib/web2/src/main/webapp/WEB-INF/web.xml Wed May 3 08:28:14 2006 @@ -9,6 +9,10 @@ </param-name> <param-value>org.nutch.jsp.resources</param-value> </context-param> + <context-param> + <param-name>javax.servlet.jsp.jstl.fmt.fallbackLocale</param-name> + <param-value>en</param-value> + </context-param> <servlet> <servlet-name>action</servlet-name> <servlet-class>