[phpwiki-checkins] CVS: phpwiki index.php,1.15,1.16

[Geoffrey T. D. <da...@us...>]

Update of /cvsroot/phpwiki/phpwiki
In directory usw-pr-cvs1:/tmp/cvs-serv11548

Modified Files:
	index.php 
Log Message:
Use strftime() for dates/times instead of date().
(Strftime() supports locales, date() does not.)

Also fixed a couple minor bugs having to do with the initial
creation of the RecentChanges page, and other miscellaneous
wiki setup.



Index: index.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/index.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** index.php	2001/04/06 18:21:36	1.15
--- index.php	2001/04/07 00:34:30	1.16
***************
*** 114,121 ****
  /////////////////////////////////////////////////////////////////////
  
! // Select your language - default language "C": English
  // other languages available: Dutch "nl", Spanish "es", German "de",
! // and Swedish "sv"
! $LANG = "C";
  
  // If you specify a relative URL for the CSS and images,
--- 114,144 ----
  /////////////////////////////////////////////////////////////////////
  
! // Select your language/locale - default language "C": English
  // other languages available: Dutch "nl", Spanish "es", German "de",
! // and Swedish "sv".
! //
! // Note that on some systems, apprently using these short forms for
! // the locale won't work.  On my home system 'LANG=de' won't result
! // in german pages.  Somehow the system must recognize the locale
! // as a valid locale before gettext() will work.  ('de_DE' works for
! // me.)
! putenv('LANG=C');
! 
! // Setting the LANG environment variable (accomplished above) may or
! // may not be sufficient to cause PhpWiki to produce dates in your
! // native language.  (It depends on the configuration of the operating
! // system on your http server.)  The problem is that, e.g. 'de' is
! // often not a valid locale.
! //
! // A standard locale name is typically of  the  form
! // language[_territory][.codeset][@modifier],  where  language is
! // an ISO 639 language code, territory is an ISO 3166 country code,
! // and codeset  is  a  character  set or encoding identifier like
! // ISO-8859-1 or UTF-8.
! //
! // You can tailor the locale used for time and date formatting by setting
! // the LC_TIME environment variable.  You'll have to experiment to find
! // the correct setting:
! //putenv('LC_TIME=de_DE');
  
  // If you specify a relative URL for the CSS and images,
***************
*** 134,142 ****
  //$SignatureImg = "images/signature.png";
  
! // date & time formats used to display modification times, etc.
! // formats are given as format strings to PHP date() function
! // FIXME: these should have different defaults depending on locale.
! $datetimeformat = "F j, Y";	// may contain time of day
! $dateformat = "F j, Y";	// must not contain time
  
  // this defines how many page names to list when displaying
--- 157,165 ----
  //$SignatureImg = "images/signature.png";
  
! // Date & time formats used to display modification times, etc.
! // Formats are given as format strings to PHP strftime() function
! // See http://www.php.net/manual/en/function.strftime.php for details.
! $datetimeformat = "%B %e, %Y";	// may contain time of day
! $dateformat = "%B %e, %Y";	// must not contain time
  
  // this defines how many page names to list when displaying
***************
*** 148,152 ****
  
  // Template files (filenames are relative to script position)
! // (These filenames will be passed through gettext() before use.)
  $templates = array("BROWSE" =>    "templates/browse.html",
  		   "EDITPAGE" =>  "templates/editpage.html",
--- 171,176 ----
  
  // Template files (filenames are relative to script position)
! // However, if a LANG is set, they we be searched for in a locale
! // specific location first.
  $templates = array("BROWSE" =>    "templates/browse.html",
  		   "EDITPAGE" =>  "templates/editpage.html",