From 66600aac62a2866ef6c4c19e7e566fcbf08cec78 Mon Sep 17 00:00:00 2001
From: vargenau <vargenau@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Sun, 17 Aug 2008 07:45:15 +0000
Subject: [PATCH] No comma in default

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@6142 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 lib/plugin/Calendar.php         | 12 +++++++-----
 lib/plugin/CalendarList.php     |  7 +++++--
 pgsrc/Help%2FCalendarListPlugin | 13 +++++++------
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/lib/plugin/Calendar.php b/lib/plugin/Calendar.php
index 689c7078b..5645c55aa 100644
--- a/lib/plugin/Calendar.php
+++ b/lib/plugin/Calendar.php
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-rcs_id('$Id: Calendar.php,v 1.34 2007-08-25 18:52:21 rurban Exp $');
+rcs_id('$Id: Calendar.php,v 1.35 2008-08-17 07:45:15 vargenau Exp $');
 /**
  Copyright 1999,2000,2001,2002,2007 $ThePhpWikiProgrammingTeam
 
@@ -47,7 +47,7 @@ extends WikiPlugin
 
     function getVersion() {
         return preg_replace("/[Revision: $]/", '',
-                            "\$Revision: 1.34 $");
+                            "\$Revision: 1.35 $");
     }
 
     function getDefaultArguments() {
@@ -56,10 +56,9 @@ extends WikiPlugin
                      'year'             => '',
                      'month'            => '',
                      'month_offset'     => 0,
-
-                     'month_format'     => '%B, %Y',
+                     'month_format'     => '%B %Y',
                      'wday_format'      => '%a',
-                     'start_wday'       => '1', // start now with monday
+                     'start_wday'       => '1', // start now with Monday
 		     'display_weeknum'  => 0);
     }
 
@@ -251,6 +250,9 @@ extends WikiPlugin
 };
 
 // $Log: not supported by cvs2svn $
+// Revision 1.34  2007/08/25 18:52:21  rurban
+// Calendar weekday: change from Sunday to start now with Monday
+//
 // Revision 1.33  2007/01/22 23:48:54  rurban
 // Fix Calendar %U: weeknum starting with 1
 //
diff --git a/lib/plugin/CalendarList.php b/lib/plugin/CalendarList.php
index c02ac0f05..77249fb55 100644
--- a/lib/plugin/CalendarList.php
+++ b/lib/plugin/CalendarList.php
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-rcs_id('$Id: CalendarList.php,v 1.11 2008-02-14 18:58:15 rurban Exp $');
+rcs_id('$Id: CalendarList.php,v 1.12 2008-08-17 07:45:03 vargenau Exp $');
 
 /**
  Copyright 1999-2002,2005-2007 $ThePhpWikiProgrammingTeam
@@ -72,7 +72,7 @@ extends WikiPlugin
                      'last_n_days'  => PLUGIN_CALENDARLIST_LAST_N_DAYS,	// one or the other, not both
                      'last_n'	    => PLUGIN_CALENDARLIST_LAST_N,
 
-                     'month_format' => '%B, %Y',
+                     'month_format' => '%B %Y',
                      'wday_format'  => '%a',
                      'start_wday'   => '1');
     }
@@ -227,6 +227,9 @@ extends WikiPlugin
 
 
 // $Log: not supported by cvs2svn $
+// Revision 1.11  2008/02/14 18:58:15  rurban
+// provide mday default
+//
 // Revision 1.10  2007/09/01 13:39:46  rurban
 //  CalendarList pages now in parallel with Calendar: year + month args as start base, The behaviour before 2007 with last/next_n_days was to start now.
 //
diff --git a/pgsrc/Help%2FCalendarListPlugin b/pgsrc/Help%2FCalendarListPlugin
index ccf627c59..c76762db2 100644
--- a/pgsrc/Help%2FCalendarListPlugin
+++ b/pgsrc/Help%2FCalendarListPlugin
@@ -1,6 +1,6 @@
-Date: Mon, 16 Jun 2008 14:15:24 +0000
+Date: Mon, 12 Aug 2008 14:15:24 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.3.14-20080124)
-X-Rcs-Id: $Id: Help%2FCalendarListPlugin,v 1.6 2008-06-19 18:22:32 vargenau Exp $
+X-Rcs-Id: $Id: Help%2FCalendarListPlugin,v 1.7 2008-08-17 07:40:47 vargenau Exp $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FCalendarListPlugin;
   flags=PAGE_LOCKED;
@@ -13,8 +13,6 @@ with the [Calendar|Help:CalendarPlugin] plugin.
 It was written for those who use a wiki as a
 [personal information manager|PhpWiki:PersonalWiki].
 
-Derived from Calendar.php by Martin Norbäck <mailto:martin@safelogic.se>
-
 Just click any date in the calendar, edit the for that date, then come back to
 this page. The event should be listed below the calendar.
 
@@ -98,7 +96,7 @@ _Click any date and edit it, then return to this page_:
 <strong>month_format</strong>:
 
   How to display the Month.<br>
-  Default: '%B, %Y'
+  Default: '%B %Y'
 
 <strong>wday_format</strong>:
 
@@ -118,6 +116,9 @@ _Click any date and edit it, then return to this page_:
 * PLUGIN_CALENDARLIST_LAST_N_DAYS = ''
 * PLUGIN_CALENDARLIST_LAST_N      = ''
 
------
+!!! Author
 
+Derived from [Calendar|Help:CalendarPlugin] plugin by [Martin Norbäck|mailto:martin@safelogic.se].
+
+-----
 [PhpWikiDocumentation] [CategoryWikiPlugin]
-- 
2.45.0