Author: siren
Date: Wed May 3 08:30:01 2006
New Revision: 399336
URL: http://svn.apache.org/viewcvs?rev=399336&view=rev
Log:
fixed handling of fallback locale
Added:
lucene/nutch/trunk/contrib/web2/src/main/resources/org/nutch/jsp/resources_en.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/tiles-defs.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=399336&r1=399335&r2=399336&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:30:01 2006
@@ -71,7 +71,6 @@
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"));
}
@@ -81,8 +80,6 @@
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));
Added:
lucene/nutch/trunk/contrib/web2/src/main/resources/org/nutch/jsp/resources_en.properties
URL:
http://svn.apache.org/viewcvs/lucene/nutch/trunk/contrib/web2/src/main/resources/org/nutch/jsp/resources_en.properties?rev=399336&view=auto
==============================================================================
---
lucene/nutch/trunk/contrib/web2/src/main/resources/org/nutch/jsp/resources_en.properties
(added)
+++
lucene/nutch/trunk/contrib/web2/src/main/resources/org/nutch/jsp/resources_en.properties
Wed May 3 08:30:01 2006
@@ -0,0 +1,93 @@
+#This is the default resource file for nutch ui localization.
+#If you create a new localized version of resources, please use
+#this as the base
+
+#language code used in html lang attribute
+lang=en
+
+#anchors page title
+anchors.title=anchors
+anchors.anchors=incoming anchor text:
+anchors.page=page: <a href="{0}">{0}</a>
+
+#cached page title
+cached.title=nutch cache
+cached.page=page: <a href="{0}">{0}</a>
+cached.noContent=Sorry, no content is cached for this page.
+
+#explain page title
+explain.title=score explanation
+explain.page=page
+explain.scoreForQuery=score for query: <tt>{0}</tt>
+
+#search page title
+search.title=search results
+
+#text in search button
+search.search=Search
+
+#text wich describes the search results (nn-nn out of nn)
+search.hits=Results <b>{0}-{1}</b> of about <b>{2}</b> total matching pages
for <b>{3}</b>.
+
+#text displayed when there are no reults
+search.noResults=Your search - <b>{0}</b> - did not match any documents.
+
+#cached page link text
+search.cached=cached
+
+#explain page link text
+search.explain=explain
+
+#anchors page link text
+search.anchors=anchors
+
+#text in "next page" button
+search.next=next page
+
+#link text of
+search.moreFrom=more from
+search.showAllHits=show all hits
+
+search.clustering=clustering
+search.viewAsText=View as Plain Text
+
+#search help link text
+search.help=help
+
+#view as text page title
+text.title=plain text cache
+text.note=This is the plain text version of the file: <a href="{0}">{0}</a>.
+text.noText=<i>Sorry, no plain text version is available.</i>
+
+#title of help page
+help.title=help
+
+#title of preferences page
+preferences.title=preferences
+
+#interface languages
+preferences.ui.language=Interface language
+preferences.ui.language.info=
+ca=Catalan
+de=German
+en=English
+es=Spanish
+fi=Finnish
+fr=French
+hu=Hungarian
+ms=Malay
+nl=Dutch
+pl=Polish
+pt=Portuguese
+sh=Serbo-Croatian
+sr=Serbian
+sv=Swedish
+th=Thai
+zh=Chinese
+
+#number of results
+preferences.numResults=Number of Results
+preferences.numResults.info=
+
+#text on save button
+preferences.submit=Save and return to search
\ No newline at end of file
Modified: lucene/nutch/trunk/contrib/web2/src/main/webapp/WEB-INF/tiles-defs.xml
URL:
http://svn.apache.org/viewcvs/lucene/nutch/trunk/contrib/web2/src/main/webapp/WEB-INF/tiles-defs.xml?rev=399336&r1=399335&r2=399336&view=diff
==============================================================================
--- lucene/nutch/trunk/contrib/web2/src/main/webapp/WEB-INF/tiles-defs.xml
(original)
+++ lucene/nutch/trunk/contrib/web2/src/main/webapp/WEB-INF/tiles-defs.xml Wed
May 3 08:30:01 2006
@@ -70,6 +70,7 @@
<putList name="languages">
<add value="ca"/>
<add value="de"/>
+ <add value="en"/>
<add value="es"/>
<add value="fi"/>
<add value="fr"/>
