roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gma...@apache.org
Subject svn commit: r1507039 - in /roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering: WeblogRequestMapper.java servlets/SearchServlet.java
Date Thu, 25 Jul 2013 16:02:51 GMT
Author: gmazza
Date: Thu Jul 25 16:02:51 2013
New Revision: 1507039

URL: http://svn.apache.org/r1507039
Log:
ROL-1964: Have SearchServlet retain locale.  Patch by Maciej Rumianowski.

Modified:
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/WeblogRequestMapper.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/WeblogRequestMapper.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/WeblogRequestMapper.java?rev=1507039&r1=1507038&r2=1507039&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/WeblogRequestMapper.java
(original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/WeblogRequestMapper.java
Thu Jul 25 16:02:51 2013
@@ -367,7 +367,10 @@ public class WeblogRequestMapper impleme
                 forwardUrl.append(SEARCH_SERVLET);
                 forwardUrl.append("/");
                 forwardUrl.append(handle);
-                
+                if(locale != null) {
+                    forwardUrl.append("/");
+                    forwardUrl.append(locale);
+                }
                 // requests handled by RSDServlet
             } else if(context.equals("rsd")) {
                 

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java?rev=1507039&r1=1507038&r2=1507039&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java
(original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java
Thu Jul 25 16:02:51 2013
@@ -159,6 +159,7 @@ public class SearchServlet extends HttpS
             WeblogPageRequest pageRequest = new WeblogPageRequest();
             pageRequest.setWeblogHandle(searchRequest.getWeblogHandle());
             pageRequest.setWeblogCategoryName(searchRequest.getWeblogCategoryName());
+            pageRequest.setLocale(searchRequest.getLocale());
             initData.put("parsedRequest", pageRequest);
             initData.put("searchRequest", searchRequest);
             



Mime
View raw message