Author: agilliland
Date: Mon Jun 18 14:52:01 2007
New Revision: 548500
URL: http://svn.apache.org/viewvc?view=rev&rev=548500
Log:
fixing bug in multi-language support where the weblog 'show all languages'
option is being ignored. now each servlet checks if the request should be
constrained to a specific local and enforces that.
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java?view=diff&rev=548500&r1=548499&r2=548500
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java
Mon Jun 18 14:52:01 2007
@@ -169,8 +169,13 @@
} else {
log.debug("MISS "+cacheKey);
}
-
-
+
+
+ // do we need to force a specific locale for the request?
+ if(feedRequest.getLocale() == null && !weblog.isShowAllLangs()) {
+ feedRequest.setLocale(weblog.getLocale());
+ }
+
// validation. make sure that request input makes sense.
boolean invalid = false;
if(feedRequest.getLocale() != null) {
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java?view=diff&rev=548500&r1=548499&r2=548500
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
Mon Jun 18 14:52:01 2007
@@ -287,6 +287,10 @@
log.debug("page found, dealing with it");
+ // do we need to force a specific locale for the request?
+ if(pageRequest.getLocale() == null && !weblog.isShowAllLangs()) {
+ pageRequest.setLocale(weblog.getLocale());
+ }
// validation. make sure that request input makes sense.
boolean invalid = false;
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java?view=diff&rev=548500&r1=548499&r2=548500
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java
Mon Jun 18 14:52:01 2007
@@ -90,7 +90,7 @@
}
} catch (Exception e) {
// some kind of error parsing the request or getting weblog
- log.error("error creating preview request", e);
+ log.debug("error creating preview request", e);
response.sendError(HttpServletResponse.SC_NOT_FOUND);
return;
}
@@ -113,6 +113,10 @@
// the object that gets referenced during rendering operations
previewRequest.setWeblog(tmpWebsite);
+ // do we need to force a specific locale for the request?
+ if(previewRequest.getLocale() == null && !weblog.isShowAllLangs()) {
+ previewRequest.setLocale(weblog.getLocale());
+ }
Template page = null;
try {
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java?view=diff&rev=548500&r1=548499&r2=548500
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java
Mon Jun 18 14:52:01 2007
@@ -92,6 +92,11 @@
return;
}
+ // do we need to force a specific locale for the request?
+ if(searchRequest.getLocale() == null && !weblog.isShowAllLangs()) {
+ searchRequest.setLocale(weblog.getLocale());
+ }
+
// lookup template to use for rendering
ThemeTemplate page = null;
try {
