Author: snoopdave
Date: Sun Sep 12 18:59:31 2010
New Revision: 996364
URL: http://svn.apache.org/viewvc?rev=996364&view=rev
Log:
Fix for https://issues.apache.org/jira/browse/ROL-1882
Calendar should use weblog locale not request's
Modified:
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/model/CalendarModel.java
Modified:
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/model/CalendarModel.java
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/model/CalendarModel.java?rev=996364&r1=996363&r2=996364&view=diff
==============================================================================
---
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/model/CalendarModel.java
(original)
+++
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/model/CalendarModel.java
Sun Sep 12 18:59:31 2010
@@ -18,6 +18,7 @@
package org.apache.roller.weblogger.ui.rendering.model;
+import java.util.Locale;
import java.util.Map;
import javax.servlet.jsp.PageContext;
import org.apache.commons.logging.Log;
@@ -102,7 +103,7 @@ public class CalendarModel implements Mo
calTag.setPageContext(pageContext);
calTag.setName("calendar");
calTag.setModel("calendarModel");
- calTag.setLocale(pageRequest.getLocaleInstance());
+ calTag.setLocale(websiteWrapper.getLocaleInstance());
if (big) {
calTag.setClassSuffix("Big");
}