X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/fd817f9ac3c074622fe7076516dca61199b09372..94a51309635b799fd25aeaf60d90fab25939343e:/IkiWiki/Plugin/calendar.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index d43320cac..d443198f6 100644
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -13,7 +13,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
 require 5.002;
 package IkiWiki::Plugin::calendar;
@@ -22,7 +22,6 @@ use warnings;
 use strict;
 use IkiWiki 3.00;
 use Time::Local;
-use POSIX ();
 
 my $time=time;
 my @now=localtime($time);
@@ -49,7 +48,7 @@ sub getsetup () {
 		},
 		archive_pagespec => {
 			type => "pagespec",
-			example => "posts/* and !*/Discussion",
+			example => "page(posts/*) and !*/Discussion",
 			description => "PageSpec of pages to include in the archives; used by ikiwiki-calendar command",
 			link => 'ikiwiki/PageSpec',
 			safe => 1,
@@ -123,21 +122,22 @@ sub format_month (@) {
 	}
 
 	# Find out month names for this, next, and previous months
-	my $monthname=POSIX::strftime("%B", @monthstart);
-	my $pmonthname=POSIX::strftime("%B", localtime(timelocal(0,0,0,1,$pmonth-1,$pyear-1900)));
-	my $nmonthname=POSIX::strftime("%B", localtime(timelocal(0,0,0,1,$nmonth-1,$nyear-1900)));
+	my $monthabbrev=strftime_utf8("%b", @monthstart);
+	my $monthname=strftime_utf8("%B", @monthstart);
+	my $pmonthname=strftime_utf8("%B", localtime(timelocal(0,0,0,1,$pmonth-1,$pyear-1900)));
+	my $nmonthname=strftime_utf8("%B", localtime(timelocal(0,0,0,1,$nmonth-1,$nyear-1900)));
 
 	my $archivebase = 'archives';
 	$archivebase = $config{archivebase} if defined $config{archivebase};
 	$archivebase = $params{archivebase} if defined $params{archivebase};
   
 	# Calculate URL's for monthly archives.
-	my ($url, $purl, $nurl)=("$monthname",'','');
+	my ($url, $purl, $nurl)=("$monthname $params{year}",'','');
 	if (exists $pagesources{"$archivebase/$params{year}/$params{month}"}) {
 		$url = htmllink($params{page}, $params{destpage}, 
 			"$archivebase/$params{year}/".$params{month},
 			noimageinline => 1,
-			linktext => $monthname,
+			linktext => "$monthabbrev $params{year}",
 			title => $monthname);
 	}
 	add_depends($params{page}, "$archivebase/$params{year}/$params{month}",
@@ -181,8 +181,8 @@ EOF
 	my %dowabbr;
 	for my $dow ($week_start_day..$week_start_day+6) {
 		my @day=localtime(timelocal(0,0,0,$start_day++,$params{month}-1,$params{year}-1900));
-		my $downame = POSIX::strftime("%A", @day);
-		my $dowabbr = POSIX::strftime("%a", @day);
+		my $downame = strftime_utf8("%A", @day);
+		my $dowabbr = substr($downame, 0, 1);
 		$downame{$dow % 7}=$downame;
 		$dowabbr{$dow % 7}=$dowabbr;
 		$calendar.= qq{\t\t<th class="month-calendar-day-head $downame" title="$downame">$dowabbr</th>\n};
@@ -328,8 +328,8 @@ EOF
 	for (my $month = 1; $month <= 12; $month++) {
 		my @day=localtime(timelocal(0,0,0,15,$month-1,$params{year}-1900));
 		my $murl;
-		my $monthname = POSIX::strftime("%B", @day);
-		my $monthabbr = POSIX::strftime("%b", @day);
+		my $monthname = strftime_utf8("%B", @day);
+		my $monthabbr = strftime_utf8("%b", @day);
 		$calendar.=qq{\t<tr>\n}  if ($month % $params{months_per_row} == 1);
 		my $tag;
 		my $mtag=sprintf("%02d", $month);
@@ -396,15 +396,20 @@ sub preprocess (@) {
 	$params{year}  = $thisyear	unless defined $params{year};
 	$params{month} = $thismonth	unless defined $params{month};
 
-	my $relativemonth=0;
-	if ($params{month} < 1) {
-		$params{month}=$thismonth+$params{month};
-		$relativemonth=1;
-	}
 	my $relativeyear=0;
 	if ($params{year} < 1) {
-		$params{year}=$thisyear+$params{year};
 		$relativeyear=1;
+		$params{year}=$thisyear+$params{year};
+	}
+	my $relativemonth=0;
+	if ($params{month} < 1) {
+		$relativemonth=1;
+		my $monthoff=$params{month};
+		$params{month}=($thismonth+$monthoff) % 12;
+		$params{month}=12 if $params{month}==0;
+		my $yearoff=POSIX::ceil(($thismonth-$params{month}) / -12)
+			- int($monthoff / 12);
+		$params{year}-=$yearoff;
 	}
 	
 	$params{month} = sprintf("%02d", $params{month});
@@ -485,6 +490,7 @@ sub needsbuild (@) {
 			}
 		}
 	}
+	return $needsbuild;
 }
 
 1