You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ga...@apache.org on 2006/12/05 17:01:13 UTC

svn commit: r482695 - /incubator/roller/trunk/src/org/apache/roller/ui/core/tags/calendar/CalendarTag.java

Author: gangolli
Date: Tue Dec  5 08:01:12 2006
New Revision: 482695

URL: http://svn.apache.org/viewvc?view=rev&rev=482695
Log:
Fix for ROL 1312 (commit into mainline).  This will be integrated to 3.1 branch in a subsequent commit.

Modified:
    incubator/roller/trunk/src/org/apache/roller/ui/core/tags/calendar/CalendarTag.java

Modified: incubator/roller/trunk/src/org/apache/roller/ui/core/tags/calendar/CalendarTag.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/core/tags/calendar/CalendarTag.java?view=diff&rev=482695&r1=482694&r2=482695
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/core/tags/calendar/CalendarTag.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/tags/calendar/CalendarTag.java Tue Dec  5 08:01:12 2006
@@ -163,8 +163,9 @@
             day = DateUtil.getNoonOfDay(day, cal);
             cal.set( Calendar.DAY_OF_MONTH, cal.getMinimum(Calendar.DAY_OF_MONTH) );
             
-            // go back to sunday before that: the first sunday in the calendar
-            while ( cal.get( Calendar.DAY_OF_WEEK ) != Calendar.SUNDAY ) {
+            // Go back to first day of week before that (Sunday in US, Monday in France, e.g.)
+            // in the calendar
+            while ( cal.get( Calendar.DAY_OF_WEEK ) != cal.getFirstDayOfWeek() ) {
                 cal.add( Calendar.DATE, -1 );
             }