phpwiki-talk

Re: [Phpwiki-talk] Patch: internationalisation with php3 fallback [Was: ...]

[Steve W. <sw...@wc...>]

The patch files were over 40K, which made the listserv hold them for
approval. I upped the msg size limit to 100K.

I'm siding with Arno on the ease of installation issue, which has been a
major concern of mine since version 0.01 back in December. It should be as
easy as tar -xzvf <phpwiki tarball> and it runs on any GNU/Linux or BSD
system. I never anticipated Windows users, so I will include .zip files in
future releases.

When we say "users" of PhpWiki we usually mean "the people who install and
maintain the Wiki," i.e. the sysadmins and programmers. It's my belief
that the easier it is to use (install) the more readily accepted it is;
and that we have three types of usability to consider when coding:

* code usability (hackers can easily add/modify code)
* install/admin usability (nobody has to recompile anything if they have a
vanilla system, INSTALL files are good, config is well commented)
* end user usability (Jakob Neilsen usability, i.e. it's easy to
understand and use the Wiki)

I think code useability is easily achieved. Admin usability involves
compromises between the lowest common denominator system (say,
Linux+PHP3.0.12+DBM files) and the latest release of PHP/Linux/databases. 
At some point we will no longer support Apache 1.x because we've all moved
to Apache 2.0, but that day is far off. End user usability is *really
hard* and, more than anything, requires frequent re-evaluation and
improvement. 

sw

...............................ooo0000ooo.................................
   Hear FM quality freeform radio through the Internet: http://wcsb.org/
                     home page: www.wcsb.org/~swain 

[Phpwiki-talk] Patch: internationalisation with php3 fallback [Was: ...]

[Jan N. <ja...@gn...>]

On Sunday, 1 October 2000, Arno Hollosi writes:

> > Right Thing is to read all wiki-page-emitted text from a wiki-page.
> 
> Interesting idea :o)

Must have read it somewhere.  It may be too costly, though, wrt performance.

> > Stupid question: you *are* using php4, right?
> 
> No I'm not. I didn't need the new functionality yet.
> So why upgrade? (Speed isn't an issue for me either).

You do if you want gettext ().  Lots of bugs fixed in php4, too.

> > Hmm, I disagree here, too.  Ignorant users cannot expect to install
> > software that's not in their distribution.
> 
> This doesn't excuse deliberately complicating the install process.

Agreed.  But, the install process doesn't change, the msg* functions
are only run by developers/translators.

> > > Why not use php-files that just include a hash of translated strings?
> > Yes, this would be Better.  Do send a patch.
> 
> Patch attached below. Apply over your patch.
> (i.e. latest CVS -> your patch -> this patch)

[snipped s/gettext/GetLocale/g]

> +   $language = 'nl';
> +   require 'locale/nl.php';
> +   
> +   function GetLocale($text) {
> +      global $language, $locale;
> +
> +      if(!empty($locale[$language][$text]))
> +	 return $locale[$language][$text];
> +      return $text;
> +   }

This is not the way to go, imho.  As far as I can see,
your patch has these:

   Pros:
       * localisation works for users that don't upgrade to php4
       * translators/developers need not to run ./translate.sh
         (and maybe install appropriete tools)

   Cons:
       * we can't use xgettext to produce the translation file right away
       * translators can't use msgmerge to maintain translations

Hmm.  Now that I write this down, we can have both.  We should
definately use the gettext tools for the translators.  They produce
the .po files, and it would be a shame not to use the built-in
localisation mechanism for php4.

But maybe we can easily provide a fallback for php3 users:

wiki_config.php3:

   //$LANG="C"; // (What should be the) Default: English
   $LANG="nl";  // We all speak dutch, no?
   if (!function_exists ('gettext')) {
      require "locale/$LANG/LC_MESSAGES/phpwiki.php3";
      function gettext ($text) { 
 	 global $locale;
         if (!empty ($locale[$text]))
           return $locale[$text];
         return $text;
      }
   } else {
      putenv ("LANG=$LANG");
      bindtextdomain ("phpwiki", "./locale");
      textdomain ("phpwiki");
   }


and use a script to generate the fallback $locale table from
the .po file.

Greetings,
Jan.

Here's a full diff of what I have now:

--- ../phpwiki/locale/nl/LC_MESSAGES/phpwiki.php3	Thu Jan  1 01:00:00 1970
+++ ./locale/nl/LC_MESSAGES/phpwiki.php3	Sun Oct  1 19:42:44 2000
@@ -0,0 +1,58 @@
+<?php
+$locale["TestPage"] =
+   "TestPagina";
+$locale["./pgsrc"] =
+   "./pgsrc/nl";
+$locale["templates/browse.html"] =
+   "templates/nl/browse.html";
+$locale["templates/editpage.html"] =
+   "templates/nl/editpage.html";
+$locale["templates/editlinks.html"] =
+   "templates/nl/editlinks.html";
+$locale["templates/message.html"] =
+   "templates/nl/message.html";
+$locale["Diff of %s."] =
+   "Diff van %s.";
+$locale["FrontPage"] =
+   "VoorPagina";
+$locale["Describe %s here."] =
+   "Beschrijf %s hier.";
+$locale["AddingPages"] =
+   "PaginasToevoegen";
+$locale["ConvertSpacesToTabs"] =
+   "VertaalSpatiesNaarTabs";
+$locale["EditText"] =
+   "VeranderTekst";
+$locale["FindPage"] =
+   "ZoekPagina";
+$locale["GoodStyle"] =
+   "GoedeStijl";
+$locale["HowToUseWiki"] =
+   "HoeWikiTeGebruiken";
+$locale["MoreAboutMechanics"] =
+   "MeerOverTechnieken";
+$locale["MostPopular"] =
+   "MeestBezocht";
+$locale["RecentChanges"] =
+   "RecenteVeranderingen";
+$locale["RecentVisitors"] =
+   "RecenteBezoekers";
+$locale["ReleaseNotes"] =
+   "UitgaveNoten";
+$locale["SandBox"] =
+   "ZandBak";
+$locale["SteveWainstead"] =
+   "";
+$locale["TextFormattingRules"] =
+   "TekstFormatterinsRegels";
+$locale["WabiSabi"] =
+   "";
+$locale["WikiWikiWeb"] =
+   "";
+$locale["PageInfo"] =
+   "PaginaInfo";
+$locale["Thank you for editing %s."] =
+   "Bedankt voor het veranderen van %s.";
+$locale["Your careful attention to detail is much appreciated."] =
+   "Je zorgvuldige aandacht voor detail wordt erg gewaardeerd.";
+?>
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/pgsrc/HowToUseWiki ./pgsrc/HowToUseWiki
--- ../phpwiki/pgsrc/HowToUseWiki	Thu Aug 10 17:29:20 2000
+++ ./pgsrc/HowToUseWiki	Sat Sep 30 21:15:32 2000
@@ -9,7 +9,7 @@
 either side ''like this''.
 	* You get '''bold text''' by using three quotes on either side.
 	* And, '''''bold italics''''' with five.
-	* You get bullets by using a tab and an asterick *
+	* You get bullets by using a tab and an asterisk *
 	* If you use Windows, you can't use your tab key. It's Bill Gates's fault. But you can check the little box that says Convert Spaces To Tabs. You can type a bunch of spaces and the Wiki will recognize them as a tab.
 	* To have plain monospaced font, indent with a space:
 
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/pgsrc/nl/GoedeStijl ./pgsrc/nl/GoedeStijl
--- ../phpwiki/pgsrc/nl/GoedeStijl	Thu Jan  1 01:00:00 1970
+++ ./pgsrc/nl/GoedeStijl	Fri Jun  2 17:59:04 2000
@@ -0,0 +1,13 @@
+"Young writers often suppose that style is a garnish for the meat of 
+prose, a sauce by which a dull dish is made palatable. Style has no such 
+separate entity; it is nondetachable, unfilterable. The beginner should 
+approach style warily, realizing that it is himself he is approaching, no 
+other; and he should begin by turning resolutely away from all devices 
+that are popularly believed to indicate style--all mannerisms, tricks, 
+adornments. The approach to style is by way of plainness, simplicity, 
+orderliness, sincerity." 
+
+--Strunk and White, "The Elements of Style"
+
+''And thus an American textbook, typical required reading for 10th-grade English students, unknowingly extols some virtues of WabiSabi''
+--scummings
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/pgsrc/nl/HoeWikiTeGebruiken ./pgsrc/nl/HoeWikiTeGebruiken
--- ../phpwiki/pgsrc/nl/HoeWikiTeGebruiken	Thu Jan  1 01:00:00 1970
+++ ./pgsrc/nl/HoeWikiTeGebruiken	Sat Sep 30 19:37:37 2000
@@ -0,0 +1,36 @@
+''"Wiki wiki"'' means "quick" in Hawai'ian.
+
+'''All you really need to know is:'''
+
+	* To edit any page click on the Edit Text link at the bottom of
+the page. You should do that right now, and read the source code of this
+page. It will make more sense.
+	* You get italics by surrounding words with two single quotes on
+either side ''like this''.
+	* You get '''bold text''' by using three quotes on either side.
+	* And, '''''bold italics''''' with five.
+	* You get bullets by using a tab and an asterisk *
+	* If you use Windows, you can't use your tab key. It's Bill Gates's fault. But you can check the little box that says Convert Spaces To Tabs. You can type a bunch of spaces and the Wiki will recognize them as a tab.
+	* To have plain monospaced font, indent with a space:
+
+ this is a poem 
+ about monospacing
+ nothing rhymes with poem
+ nothing rhymes with monospacing
+
+	* You can seperate paragraphs with an extra blank line. Example:
+
+I am a paragraph.
+
+I am a paragraph too. We're just very small paragraphs.
+
+
+	* You can get horizontal rules with four or more dashes like this:
+----
+	* To create hyperlinks you just capitalize the words and string them together. Let's say you want to create a page about how Steve Wainstead eats worms. All you have to do is capitalize each word and string them together like this: SteveWainsteadEatsWorms. If the page does not exist yet a question mark appears after the link, inviting you to create the page: ThisPageShouldNotExist. (And please don't ruin the example by creating one.) 
+	* To link to pages outside the Wiki, you can just type in the URL and Wiki will link it for you: http://www.nytimes.com/
+* To put images in, just provide the hyperlink in brackets like this: [[http://www.yourhost.yourdomain/images/picture.png]. Image URLs not in brackets will just appear as hyperlinks to the image.
+	* Now you are ready to begin AddingPages.
+
+----
+A WikiWikiWeb is meant to be fast and easy to edit. It has very simple markup that you can read about in TextFormattingRules.
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/pgsrc/nl/JanNieuwenhuizen ./pgsrc/nl/JanNieuwenhuizen
--- ../phpwiki/pgsrc/nl/JanNieuwenhuizen	Thu Jan  1 01:00:00 1970
+++ ./pgsrc/nl/JanNieuwenhuizen	Sat Sep 30 17:51:52 2000
@@ -0,0 +1,3 @@
+Hallo.  Ik heb dit WikiWikiWeb in het nederlands vertaald.  Ik ben op http://www.xs4all.nl/~jantien.
+
+Meldt onjuistheden in de vertaling aan mailto:ja...@gn....
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/pgsrc/nl/MeerOverTechnieken ./pgsrc/nl/MeerOverTechnieken
--- ../phpwiki/pgsrc/nl/MeerOverTechnieken	Thu Jan  1 01:00:00 1970
+++ ./pgsrc/nl/MeerOverTechnieken	Fri Jun  2 17:59:04 2000
@@ -0,0 +1,17 @@
+PhpWiki is written in the server-side scripting language PHP, available from http://www.php.net/. PHP resembles C and Perl in its syntax, and functions much like ASP, EmbPerl or JSP.
+
+PhpWiki consists of a dozen or so files of mixed PHP and HTML. The web pages that make up a WikiWikiWeb based on PHP live in a DBM file with backup copies of previous versions of pages stored in a second DBM file.
+
+Every time a user hits the site the page requested is pulled from the DBM and rendered on the fly. The user only ever requests the file index.php3, which then decides which other php files to include.
+
+Links to pages in the wiki are automatically linked: PhpWiki. This might be the single most compelling aspect of a wiki, the ability to add pages simply by linking to them. The next most compelling thing is how easily external URL's link:
+	# http://www.wcsb.org/
+	# ftp://ftp.redhat.com/
+	# news://news.mozilla.org/
+
+Combined with one namespace and a simple markup, a Wiki exhibits many of the characteristics of WabiSabi.
+
+PhpWiki is licensed under the Gnu General Public license, which you should be able to see here: http://www.gnu.org/copyleft/gpl.txt.
+
+
+
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/pgsrc/nl/MeestBezocht ./pgsrc/nl/MeestBezocht
--- ../phpwiki/pgsrc/nl/MeestBezocht	Thu Jan  1 01:00:00 1970
+++ ./pgsrc/nl/MeestBezocht	Mon Jun 26 23:26:45 2000
@@ -0,0 +1,4 @@
+The 20 most popular pages of this wiki:
+(hitcount, pagename)
+
+%%Mostpopular%%
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/pgsrc/nl/PaginasToevoegen ./pgsrc/nl/PaginasToevoegen
--- ../phpwiki/pgsrc/nl/PaginasToevoegen	Thu Jan  1 01:00:00 1970
+++ ./pgsrc/nl/PaginasToevoegen	Fri Jun  2 17:59:04 2000
@@ -0,0 +1,11 @@
+To add a new page to Wiki, all you have to do is come up with a meaningful title, capatalize all the words and StringThemTogetherLikeThis. Wiki automagically recognizes it as a hyperlink.
+
+Then you can go ahead and ClickTheQuestionMark at the end of your new hyperlink, and the Wiki will give you a window for making the new page.
+
+If you wish to add documents with complex markup to the Wiki, you might be better off providing a URL to it than trying to add the text of the document here, like so:
+
+ PhpWiki project homepage: http://wcsb.org/~swain/php/wiki/
+
+The Wiki does not support HTML tags (see TextFormattingRules).  <tags>They will just render like text.</tags> Wiki is meant to be as simple as possible to encourage use.
+
+Note that there is a feature that your system administrator can enable to allow embedded HTML, but there are security risks involved.
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/pgsrc/nl/RecenteBezoekers ./pgsrc/nl/RecenteBezoekers
--- ../phpwiki/pgsrc/nl/RecenteBezoekers	Thu Jan  1 01:00:00 1970
+++ ./pgsrc/nl/RecenteBezoekers	Sat Sep 30 17:48:13 2000
@@ -0,0 +1,6 @@
+Onderteken hieronder met naam en datum!
+
+Jeff Dairiki, Arno Hollosi, SteveWainstead, Php Wiki authors
+JanNieuwenhuizen, Php Wiki vertaler.
+
+
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/pgsrc/nl/RecenteVeranderingen ./pgsrc/nl/RecenteVeranderingen
--- ../phpwiki/pgsrc/nl/RecenteVeranderingen	Thu Jan  1 01:00:00 1970
+++ ./pgsrc/nl/RecenteVeranderingen	Sat Sep 30 19:33:36 2000
@@ -0,0 +1,29 @@
+De meest recent veranderde pagina's staan hieronder:
+
+____Dag een (eerste dag voor deze Wiki)
+
+* [GoedeStijl]
+* [HoeWikiTeGebruiken]
+* [JanNieuwenhuizen]
+* [MeerOverTechnieken]
+* [MeestBezocht]
+* [PaginasToevoegen]
+* [RecenteBezoekers]
+* [RecenteVeranderingen]
+* [SteveWainstead]
+* [TekstFormatteringsRegels]
+* [TestPagina]
+* [UitgaveNoten]
+* [VeranderTekst]
+* [VertaalSpatiesNaarTabs]
+* [VoorPagina]
+* [WabiSabi]
+* [WikiWikiWeb]
+* [ZandBak]
+* [ZoekPagina]
+
+Zoek snel een pagina op:
+%%Search%%
+----
+
+
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/pgsrc/nl/SteveWainstead ./pgsrc/nl/SteveWainstead
--- ../phpwiki/pgsrc/nl/SteveWainstead	Thu Jan  1 01:00:00 1970
+++ ./pgsrc/nl/SteveWainstead	Sat Sep 30 17:51:22 2000
@@ -0,0 +1,4 @@
+Hi. I built this WikiWikiWeb. I'm at http://wcsb.org/~swain/.
+
+Please report bugs to mailto:sw...@pa...
+
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/pgsrc/nl/TekstFormatteringsRegels ./pgsrc/nl/TekstFormatteringsRegels
--- ../phpwiki/pgsrc/nl/TekstFormatteringsRegels	Thu Jan  1 01:00:00 1970
+++ ./pgsrc/nl/TekstFormatteringsRegels	Sat Jun  3 01:37:56 2000
@@ -0,0 +1,90 @@
+'''Paragraphs'''
+
+	* Don't Indent paragraphs
+
+	* Words wrap and fill as needed
+
+	* Use blank lines as separators
+
+	* Four or more minus signs make a horizontal rule
+
+	* %%''''% makes a linebreak (in headings and lists too)
+
+
+'''Lists'''
+
+	* tab-* for first level
+
+		* tab-tab-* for second level, etc.
+
+	* Use * for bullet lists, 1. for numbered lists (mix at will)
+
+	* tab-Term:-tab Definition for definition lists
+
+	* One line for each item
+
+	* Other leading whitespace signals preformatted text, changes font.
+
+
+'''Headings'''
+
+	* '!' at the start of a line makes a small heading
+
+	* '!!' at the start of a line makes a medium heading 
+
+	* '!!!' at the start of a line makes a large heading
+
+
+'''Fonts'''
+	* Indent with one or more spaces to use a monospace font:
+
+ This is in monospace
+This is not
+
+
+'''Indented Paragraphs'''
+''(Quotes)''
+
+	* tab-space-:-tab -- often used (with emphasis) for quotations.  (See SimulatingQuoteBlocks)
+
+
+'''Emphasis'''
+
+	* Use doubled single-quotes ('') for emphasis (usually italics)
+
+	* Use tripled single-quotes (''') for strong emphasis (usually bold)
+
+	* Use five single-quotes ('''''), or triples within doubles, for some other kind of emphasis (BoldItalicInWiki), but be careful about the bugs in the Wiki emphasis logic...
+
+	* Emphasis can be used multiple times within a line, but cannot cross line boundaries
+
+
+'''References'''
+	* Hyperlinks to other pages within the Wiki are made by placing the page name in square brackets: [this is a page link]
+
+	* Hyperlinks to external pages are done like this: [http://www.wcsb.org/]
+
+	* You can name the links to the external pages by providing a name, a bar (|) and then the hyperlink: [Steve's home page | http://wcsb.org/~swain/]  
+
+	* Old Wiki linking is still supported: JoinCapitalizedWords to make local references
+
+	* You can suppress linking to old-style references by preceeding the word with a '!', e.g. !NotLinkedAsWikiName
+
+	* [1], [2], [3], [4] refer to remote references. Click EditLinks on the edit form to enter URLs. These differ from the newer linking scheme; references are unique to a page.
+
+	* Also, the old way of linking URL's is still supported: precede URLs with "http:", "ftp:" or "mailto:" to create links automatically as in: http://c2.com/
+
+	* URLs ending with .png are inlined ''if inserted as a remote reference'' 
+
+
+'''Mark-Up Language'''
+
+	* Don't bother
+
+	* < and > are themselves
+
+	* The & characters will not work
+
+	* If you really must use HTML, start each line with a bar (|). Note that this featured must be enabled by the system administrator.
+
+
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/pgsrc/nl/TestPagina ./pgsrc/nl/TestPagina
--- ../phpwiki/pgsrc/nl/TestPagina	Thu Jan  1 01:00:00 1970
+++ ./pgsrc/nl/TestPagina	Wed Jul 12 04:53:40 2000
@@ -0,0 +1,122 @@
+ New lists: astericks and hash marks
+* bullet
+* l1
+** l2
+** l2
+*** l3
+# one
+#two
+#three
+*****l5
+***l3
+*l1
+ preformatted text
+**    l2
+----
+	* level 1
+	* l1
+		*l2
+		*l2
+			*l3
+			*l3
+				*l4
+			*l3
+					*l5
+			*l3
+	#one
+	#two
+		#one
+		#two
+	*l1
+		#three
+		#four
+	*l1
+		*l2
+		# one
+		# two
+
+ preformatted text
+ some more text
+
+	*l1
+				*l4
+	# number
+	# number
+this is a plain paragraph
+	* bullet
+this is a plain paragraph again
+	# number
+----
+__Link tests__
+# FrontPage
+# [FrontPage]
+# Link in brackets: [http://phpwiki.sourceforge.net]
+# Link outside brackets: http://phpwiki.sourceforge.net/
+# Link with Wiki word: http://phpwiki.sourceforge.net/phpwiki/index.php3?FrontPage
+# Two consecutive links: http://phpwiki.sourceforge.net/ http://phpwiki.sourceforge.net/phpwiki/
+# [PhpWiki on Sourceforge | http://phpwiki.sourceforge.net/]
+# [URL with a WikiWord | http://phpwiki.sourceforge.net/phpwiki/index.php3?RecentChanges]
+# Javascript: [boo! | javascript:alert('oops') ] 
+# A [[Link] produces a [Link]
+# A [Link] looks like this: [[link]
+# This is a [%%%] line break link
+
+----
+ Markup tests:
+__underscores for bold__
+
+'''quotes for bold'''
+
+''quotes for italic''
+
+__''underscores bold italic''__
+
+'''''five quotes bold italic'''''
+
+''''''six quotes''''''
+
+'''''Bold italic''' and italic'' (buggy)
+
+'''Bold and ''bold-italic''''' (also buggy)
+
+! h1
+
+!! h2
+
+!!! h3
+
+this is plain text with <br>%%%
+a line break
+
+look at the <a href="http://phpwiki.sourceforge.net/">markup language</a>
+
+you cannot use &, < or >
+
+----
+ preformatted text:
+ 
+ __underscores for bold__
+ 
+ '''quotes for bold'''
+ 
+ ''quotes for italic''
+ 
+ __''underscores bold italic''__
+ 
+ '''''five quotes bold italic'''''
+ 
+ ''''''six quotes''''''
+ 
+ ! h1
+ 
+ !! h2
+ 
+ !!! h3
+ 
+ this is plain text with <br>%%%
+ a line break
+ 
+ look at the <a href="http://phpwiki.sourceforge.net/">markup language</a>
+ 
+ you cannot use &, < or >
+ 
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/pgsrc/nl/UitgaveNoten ./pgsrc/nl/UitgaveNoten
--- ../phpwiki/pgsrc/nl/UitgaveNoten	Thu Jan  1 01:00:00 1970
+++ ./pgsrc/nl/UitgaveNoten	Fri Jun 23 05:20:01 2000
@@ -0,0 +1,39 @@
+PhpWiki 1.1.6 is a major revision of PhpWiki. The ability to have themes (via an
+easy-to-edit template system) has been added; the schema for MySQL has been
+completely overhauled, breaking the page details into columns (for efficiency we
+agreed not to put references in a separate table, so it's not completely
+normalized. "Don't let the best be the enemy of the good.")
+
+Postgresql support has been added and the markup language is evolving, now allowing
+!<h1>
+!!<h2>
+!!!<h3>
+tags and __a new way to make text bold__, and of course the
+[new linking scheme].
+
+There is a new feature on all pages called ''more info'' that gives you a low level
+detailed view of a page, which is probably more useful for debugging than anything.
+
+As we move towards a 1.2 release we will be adding logging, top ten most active
+pages and other new features with the new database schema (and yes, these features
+will make it into the DBM version too). I also want to add mSQL support and test it
+under Zend, the new PHP4.
+
+Below are the release notes for version 1.03, the last release of the 1.0 PhpWiki
+series. --Steve Wainstead, mailto:sw...@pa...
+
+----
+
+PhpWiki was written because I am so interested in WikiWikiWebs, and I haven't used PHP since version 2.0. I wanted to see how it had advanced.
+
+Version 1.0 is a near-perfect clone of the Portland Pattern Repository, http://c2.com/cgi-bin/wiki?WikiWikiWeb. In truth, I was using the Wiki script you can download from there as a model; that Wiki lacks a number of features the PPR has, like EditCopy. So in truth PhpWiki is a kind of hybrid of the PPR and the generic Wiki you can get from there (which is written in Perl).
+
+The one caveat of PhpWiki is the allowance of HTML if the line is preceded by a bar (or pipe, which is how I usually say it). (That's a '|'). It was very simple to add, and the idea came from a posting somewhere on the PPR about how AT&T had an internal Wiki clone and used the same technique. The ability to embed HTML is disabled by default for security reasons.
+
+Version 1.01 includes a patch that fixes a small error with rendering <hr> lines. Thanks to Gerry Barksdale.
+
+See the HISTORY file for a rundown on the whole development process if that sort of thing really interests you :-)
+
+--SteveWainstead
+
+
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/pgsrc/nl/VeranderTekst ./pgsrc/nl/VeranderTekst
--- ../phpwiki/pgsrc/nl/VeranderTekst	Thu Jan  1 01:00:00 1970
+++ ./pgsrc/nl/VeranderTekst	Fri Jun  2 17:59:04 2000
@@ -0,0 +1 @@
+All pages (except search results) have an EditText link at the bottom. You can edit the page you are reading by clicking that link.
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/pgsrc/nl/VertaalSpatiesNaarTabs ./pgsrc/nl/VertaalSpatiesNaarTabs
--- ../phpwiki/pgsrc/nl/VertaalSpatiesNaarTabs	Thu Jan  1 01:00:00 1970
+++ ./pgsrc/nl/VertaalSpatiesNaarTabs	Sat Jun  3 13:19:56 2000
@@ -0,0 +1,19 @@
+VariousBrowsers have trouble with the tab character used in the TextFormattingRules.  If you can't type a tab, or, if you are fixing up a page written by someone who didn't type tabs, then you should have us convert spans of spaces to tabs for you.  You request space to tab conversion with the checkbox that appears near the bottom of EditText and EditCopy pages.  It looks something like this...
+
+ [[o] I can't type tabs.  Please ConvertSpacesToTabs for me when I save.
+
+A span of spaces must be at least '''three''' spaces long to be recognized 
+as a tab.  Use multiples of '''eight''' spaces to make multiple tabs. 
+Each span of eight spaces will convert to one tab.  If the  
+last span comes up a little short, that's ok, as long as  
+there are at least three spaces in the last (only) span.
+
+'''Check your work.'''  This sort of heuristic can lead to  
+unexpected results. 
+-----
+[Maintenance note:  This page is seen when the user clicks on the 
+"ConvertSpacesToTabs" link on any edit screen.  It describes what happens  
+when you ask the system to do this, why you would want it to, and ways to 
+avoid the spaces-instead-of-tabs problem.]
+
+
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/pgsrc/nl/VoorPagina ./pgsrc/nl/VoorPagina
--- ../phpwiki/pgsrc/nl/VoorPagina	Thu Jan  1 01:00:00 1970
+++ ./pgsrc/nl/VoorPagina	Sat Sep 30 17:18:15 2000
@@ -0,0 +1,9 @@
+*Wat is een WikiWikiWeb? Een beschrijving van deze toepassing.
+*Leer HoeWikiTeGebruiken en leer over PaginasToevoegen.
+*Speel in de ZandBak om met Wiki pagina's te oefenen.
+*Zet je naam alsjeblieft in RecenteBezoekers.
+*Zie RecenteVeranderingen voor de meest recente toevoegingen en veranderingen.
+*Ontdek welke pagina's het MeestBezocht worden.
+*Lees de UitgaveNoten
+
+
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/pgsrc/nl/WabiSabi ./pgsrc/nl/WabiSabi
--- ../phpwiki/pgsrc/nl/WabiSabi	Thu Jan  1 01:00:00 1970
+++ ./pgsrc/nl/WabiSabi	Fri Jun  2 17:59:04 2000
@@ -0,0 +1,26 @@
+Since wabi-sabi represents a comprehensive Japanese world view or aesthetic system, it is difficult to explain precisely in western terms.  According to Leonard Koren, wabi-sabi is the most conspicuous and characteristic feature of what we think of as traditional Japanese beauty and it "occupies roughly the same position in the Japanese pantheon of aesthetic values as do the Greek ideals of beauty and perfection in the West."
+
+Wabi-sabi is a beauty of things imperfect, impermanent, and incomplete.
+
+It is the beauty of things modest and humble.
+
+It is the beauty of things unconventional.
+
+The concepts of wabi-sabi correlate with the concepts of Zen Buddhism, as the first Japanese involved with wabi-sabi were tea masters, priests, and monks who practiced Zen. Zen Buddhism originated in India, traveled to China in the 6th century, and was first introduced in Japan around the 12th century. Zen emphasizes "direct, intuitive insight into transcendental truth beyond all intellectual conception." At the core of wabi- sabi is the importance of transcending ways of looking and thinking about things/existence.
+
+	*All things are impermanent
+	*All things are imperfect
+	*All things are incomplete 
+
+Material characteristics of wabi-sabi:
+
+	*suggestion of natural process
+	*irregular
+	*intimate
+	*unpretentious
+	*earthy
+	*simple
+
+For more about wabi-sabi, see
+http://www.art.unt.edu/ntieva/artcurr/japan/wabisabi.htm
+
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/pgsrc/nl/WikiWikiWeb ./pgsrc/nl/WikiWikiWeb
--- ../phpwiki/pgsrc/nl/WikiWikiWeb	Thu Jan  1 01:00:00 1970
+++ ./pgsrc/nl/WikiWikiWeb	Thu Aug 10 05:03:07 2000
@@ -0,0 +1,12 @@
+A WikiWikiWeb is a site where everyone can collaborate on the content. The most well-known and widely used Wiki is the Portland Pattern Repository at http://c2.com/cgi-bin/wiki?WikiWikiWeb.
+
+I found these statements there particularly relevant:
+
+''The point is to make the EditText form simple and the FindPage search fast.''
+
+''In addition to being quick, this site also aspires to Zen ideals generally labeled WabiSabi. Zen finds beauty in the imperfect and ephemeral. When it comes down to it, that's all you need.''
+
+You can say hello on RecentVisitors, or read about HowToUseWiki and AddingPages. Currently this Wiki has no "theme" for discussion, so go ahead and play with it and have fun!
+
+--SteveWainstead
+
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/pgsrc/nl/ZandBak ./pgsrc/nl/ZandBak
--- ../phpwiki/pgsrc/nl/ZandBak	Thu Jan  1 01:00:00 1970
+++ ./pgsrc/nl/ZandBak	Sat Sep 30 17:46:46 2000
@@ -0,0 +1,4 @@
+Hier kun je heerlijk met Wiki spelen.
+
+Veel plezier :-)
+
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/pgsrc/nl/ZoekPagina ./pgsrc/nl/ZoekPagina
--- ../phpwiki/pgsrc/nl/ZoekPagina	Thu Jan  1 01:00:00 1970
+++ ./pgsrc/nl/ZoekPagina	Sat Sep 30 18:29:15 2000
@@ -0,0 +1,18 @@
+Hier zijn een paar goede plaatsen om te beginnen met  bladeren.
+
+	* HoeWikiTeGebruiken maakt snel wegwijs in Wiki.
+	* RecenteVeranderingen worden automatisch bijgehouden.
+	* MeerOverTechnieken van het bladeren en veranderen van deze server.
+
+
+Hier is een titel zoeker.  Probeer iets als ''wiki'' 
+of ''broodje''.
+
+%%Search%%
+
+Gebruik deze voor het doorzoeken van alle tekst.  Dit kan een paar seconden duren.  De resultaten tonen alle regels op een pagina die een oplossing bevatten.
+
+%%Fullsearch%%
+
+
+
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/po/nl.po ./po/nl.po
--- ../phpwiki/po/nl.po	Thu Jan  1 01:00:00 1970
+++ ./po/nl.po	Sun Oct  1 19:42:44 2000
@@ -0,0 +1,137 @@
+# nl.po -- PhpWiki's dutch language file
+# Copyright (C) 2000 Jan Nieuwenhuizen <ja...@gn...>.
+# Jan Nieuwenhuizen <ja...@gn...>, 2000.
+#
+#
+# Don't change the format of the first three lines,
+# the TP robot wants them like this (I hope).
+#
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: phpwiki 1.1.7\n"
+"POT-Creation-Date: 2000-10-01 19:42+0200\n"
+"PO-Revision-Date: 2000-09-30 02:23+0200\n"
+"Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
+"Language-Team: Dutch <nl...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Date: 1998-05-26 11:26:28+0200\n"
+"From:  <ja...@gn...>\n"
+
+# #: test_dbmlib.php3:41 test_dbmlib.php3:75 wiki_linguas.php3:21
+#: test_dbmlib.php3:41 test_dbmlib.php3:75 wiki_linguas.php3:22
+msgid "TestPage"
+msgstr "TestPagina"
+
+#: wiki_config.php3:147
+msgid "./pgsrc"
+msgstr "./pgsrc/nl"
+
+#: wiki_config.php3:155
+msgid "templates/browse.html"
+msgstr "templates/nl/browse.html"
+
+#: wiki_config.php3:156
+msgid "templates/editpage.html"
+msgstr "templates/nl/editpage.html"
+
+#: wiki_config.php3:157
+msgid "templates/editlinks.html"
+msgstr "templates/nl/editlinks.html"
+
+#: wiki_config.php3:158
+msgid "templates/message.html"
+msgstr "templates/nl/message.html"
+
+#: wiki_diff.php3:1017
+#, c-format
+msgid "Diff of %s."
+msgstr "Diff van %s."
+
+#: wiki_display.php3:14 wiki_linguas.php3:12
+msgid "FrontPage"
+msgstr "VoorPagina"
+
+#: wiki_editpage.php3:49
+#, c-format
+msgid "Describe %s here."
+msgstr "Beschrijf %s hier."
+
+#: wiki_linguas.php3:8
+msgid "AddingPages"
+msgstr "PaginasToevoegen"
+
+#: wiki_linguas.php3:9
+msgid "ConvertSpacesToTabs"
+msgstr "VertaalSpatiesNaarTabs"
+
+#: wiki_linguas.php3:10
+msgid "EditText"
+msgstr "VeranderTekst"
+
+#: wiki_linguas.php3:11
+msgid "FindPage"
+msgstr "ZoekPagina"
+
+#: wiki_linguas.php3:13
+msgid "GoodStyle"
+msgstr "GoedeStijl"
+
+#: wiki_linguas.php3:14
+msgid "HowToUseWiki"
+msgstr "HoeWikiTeGebruiken"
+
+#: wiki_linguas.php3:15
+msgid "MoreAboutMechanics"
+msgstr "MeerOverTechnieken"
+
+#: wiki_linguas.php3:16
+msgid "MostPopular"
+msgstr "MeestBezocht"
+
+#: wiki_linguas.php3:17 wiki_stdlib.php3:318 wiki_stdlib.php3:381
+msgid "RecentChanges"
+msgstr "RecenteVeranderingen"
+
+#: wiki_linguas.php3:18
+msgid "RecentVisitors"
+msgstr "RecenteBezoekers"
+
+#: wiki_linguas.php3:19
+msgid "ReleaseNotes"
+msgstr "UitgaveNoten"
+
+#: wiki_linguas.php3:20
+msgid "SandBox"
+msgstr "ZandBak"
+
+#: wiki_linguas.php3:21
+msgid "SteveWainstead"
+msgstr ""
+
+#: wiki_linguas.php3:23
+msgid "TextFormattingRules"
+msgstr "TekstFormatterinsRegels"
+
+#: wiki_linguas.php3:24
+msgid "WabiSabi"
+msgstr ""
+
+#: wiki_linguas.php3:25
+msgid "WikiWikiWeb"
+msgstr ""
+
+#: wiki_pageinfo.php3:22
+msgid "PageInfo"
+msgstr "PaginaInfo"
+
+#: wiki_savepage.php3:60
+#, c-format
+msgid "Thank you for editing %s."
+msgstr "Bedankt voor het veranderen van %s."
+
+#: wiki_savepage.php3:90
+msgid "Your careful attention to detail is much appreciated."
+msgstr "Je zorgvuldige aandacht voor detail wordt erg gewaardeerd."
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/po/phpwiki.pot ./po/phpwiki.pot
--- ../phpwiki/po/phpwiki.pot	Thu Jan  1 01:00:00 1970
+++ ./po/phpwiki.pot	Sun Oct  1 19:42:44 2000
@@ -0,0 +1,130 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2000-10-01 19:42+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: ENCODING\n"
+
+#: test_dbmlib.php3:41 test_dbmlib.php3:75 wiki_linguas.php3:22
+msgid "TestPage"
+msgstr ""
+
+#: wiki_config.php3:147
+msgid "./pgsrc"
+msgstr ""
+
+#: wiki_config.php3:155
+msgid "templates/browse.html"
+msgstr ""
+
+#: wiki_config.php3:156
+msgid "templates/editpage.html"
+msgstr ""
+
+#: wiki_config.php3:157
+msgid "templates/editlinks.html"
+msgstr ""
+
+#: wiki_config.php3:158
+msgid "templates/message.html"
+msgstr ""
+
+#: wiki_diff.php3:1017
+#, c-format
+msgid "Diff of %s."
+msgstr ""
+
+#: wiki_display.php3:14 wiki_linguas.php3:12
+msgid "FrontPage"
+msgstr ""
+
+#: wiki_editpage.php3:49
+#, c-format
+msgid "Describe %s here."
+msgstr ""
+
+#: wiki_linguas.php3:8
+msgid "AddingPages"
+msgstr ""
+
+#: wiki_linguas.php3:9
+msgid "ConvertSpacesToTabs"
+msgstr ""
+
+#: wiki_linguas.php3:10
+msgid "EditText"
+msgstr ""
+
+#: wiki_linguas.php3:11
+msgid "FindPage"
+msgstr ""
+
+#: wiki_linguas.php3:13
+msgid "GoodStyle"
+msgstr ""
+
+#: wiki_linguas.php3:14
+msgid "HowToUseWiki"
+msgstr ""
+
+#: wiki_linguas.php3:15
+msgid "MoreAboutMechanics"
+msgstr ""
+
+#: wiki_linguas.php3:16
+msgid "MostPopular"
+msgstr ""
+
+#: wiki_linguas.php3:17 wiki_stdlib.php3:318 wiki_stdlib.php3:381
+msgid "RecentChanges"
+msgstr ""
+
+#: wiki_linguas.php3:18
+msgid "RecentVisitors"
+msgstr ""
+
+#: wiki_linguas.php3:19
+msgid "ReleaseNotes"
+msgstr ""
+
+#: wiki_linguas.php3:20
+msgid "SandBox"
+msgstr ""
+
+#: wiki_linguas.php3:21
+msgid "SteveWainstead"
+msgstr ""
+
+#: wiki_linguas.php3:23
+msgid "TextFormattingRules"
+msgstr ""
+
+#: wiki_linguas.php3:24
+msgid "WabiSabi"
+msgstr ""
+
+#: wiki_linguas.php3:25
+msgid "WikiWikiWeb"
+msgstr ""
+
+#: wiki_pageinfo.php3:22
+msgid "PageInfo"
+msgstr ""
+
+#: wiki_savepage.php3:60
+#, c-format
+msgid "Thank you for editing %s."
+msgstr ""
+
+#: wiki_savepage.php3:90
+msgid "Your careful attention to detail is much appreciated."
+msgstr ""
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/templates/nl/README ./templates/nl/README
--- ../phpwiki/templates/nl/README	Thu Jan  1 01:00:00 1970
+++ ./templates/nl/README	Sat Sep 30 16:45:34 2000
@@ -0,0 +1,86 @@
+$Id: README,v 1.1 2000/06/18 16:05:34 ahollosi Exp $
+
+PhpWiki distinguishes between four different templates:
+
+- template for browsing pages (default: browse.html)
+  This template is used when viewing Wiki pages.
+  
+- template for editing pages (default: editpage.html)
+  This template is used when users edit a page by clicking on
+  the EditText link.
+
+- template for editing references (default: editlinks.html)
+  This template is used when users edit references of a page
+  by clicking on the EditLinks link on the EditText page.
+
+- template for plain messages from PhpWiki (default: message.html)
+  This template is used when displaying search results, or when
+  displaying error messages.
+
+  
+The location of the template files is defined in wiki_config.php3
+The specification is relative to the index.php3 script.
+
+Template files are regular HTML files, which contain special
+placeholders. Placeholders are surrounded by '###'.
+You must not use '###' for other purposes.
+
+
+Following placeholders are provided by PhpWiki:
+
+###SCRIPTURL###
+	This is the URL of the main PhpWiki script.
+	All URL's referring to the Wiki itself should use this placeholder.
+
+###PAGE###
+	The page title. Any special HTML characters are replaced by their
+	entities. Do not use this placeholder in links. Use ###PAGEURL###
+	instead.
+
+###CONTENT###
+	The actual page content. This is either the Wikipage itself,
+	the search result, or a message text.
+
+###ALLOWEDPROTOCOLS###
+	Protocols allowed for external links and references.
+	Default: http|https|mailto|ftp|news|gopher
+
+
+The following placeholders are not available for the 'MESSAGE' template:
+
+###PAGEURL###
+	Page title encoded for use in URLs.
+
+###LASTMODIFIED###
+	Date when the page was last modified.
+
+###LASTAUTHOR###
+	Author of latest modification. Usually this is the hostname or
+	the IP address.
+
+###VERSION###
+	Revision number of the page.
+	Note: this is also used for detecting concurrent updates to a page.
+	See hidden input field in EDITPAGE template for how to use it.
+
+###IFCOPY###
+	Special placeholder. Should only be used in EDITPAGE template.
+	If EditCopy link should be shown, then ###IFCOPY### is ignored.
+	If EditCopy should not be shown, the rest of the line is deleted.
+
+
+Only for EditLinks:
+###1###, ###2###, ....
+	Placeholder for references. Up to NUM_LINKS placeholders will be
+	substituted. NUM_LINKS is defined in wiki_config.php3
+
+
+
+Examples:
+
+<A HREF="###SCRIPTURL###">the entry (default) page</A>
+<A HREF="###SCRIPTURL###?###PAGEURL###">the current page</A>
+<A HREF="###SCRIPTURL###?FindPage">the FindPage page</A>
+<head><title>PhpWiki Page: ###PAGE###</title></head>
+
+see default templates for more examples.
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/templates/nl/browse.html ./templates/nl/browse.html
--- ../phpwiki/templates/nl/browse.html	Thu Jan  1 01:00:00 1970
+++ ./templates/nl/browse.html	Sat Sep 30 18:22:50 2000
@@ -0,0 +1,26 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<title>###PAGE###</title>
+</head>
+
+<body bgcolor=ivory text=black alink=red link=darkblue vlink=darkmagenta>
+<table cellpadding=2>
+<tr><td bgcolor=black><a href="###SCRIPTURL###"><img src="###LOGO###" border=0 alt="[phpwiki]"></a></td>
+<td><h1><a href="###SCRIPTURL###?full=###PAGEURL###">###PAGE###</a></h1>
+</td></tr></table>
+<P>
+###CONTENT###
+
+<hr noshade>
+<a href="###SCRIPTURL###?edit=###PAGEURL###">VeranderTekst</a>
+ van deze pagina (laatste verandering ###LASTMODIFIED###
+[<a href="###SCRIPTURL###?info=###PAGEURL###">info</a>]
+[<a href="###SCRIPTURL###?diff=###PAGEURL###">diff</a>])
+<br>
+<a href="###SCRIPTURL###?ZoekPagina">ZoekPagina</a> door bladeren of zoeken
+<hr noshade>
+<small>###RELATEDPAGES###</small>
+
+</body>
+</html>
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/templates/nl/editlinks.html ./templates/nl/editlinks.html
--- ../phpwiki/templates/nl/editlinks.html	Thu Jan  1 01:00:00 1970
+++ ./templates/nl/editlinks.html	Sat Sep 30 16:45:34 2000
@@ -0,0 +1,39 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<title>###PAGE###</title>
+</head>
+
+<body bgcolor=moccasin text=black alink=red link=darkblue vlink=darkmagenta>
+
+<form method="POST" action="###SCRIPTURL###">
+
+<table cellpadding=2>
+<tr><td bgcolor=black><a href="###SCRIPTURL###"><img src="###LOGO###" border=0 alt="[phpwiki]"></a></td>
+<td><h1>Edit ###PAGE### Links
+<input type="submit" value=" Save ">
+<input type="reset" value=" Reset "></h1>
+</td></tr></table>
+
+<P>
+[1] <input type="text" size="55" name="r1" value="###R1###"><br>
+[2] <input type="text" size="55" name="r2" value="###R2###"><br>
+[3] <input type="text" size="55" name="r3" value="###R3###"><br>
+[4] <input type="text" size="55" name="r4" value="###R4###"><br>
+[5] <input type="text" size="55" name="r5" value="###R5###"><br>
+[6] <input type="text" size="55" name="r6" value="###R6###"><br>
+[7] <input type="text" size="55" name="r7" value="###R7###"><br>
+[8] <input type="text" size="55" name="r8" value="###R8###"><br>
+[9] <input type="text" size="55" name="r9" value="###R9###"><br>
+[10] <input type="text" size="55" name="r10" value="###R10###"><br>
+[11] <input type="text" size="55" name="r11" value="###R11###"><br>
+[12] <input type="text" size="55" name="r12" value="###R12###"><br>
+
+<p>
+Type the full URL (http:// ...) for each reference cited in the text.
+<BR>Protocols allowed are: ###ALLOWEDPROTOCOLS###
+
+<input type="hidden" name="post" value="###PAGEURL###">
+</form>
+</body>
+</html>
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/templates/nl/editpage.html ./templates/nl/editpage.html
--- ../phpwiki/templates/nl/editpage.html	Thu Jan  1 01:00:00 1970
+++ ./templates/nl/editpage.html	Sat Sep 30 18:39:59 2000
@@ -0,0 +1,50 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<title>###PAGE###</title>
+</head>
+
+<body bgcolor=moccasin text=black alink=red link=darkblue vlink=darkmagenta>
+
+<form method="POST" action="###SCRIPTURL###">
+
+<table cellpadding=2>
+<tr><td bgcolor=black><a href="###SCRIPTURL###"><img src="###LOGO###" border=0 alt="[phpwiki]"></a></td>
+<td><h1>Verander ###PAGE###
+<input type="submit" value=" Bewaar "></h1>
+</td></tr></table>
+
+<textarea name="content" ROWS="22" COLS="80" wrap="virtual">###CONTENT###</textarea>
+<br>
+
+<input type="checkbox" name="convert" value="tabs" >
+I kan geen tabs typen. 
+<a href="###SCRIPTURL###?VertaalSpatiesNaarTabs">VertaalSpatiesNaarTabs</a>
+voor mij als ik bewaar.
+<p><a href="###SCRIPTURL###?GoedeStijl">GoedeStijl</a> tips for
+veranderen.
+
+<br>
+<a href="###SCRIPTURL###?links=###PAGEURL###">VeranderKoppelingen</a>
+naar andere webservers.
+
+###IFCOPY###<br><a href="###SCRIPTURL###?copy=###PAGEURL###">VeranderKopie</a> van vorige auteur.
+
+<hr noshade>
+<small>
+<b>Emphasis:</b> '' for italics, ''' for bold, ''''' for both
+<br><b>Lists:</b> tab-* for bullet lists, tab-# for numbered lists, tab-Term:-tab for definition lists
+<br><b>References:</b> JoinCapitalizedWords or use square brackets for a [page link] or URL [http://cool.wiki.int/].
+<br><b>References:</b> Use [1],[2],[3],... and EditLinks. Avoid linking with "!": !DoNotHyperlink, name links like [text | URL]
+<br><b>Misc:</b>"!", "!!", "!!!" make headings,
+"%%%" makes a linebreak, "- - - -" makes a horizontal rule, escape "[" with "[["
+<br>meer op
+<a href="###SCRIPTURL###?TextFormattingRules">
+<b>TekstFormatteringsRegels.</b></a>
+</small>
+
+<input type="hidden" name="post" value="###PAGEURL###">
+<input type="hidden" name="editversion" value="###VERSION###">
+</form>
+</body>
+</html>
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/templates/nl/message.html ./templates/nl/message.html
--- ../phpwiki/templates/nl/message.html	Thu Jan  1 01:00:00 1970
+++ ./templates/nl/message.html	Sat Sep 30 16:45:34 2000
@@ -0,0 +1,17 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<title>###PAGE###</title>
+</head>
+
+<body bgcolor=linen text=black alink=red link=darkblue vlink=darkmagenta>
+
+<table cellpadding=2>
+<tr><td bgcolor=black><a href="###SCRIPTURL###"><img src="###LOGO###" border=0 alt="[phpwiki]"></a></td>
+<td><h1>###PAGE###</h1>
+</td></tr></table>
+
+###CONTENT###
+
+</body>
+</html>
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/test_dbmlib.php3 ./test_dbmlib.php3
--- ../phpwiki/test_dbmlib.php3	Tue Aug 29 04:37:42 2000
+++ ./test_dbmlib.php3	Sat Sep 30 15:33:44 2000
@@ -38,7 +38,7 @@
    // IsWikPage()
    // Test for pages to see if they are there
    //
-   $pagename = "TestPage";
+   $pagename = gettext ("TestPage");
    echo "Testing for existence of $pagename<br>\n";
    $res = IsWikiPage($dbi, $pagename);
    if ($res) {
@@ -72,7 +72,7 @@
    // retrieves and failed retrieves
    //
 
-   $pagename = "TestPage";
+   $pagename = gettext ("TestPage");
    echo "Retrieving page '$pagename'<br>\n";
    $pagehash = RetrievePage($dbi, $pagename, $WikiPageStore);
    $type = gettype($pagehash);
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/translate.sh ./translate.sh
--- ../phpwiki/translate.sh	Thu Jan  1 01:00:00 1970
+++ ./translate.sh	Sun Oct  1 19:42:39 2000
@@ -0,0 +1,28 @@
+#!/bin/bash
+# translate.sh
+#
+# This script should be run by
+#
+#    * PphWiki maintainers, before making a distribution
+#    * Translators, after making a translation update
+#
+
+ALL_LINGUAS=nl
+
+xgettext -o po/phpwiki.pot *php3
+for i in $ALL_LINGUAS; do
+	po=po/$i.po
+	pot=po/phpwiki.pot
+	locale=locale/$i/LC_MESSAGES
+
+	msgmerge -o $po $po $pot
+	mkdir -p locale/$i/LC_MESSAGES
+	msgfmt -o $locale/phpwiki.mo $po
+
+	awk -- '
+	    BEGIN { print ("<?php") }
+	    /^msgid ""/ { getline; next }
+	    /^msgid "/  { msgid = substr ($0, 7); print ("$locale[" msgid "] ="); next }
+	    /^msgstr "/ { msgstr = substr ($0, 8); print ("   " msgstr ";"); next }
+	    END { print ("?>") }' $po > $locale/phpwiki.php3
+done
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/wiki_config.php3 ./wiki_config.php3
--- ../phpwiki/wiki_config.php3	Sat Sep 23 16:34:22 2000
+++ ./wiki_config.php3	Sun Oct  1 18:38:31 2000
@@ -5,6 +5,26 @@
    rcs_id('$Id: wiki_config.php3,v 1.25 2000/09/23 14:34:22 ahollosi Exp $');
 
    /*
+    Select your lingua here.
+   */
+
+   //$LANG="C"; // (What should be the) Default: English
+   $LANG="nl";  // We all speak dutch, no?
+   if (!function_exists ('gettext')) {
+      require "locale/$LANG/LC_MESSAGES/phpwiki.php3";
+      function gettext ($text) { 
+ 	 global $locale;
+         if (!empty ($locale[$text]))
+           return $locale[$text];
+         return $text;
+      }
+   } else {
+      putenv ("LANG=$LANG");
+      bindtextdomain ("phpwiki", "./locale");
+      textdomain ("phpwiki");
+   }
+
+   /*
       Constants and settings. Edit the values below for
       your site. You need two image files, a banner and 
       a signature. The dbm file MUST be writable by the
@@ -124,7 +144,7 @@
     * The files can also be plain text files, in which case the page name
     * is taken from the file name.
     */
-   define('WIKI_PGSRC', './pgsrc'); // Default (old) behavior.
+   define('WIKI_PGSRC', gettext ("./pgsrc")); // Default (old) behavior.
    //define('WIKI_PGSRC', './wiki.zip'); // New style.
   
    $ScriptName = "index.php3";
@@ -132,10 +152,10 @@
 
    // Template files (filenames are relative to script position)
    $templates = array(
-   	"BROWSE" =>    "templates/browse.html",
-	"EDITPAGE" =>  "templates/editpage.html",
-	"EDITLINKS" => "templates/editlinks.html",
-	"MESSAGE" =>   "templates/message.html"
+   	"BROWSE" =>    gettext ("templates/browse.html"),
+	"EDITPAGE" =>  gettext ("templates/editpage.html"),
+	"EDITLINKS" => gettext ("templates/editlinks.html"),
+	"MESSAGE" =>   gettext ("templates/message.html")
 	);
 
    $SignatureImg = "$ServerAddress/signature.png";
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/wiki_diff.php3 ./wiki_diff.php3
--- ../phpwiki/wiki_diff.php3	Tue Aug 15 04:59:20 2000
+++ ./wiki_diff.php3	Sat Sep 30 19:34:32 2000
@@ -1014,6 +1014,7 @@
 	}
     }
 
-  GeneratePage('MESSAGE', $html, 'Diff of '.htmlspecialchars($pagename), 0);
+  GeneratePage('MESSAGE', $html, sprintf (gettext ("Diff of %s."),
+	htmlspecialchars($pagename)), 0);
 }
 ?>
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/wiki_display.php3 ./wiki_display.php3
--- ../phpwiki/wiki_display.php3	Tue Aug 29 04:37:42 2000
+++ ./wiki_display.php3	Sat Sep 30 15:33:54 2000
@@ -11,7 +11,7 @@
    if ($argv[0]) {
       $pagename = rawurldecode($argv[0]);
    } else { 
-      $pagename = "FrontPage"; 
+      $pagename = gettext ("FrontPage");
 
       // if there is no FrontPage, create a basic set of Wiki pages
       if (! IsWikiPage($dbi, $pagename)) {
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/wiki_editpage.php3 ./wiki_editpage.php3
--- ../phpwiki/wiki_editpage.php3	Tue Aug 29 04:37:42 2000
+++ ./wiki_editpage.php3	Sat Sep 30 18:06:51 2000
@@ -46,7 +46,8 @@
            $pagehash["copy"] = 1;
       }
    } else {
-      $textarea = "Describe " . htmlspecialchars($pagename) . " here.";
+      $textarea = sprintf (gettext ("Describe %s here."),
+				htmlspecialchars($pagename));
       unset($pagehash);
       $pagehash["version"] = 0;
    }
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/wiki_linguas.php3 ./wiki_linguas.php3
--- ../phpwiki/wiki_linguas.php3	Thu Jan  1 01:00:00 1970
+++ ./wiki_linguas.php3	Sun Oct  1 18:54:04 2000
@@ -0,0 +1,26 @@
+<!-- $Id: $ -->
+<?php
+   /*
+      This file is a placeholder for xgettext to find these pgsrc
+      pagenames, because some of these are used implicitely.
+      Don't remove me.
+    */
+   gettext ("AddingPages");
+   gettext ("ConvertSpacesToTabs");
+   gettext ("EditText");
+   gettext ("FindPage");
+   gettext ("FrontPage");
+   gettext ("GoodStyle");
+   gettext ("HowToUseWiki");
+   gettext ("MoreAboutMechanics");
+   gettext ("MostPopular");
+   gettext ("RecentChanges");
+   gettext ("RecentVisitors");
+   gettext ("ReleaseNotes");
+   gettext ("SandBox");
+   gettext ("SteveWainstead");
+   gettext ("TestPage");
+   gettext ("TextFormattingRules");
+   gettext ("WabiSabi");
+   gettext ("WikiWikiWeb");
+?>
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/wiki_pageinfo.php3 ./wiki_pageinfo.php3
--- ../phpwiki/wiki_pageinfo.php3	Tue Aug 29 04:37:42 2000
+++ ./wiki_pageinfo.php3	Sat Sep 30 15:34:17 2000
@@ -19,7 +19,7 @@
 
    // don't bother unless we were asked
    if (! $info) {
-      GeneratePage('MESSAGE', $html, "PageInfo", 0);
+      GeneratePage('MESSAGE', $html, gettext ("PageInfo"), 0);
       exit;
    }
 
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/wiki_savepage.php3 ./wiki_savepage.php3
--- ../phpwiki/wiki_savepage.php3	Tue Aug 29 04:37:42 2000
+++ ./wiki_savepage.php3	Sat Sep 30 18:05:06 2000
@@ -57,8 +57,9 @@
    // create page header
    $enc_url = rawurlencode($pagename);
    $enc_name = htmlspecialchars($pagename);
-   $html = "Thank you for editing " .
-	"<a href=\"$ScriptUrl?$enc_url\">$enc_name</a><br>\n";
+   $html = sprintf (gettext ("Thank you for editing %s."),
+	"<a href=\"$ScriptUrl?$enc_url\">$enc_name</a>");
+   $html .= "<br>\n";
 
    if (! empty($content)) {
       // patch from Grant Morgan <gr...@ry...> for magic_quotes_gpc
@@ -86,7 +87,8 @@
    InsertPage($dbi, $pagename, $pagehash);
    UpdateRecentChanges($dbi, $pagename, $newpage);
 
-   $html .= "Your careful attention to detail is much appreciated.\n";
+   $html .= gettext ("Your careful attention to detail is much appreciated.");
+   $html .= "\n";
 
    if ($WikiPageStore == "/tmp/wikidb") {
       $html .= "<P><B>Warning: the Wiki DBM file still lives in the " .
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/wiki_stdlib.php3 ./wiki_stdlib.php3
--- ../phpwiki/wiki_stdlib.php3	Sat Sep 23 16:31:06 2000
+++ ./wiki_stdlib.php3	Sat Sep 30 15:20:48 2000
@@ -315,7 +315,8 @@
       global $ScriptUrl;
       global $WikiPageStore;
 
-      $recentchanges = RetrievePage($dbi, "RecentChanges", $WikiPageStore);
+      $recentchanges = RetrievePage($dbi, gettext ("RecentChanges"), 
+      	$WikiPageStore);
 
       // this shouldn't be necessary, since PhpWiki loads 
       // default pages if this is a new baby Wiki
@@ -377,7 +378,7 @@
 
       $recentchanges["content"] = $newpage;
 
-      InsertPage($dbi, "RecentChanges", $recentchanges);
+      InsertPage($dbi, gettext ("RecentChanges"), $recentchanges);
    }
 
 

-- 
Jan Nieuwenhuizen <ja...@gn...> | GNU LilyPond - The music typesetter
http://www.xs4all.nl/~jantien       | http://www.lilypond.org

Re: [Phpwiki-talk] internationalisation for phpwiki (fwd)

[Arno H. <aho...@in...>]

> I agree that in a Wiki, ideally you'd
> want to be able to change *everything* on every page.  So, maybe the
> Right Thing is to read all wiki-page-emitted text from a wiki-page.

Interesting idea :o)

> Well, I don't care about this.  If your distribution sucks, fix it,

It's not a problem for me to fix it. I'm thinking about our user base.
I hate to force people to upgrade to latest versions, do additonal instal=
ls,=20
etc. just to be able to use a small app like phpwiki. So why not find a=20
common denominator -- doesn't have to be the lowest though.

> Stupid question: you *are* using php4, right?

No I'm not. I didn't need the new functionality yet.
So why upgrade? (Speed isn't an issue for me either).


> Hmm, I disagree here, too.  Ignorant users cannot expect to install
> software that's not in their distribution.

This doesn't excuse deliberately complicating the install process.
Actually that user was only ignorant to php specifics.


> Otoh, it should be trivial
> and would be nice, to have a even simpler install [script].  ``index.ph=
p3''
> would be a fine place for bootstrapping the install.  Things like:
>
>   * automagically use db name of install directory
>   * default to mysql if mysql is installed
>   * show warning message if we don't have permission to create a db

That would require the web server having write access to wiki_config.
I don't think that this is a good idea.


> > Why not use php-files that just include a hash of translated strings?
> Yes, this would be Better.  Do send a patch.

Patch attached below. Apply over your patch.
(i.e. latest CVS -> your patch -> this patch)

/Arno
=00

Re: [Phpwiki-talk] internationalisation for phpwiki (fwd)

[Jan N. <ja...@gn...>]

On Sunday, 1 October 2000, Arno Hollosi writes:

> Translating the code (more precisely: user messages emitted by code) poses 
> more of a problem. Jan uses Gnu's gettext. While this seems to be the right 
> choice within PHP, I question if it's apropriate for phpwiki.

I just used the simplest method.  I agree that in a Wiki, ideally you'd
want to be able to change *everything* on every page.  So, maybe the
Right Thing is to read all wiki-page-emitted text from a wiki-page.

> For example, on my vanilla install of SuSE linux, gettext is not compiled 
> into PHP, thus I'd only be able to use the english default.

Well, I don't care about this.  If your distribution sucks, fix it,
complain/send a patch to SuSE, or use another distribution.  I must
add, that the guys at SuSE have been most helpful when they decided
to include LilyPond but found that SuSE had troubles with their C++
development setup.

Stupid question: you *are* using php4, right?

> Furthermore,
> if I understand the patch correctly, one has to run translate.sh before
> starting the wiki.

Sorry, I'll document this better.  Translate.sh is a hack, and only 
included as ``documentation'' for translators.  They only have to run
translate.sh when:
  
   * native strings in php code were changed/added
   * translations were changed added

> While xgettext and msgfmt are installed on my system, 
> msgmerge is not. (We can get around that by adding the output
> of translate.sh into the distribution tarball.)

The output of msgfmt is always included in a distribution, the
``problem'' with phpwiki is that source and package are the
same.  You only need msgmerge if you want to automagically
update a language file.

> So what I'm complaining about is that this goes somewhat against the 
> simplistic approach otherwise taken within phpwiki. I had already one user 
> email me that he couldn't set up phpwiki+mysql, because he commented out the 
> dbmlib part, but didn't uncomment the mysql section (he didn't recognize that
    +  
> "/*" & "*/" are comment delimiters). That's our audience.

Hmm, I disagree here, too.  Ignorant users cannot expect to install
software that's not in their distribution.  Otoh, it should be trivial
and would be nice, to have a even simpler install [script].  ``index.php3''
would be a fine place for bootstrapping the install.  Things like: 

   * automagically use db name of install directory
   * default to mysql if mysql is installed
   * show warning message if we don't have permission to create a db

etc.  But maybe it's best to leave these trivialities to the [Debian]
packagers.

> Why not use php-files that just include a hash of translated strings?

Yes, this would be Better.  Do send a patch.

Greetings,
Jan.

-- 
Jan Nieuwenhuizen <ja...@gn...> | GNU LilyPond - The music typesetter
http://www.xs4all.nl/~jantien       | http://www.lilypond.org

Re: [Phpwiki-talk] internationalisation for phpwiki (fwd)

[Arno H. <aho...@in...>]

>I think having more sets of default pages, in other languages, would be a
>Good Thing. The question though is how to include them in the distro... I
>already told this gentleman that we'd love a set of Dutch pages.

I had a short look at Jan's patch.
Overall it seems ok and looks like a sensible patch.
It seems clear that there are three different things to translate:
	- the pages
	- the templates
	- the code

The first two items pose no problem - one can easily switch by setting
the apropriate directories in wiki_config (or even doing it on the fly, once 
user identification is added).

Translating the code (more precisely: user messages emitted by code) poses 
more of a problem. Jan uses Gnu's gettext. While this seems to be the right 
choice within PHP, I question if it's apropriate for phpwiki.

For example, on my vanilla install of SuSE linux, gettext is not compiled 
into PHP, thus I'd only be able to use the english default. Furthermore,
if I understand the patch correctly, one has to run translate.sh before
starting the wiki. While xgettext and msgfmt are installed on my system, 
msgmerge is not. (We can get around that by adding the output
of translate.sh into the distribution tarball.)

So what I'm complaining about is that this goes somewhat against the 
simplistic approach otherwise taken within phpwiki. I had already one user 
email me that he couldn't set up phpwiki+mysql, because he commented out the 
dbmlib part, but didn't uncomment the mysql section (he didn't recognize that 
"/*" & "*/" are comment delimiters). That's our audience.

Why not use php-files that just include a hash of translated strings?
Ok, it causes some additional work on our side, but not that much. The actual 
changes within the code would then look just like Jan's changes.

I know that gettext simplifies and automates this task. But from my 
POV it would be a bonus not to rely on yet another php module.

/Arno

Re: [Phpwiki-talk] line count

[Arno H. <aho...@in...>]

>Wow. How did you do the breakdown? The numbers are interesting and useful.

I just discovered that my numbers weren't quite right.
Around 170 functions is ok, but for if/for/while it looks like:

294 if-statements
 58 for-loops
 70 while-loops

My first (wrong) count was done by using grep - but as I'm too dumb using 
grep-regexps I didn't count lines starting with tab characters.

The new count was done like this:
cat *.php3 | perl -ne 'print if /^\s*if\s*\(/;' | wc
cat *.php3 | perl -ne 'print if /^\s*while\s*\(/;' | wc
cat *.php3 | perl -ne 'print if /^\s*for\s*\(/;' | wc

Should be pretty close to the truth.

/Arno

[Phpwiki-talk] internationalisation for phpwiki (fwd)

[Steve W. <sw...@wc...>]

I think having more sets of default pages, in other languages, would be a
Good Thing. The question though is how to include them in the distro... I
already told this gentleman that we'd love a set of Dutch pages.

sw

...............................ooo0000ooo.................................
   Hear FM quality freeform radio through the Internet: http://wcsb.org/
                     home page: www.wcsb.org/~swain 

---------- Forwarded message ----------
Date: Sat, 30 Sep 2000 18:52:33 +0200
From: Jan Nieuwenhuizen <ja...@gn...>
To: Steve Wainstead <sw...@wc...>
Subject: internationalisation for phpwiki

Hi Steve,

We're very enthousiastic about phpwiki, and plan to use it for
versatile documentation see http://appel.lilypond.org/wiki.

Also, I'd like to setup a Dutch Wiki.  Would you accept a patch
like this (below)?  It's of course far from finished, but I'm
sending you first to hear how you feel about it.

This is against latest CVS.

Greetings,

Jan.


diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/pgsrc/nl/GoedeStijl ./pgsrc/nl/GoedeStijl
--- ../phpwiki/pgsrc/nl/GoedeStijl	Thu Jan  1 01:00:00 1970
+++ ./pgsrc/nl/GoedeStijl	Fri Jun  2 17:59:04 2000
@@ -0,0 +1,13 @@
+"Young writers often suppose that style is a garnish for the meat of 
+prose, a sauce by which a dull dish is made palatable. Style has no such 
+separate entity; it is nondetachable, unfilterable. The beginner should 
+approach style warily, realizing that it is himself he is approaching, no 
+other; and he should begin by turning resolutely away from all devices 
+that are popularly believed to indicate style--all mannerisms, tricks, 
+adornments. The approach to style is by way of plainness, simplicity, 
+orderliness, sincerity." 
+
+--Strunk and White, "The Elements of Style"
+
+''And thus an American textbook, typical required reading for 10th-grade English students, unknowingly extols some virtues of WabiSabi''
+--scummings
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/pgsrc/nl/HoeWikiTeGebruiken ./pgsrc/nl/HoeWikiTeGebruiken
--- ../phpwiki/pgsrc/nl/HoeWikiTeGebruiken	Thu Jan  1 01:00:00 1970
+++ ./pgsrc/nl/HoeWikiTeGebruiken	Thu Aug 10 17:29:20 2000
@@ -0,0 +1,36 @@
+''"Wiki wiki"'' means "quick" in Hawai'ian.
+
+'''All you really need to know is:'''
+
+	* To edit any page click on the Edit Text link at the bottom of
+the page. You should do that right now, and read the source code of this
+page. It will make more sense.
+	* You get italics by surrounding words with two single quotes on
+either side ''like this''.
+	* You get '''bold text''' by using three quotes on either side.
+	* And, '''''bold italics''''' with five.
+	* You get bullets by using a tab and an asterick *
+	* If you use Windows, you can't use your tab key. It's Bill Gates's fault. But you can check the little box that says Convert Spaces To Tabs. You can type a bunch of spaces and the Wiki will recognize them as a tab.
+	* To have plain monospaced font, indent with a space:
+
+ this is a poem 
+ about monospacing
+ nothing rhymes with poem
+ nothing rhymes with monospacing
+
+	* You can seperate paragraphs with an extra blank line. Example:
+
+I am a paragraph.
+
+I am a paragraph too. We're just very small paragraphs.
+
+
+	* You can get horizontal rules with four or more dashes like this:
+----
+	* To create hyperlinks you just capitalize the words and string them together. Let's say you want to create a page about how Steve Wainstead eats worms. All you have to do is capitalize each word and string them together like this: SteveWainsteadEatsWorms. If the page does not exist yet a question mark appears after the link, inviting you to create the page: ThisPageShouldNotExist. (And please don't ruin the example by creating one.) 
+	* To link to pages outside the Wiki, you can just type in the URL and Wiki will link it for you: http://www.nytimes.com/
+* To put images in, just provide the hyperlink in brackets like this: [[http://www.yourhost.yourdomain/images/picture.png]. Image URLs not in brackets will just appear as hyperlinks to the image.
+	* Now you are ready to begin AddingPages.
+
+----
+A WikiWikiWeb is meant to be fast and easy to edit. It has very simple markup that you can read about in TextFormattingRules.
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/pgsrc/nl/JanNieuwenhuizen ./pgsrc/nl/JanNieuwenhuizen
--- ../phpwiki/pgsrc/nl/JanNieuwenhuizen	Thu Jan  1 01:00:00 1970
+++ ./pgsrc/nl/JanNieuwenhuizen	Sat Sep 30 17:51:52 2000
@@ -0,0 +1,3 @@
+Hallo.  Ik heb dit WikiWikiWeb in het nederlands vertaald.  Ik ben op http://www.xs4all.nl/~jantien.
+
+Meldt onjuistheden in de vertaling aan mailto:ja...@gn....
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/pgsrc/nl/MeerOverTechnieken ./pgsrc/nl/MeerOverTechnieken
--- ../phpwiki/pgsrc/nl/MeerOverTechnieken	Thu Jan  1 01:00:00 1970
+++ ./pgsrc/nl/MeerOverTechnieken	Fri Jun  2 17:59:04 2000
@@ -0,0 +1,17 @@
+PhpWiki is written in the server-side scripting language PHP, available from http://www.php.net/. PHP resembles C and Perl in its syntax, and functions much like ASP, EmbPerl or JSP.
+
+PhpWiki consists of a dozen or so files of mixed PHP and HTML. The web pages that make up a WikiWikiWeb based on PHP live in a DBM file with backup copies of previous versions of pages stored in a second DBM file.
+
+Every time a user hits the site the page requested is pulled from the DBM and rendered on the fly. The user only ever requests the file index.php3, which then decides which other php files to include.
+
+Links to pages in the wiki are automatically linked: PhpWiki. This might be the single most compelling aspect of a wiki, the ability to add pages simply by linking to them. The next most compelling thing is how easily external URL's link:
+	# http://www.wcsb.org/
+	# ftp://ftp.redhat.com/
+	# news://news.mozilla.org/
+
+Combined with one namespace and a simple markup, a Wiki exhibits many of the characteristics of WabiSabi.
+
+PhpWiki is licensed under the Gnu General Public license, which you should be able to see here: http://www.gnu.org/copyleft/gpl.txt.
+
+
+
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/pgsrc/nl/MeestBezocht ./pgsrc/nl/MeestBezocht
--- ../phpwiki/pgsrc/nl/MeestBezocht	Thu Jan  1 01:00:00 1970
+++ ./pgsrc/nl/MeestBezocht	Mon Jun 26 23:26:45 2000
@@ -0,0 +1,4 @@
+The 20 most popular pages of this wiki:
+(hitcount, pagename)
+
+%%Mostpopular%%
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/pgsrc/nl/PaginasToevoegen ./pgsrc/nl/PaginasToevoegen
--- ../phpwiki/pgsrc/nl/PaginasToevoegen	Thu Jan  1 01:00:00 1970
+++ ./pgsrc/nl/PaginasToevoegen	Fri Jun  2 17:59:04 2000
@@ -0,0 +1,11 @@
+To add a new page to Wiki, all you have to do is come up with a meaningful title, capatalize all the words and StringThemTogetherLikeThis. Wiki automagically recognizes it as a hyperlink.
+
+Then you can go ahead and ClickTheQuestionMark at the end of your new hyperlink, and the Wiki will give you a window for making the new page.
+
+If you wish to add documents with complex markup to the Wiki, you might be better off providing a URL to it than trying to add the text of the document here, like so:
+
+ PhpWiki project homepage: http://wcsb.org/~swain/php/wiki/
+
+The Wiki does not support HTML tags (see TextFormattingRules).  <tags>They will just render like text.</tags> Wiki is meant to be as simple as possible to encourage use.
+
+Note that there is a feature that your system administrator can enable to allow embedded HTML, but there are security risks involved.
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/pgsrc/nl/RecenteBezoekers ./pgsrc/nl/RecenteBezoekers
--- ../phpwiki/pgsrc/nl/RecenteBezoekers	Thu Jan  1 01:00:00 1970
+++ ./pgsrc/nl/RecenteBezoekers	Sat Sep 30 17:48:13 2000
@@ -0,0 +1,6 @@
+Onderteken hieronder met naam en datum!
+
+Jeff Dairiki, Arno Hollosi, SteveWainstead, Php Wiki authors
+JanNieuwenhuizen, Php Wiki vertaler.
+
+
diff -urN --exclude=CVS --exclude=*~ --exclude=#* .../phpwiki/pgsrc/nl/RecenteVeranderingen ./pgsrc/nl/RecenteVeranderingen
--- ../phpwiki/pgsrc/nl/RecenteVeranderingen	Thu Jan  1 01:00:00 1970
+++ ./pgsrc/nl/RecenteVeranderingen	Sat Sep 30 17:45:47 2000
@@ -0,0 +1,29 @@
+De meest recent veranderde pagina's staan hieronder:
+
+____Dag een (eerste dag voor deze Wiki)
+
+* [GoedeStijl]
+* [HoeWikiTeGebruiken]
+* [MeerOverTechnieken]
+* [MeestBezocht]
+* [PaginasToevoegen]
+* [RecenteBezoekers]
+* [RecenteVeranderingen]
+* [RecenteVeranderingen~
+* [SteveWainstead]
+* [TekstFormatteringsRegels
+* [TestPagina]
+* [UitgaveNoten]
+* [VeranderTekst]
+* [VertaalSpatiesNaarTabs]
+* [VoorPagina]
+* [WabiSabi]
+* [WikiWikiWeb]
+* [ZandBak]
+* [ZoekPagina]
+
+Zoek snel een pagina op:
+%%Search%%
+----
+
+
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/pgsrc/nl/SteveWainstead ./pgsrc/nl/SteveWainstead
--- ../phpwiki/pgsrc/nl/SteveWainstead	Thu Jan  1 01:00:00 1970
+++ ./pgsrc/nl/SteveWainstead	Sat Sep 30 17:51:22 2000
@@ -0,0 +1,4 @@
+Hi. I built this WikiWikiWeb. I'm at http://wcsb.org/~swain/.
+
+Please report bugs to mailto:sw...@pa...
+
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/pgsrc/nl/TekstFormatteringsRegels ./pgsrc/nl/TekstFormatteringsRegels
--- ../phpwiki/pgsrc/nl/TekstFormatteringsRegels	Thu Jan  1 01:00:00 1970
+++ ./pgsrc/nl/TekstFormatteringsRegels	Sat Jun  3 01:37:56 2000
@@ -0,0 +1,90 @@
+'''Paragraphs'''
+
+	* Don't Indent paragraphs
+
+	* Words wrap and fill as needed
+
+	* Use blank lines as separators
+
+	* Four or more minus signs make a horizontal rule
+
+	* %%''''% makes a linebreak (in headings and lists too)
+
+
+'''Lists'''
+
+	* tab-* for first level
+
+		* tab-tab-* for second level, etc.
+
+	* Use * for bullet lists, 1. for numbered lists (mix at will)
+
+	* tab-Term:-tab Definition for definition lists
+
+	* One line for each item
+
+	* Other leading whitespace signals preformatted text, changes font.
+
+
+'''Headings'''
+
+	* '!' at the start of a line makes a small heading
+
+	* '!!' at the start of a line makes a medium heading 
+
+	* '!!!' at the start of a line makes a large heading
+
+
+'''Fonts'''
+	* Indent with one or more spaces to use a monospace font:
+
+ This is in monospace
+This is not
+
+
+'''Indented Paragraphs'''
+''(Quotes)''
+
+	* tab-space-:-tab -- often used (with emphasis) for quotations.  (See SimulatingQuoteBlocks)
+
+
+'''Emphasis'''
+
+	* Use doubled single-quotes ('') for emphasis (usually italics)
+
+	* Use tripled single-quotes (''') for strong emphasis (usually bold)
+
+	* Use five single-quotes ('''''), or triples within doubles, for some other kind of emphasis (BoldItalicInWiki), but be careful about the bugs in the Wiki emphasis logic...
+
+	* Emphasis can be used multiple times within a line, but cannot cross line boundaries
+
+
+'''References'''
+	* Hyperlinks to other pages within the Wiki are made by placing the page name in square brackets: [this is a page link]
+
+	* Hyperlinks to external pages are done like this: [http://www.wcsb.org/]
+
+	* You can name the links to the external pages by providing a name, a bar (|) and then the hyperlink: [Steve's home page | http://wcsb.org/~swain/]  
+
+	* Old Wiki linking is still supported: JoinCapitalizedWords to make local references
+
+	* You can suppress linking to old-style references by preceeding the word with a '!', e.g. !NotLinkedAsWikiName
+
+	* [1], [2], [3], [4] refer to remote references. Click EditLinks on the edit form to enter URLs. These differ from the newer linking scheme; references are unique to a page.
+
+	* Also, the old way of linking URL's is still supported: precede URLs with "http:", "ftp:" or "mailto:" to create links automatically as in: http://c2.com/
+
+	* URLs ending with .png are inlined ''if inserted as a remote reference'' 
+
+
+'''Mark-Up Language'''
+
+	* Don't bother
+
+	* < and > are themselves
+
+	* The & characters will not work
+
+	* If you really must use HTML, start each line with a bar (|). Note that this featured must be enabled by the system administrator.
+
+
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/pgsrc/nl/TestPagina ./pgsrc/nl/TestPagina
--- ../phpwiki/pgsrc/nl/TestPagina	Thu Jan  1 01:00:00 1970
+++ ./pgsrc/nl/TestPagina	Wed Jul 12 04:53:40 2000
@@ -0,0 +1,122 @@
+ New lists: astericks and hash marks
+* bullet
+* l1
+** l2
+** l2
+*** l3
+# one
+#two
+#three
+*****l5
+***l3
+*l1
+ preformatted text
+**    l2
+----
+	* level 1
+	* l1
+		*l2
+		*l2
+			*l3
+			*l3
+				*l4
+			*l3
+					*l5
+			*l3
+	#one
+	#two
+		#one
+		#two
+	*l1
+		#three
+		#four
+	*l1
+		*l2
+		# one
+		# two
+
+ preformatted text
+ some more text
+
+	*l1
+				*l4
+	# number
+	# number
+this is a plain paragraph
+	* bullet
+this is a plain paragraph again
+	# number
+----
+__Link tests__
+# FrontPage
+# [FrontPage]
+# Link in brackets: [http://phpwiki.sourceforge.net]
+# Link outside brackets: http://phpwiki.sourceforge.net/
+# Link with Wiki word: http://phpwiki.sourceforge.net/phpwiki/index.php3?FrontPage
+# Two consecutive links: http://phpwiki.sourceforge.net/ http://phpwiki.sourceforge.net/phpwiki/
+# [PhpWiki on Sourceforge | http://phpwiki.sourceforge.net/]
+# [URL with a WikiWord | http://phpwiki.sourceforge.net/phpwiki/index.php3?RecentChanges]
+# Javascript: [boo! | javascript:alert('oops') ] 
+# A [[Link] produces a [Link]
+# A [Link] looks like this: [[link]
+# This is a [%%%] line break link
+
+----
+ Markup tests:
+__underscores for bold__
+
+'''quotes for bold'''
+
+''quotes for italic''
+
+__''underscores bold italic''__
+
+'''''five quotes bold italic'''''
+
+''''''six quotes''''''
+
+'''''Bold italic''' and italic'' (buggy)
+
+'''Bold and ''bold-italic''''' (also buggy)
+
+! h1
+
+!! h2
+
+!!! h3
+
+this is plain text with <br>%%%
+a line break
+
+look at the <a href="http://phpwiki.sourceforge.net/">markup language</a>
+
+you cannot use &, < or >
+
+----
+ preformatted text:
+ 
+ __underscores for bold__
+ 
+ '''quotes for bold'''
+ 
+ ''quotes for italic''
+ 
+ __''underscores bold italic''__
+ 
+ '''''five quotes bold italic'''''
+ 
+ ''''''six quotes''''''
+ 
+ ! h1
+ 
+ !! h2
+ 
+ !!! h3
+ 
+ this is plain text with <br>%%%
+ a line break
+ 
+ look at the <a href="http://phpwiki.sourceforge.net/">markup language</a>
+ 
+ you cannot use &, < or >
+ 
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/pgsrc/nl/UitgaveNoten ./pgsrc/nl/UitgaveNoten
--- ../phpwiki/pgsrc/nl/UitgaveNoten	Thu Jan  1 01:00:00 1970
+++ ./pgsrc/nl/UitgaveNoten	Fri Jun 23 05:20:01 2000
@@ -0,0 +1,39 @@
+PhpWiki 1.1.6 is a major revision of PhpWiki. The ability to have themes (via an
+easy-to-edit template system) has been added; the schema for MySQL has been
+completely overhauled, breaking the page details into columns (for efficiency we
+agreed not to put references in a separate table, so it's not completely
+normalized. "Don't let the best be the enemy of the good.")
+
+Postgresql support has been added and the markup language is evolving, now allowing
+!<h1>
+!!<h2>
+!!!<h3>
+tags and __a new way to make text bold__, and of course the
+[new linking scheme].
+
+There is a new feature on all pages called ''more info'' that gives you a low level
+detailed view of a page, which is probably more useful for debugging than anything.
+
+As we move towards a 1.2 release we will be adding logging, top ten most active
+pages and other new features with the new database schema (and yes, these features
+will make it into the DBM version too). I also want to add mSQL support and test it
+under Zend, the new PHP4.
+
+Below are the release notes for version 1.03, the last release of the 1.0 PhpWiki
+series. --Steve Wainstead, mailto:sw...@pa...
+
+----
+
+PhpWiki was written because I am so interested in WikiWikiWebs, and I haven't used PHP since version 2.0. I wanted to see how it had advanced.
+
+Version 1.0 is a near-perfect clone of the Portland Pattern Repository, http://c2.com/cgi-bin/wiki?WikiWikiWeb. In truth, I was using the Wiki script you can download from there as a model; that Wiki lacks a number of features the PPR has, like EditCopy. So in truth PhpWiki is a kind of hybrid of the PPR and the generic Wiki you can get from there (which is written in Perl).
+
+The one caveat of PhpWiki is the allowance of HTML if the line is preceded by a bar (or pipe, which is how I usually say it). (That's a '|'). It was very simple to add, and the idea came from a posting somewhere on the PPR about how AT&T had an internal Wiki clone and used the same technique. The ability to embed HTML is disabled by default for security reasons.
+
+Version 1.01 includes a patch that fixes a small error with rendering <hr> lines. Thanks to Gerry Barksdale.
+
+See the HISTORY file for a rundown on the whole development process if that sort of thing really interests you :-)
+
+--SteveWainstead
+
+
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/pgsrc/nl/VeranderTekst ./pgsrc/nl/VeranderTekst
--- ../phpwiki/pgsrc/nl/VeranderTekst	Thu Jan  1 01:00:00 1970
+++ ./pgsrc/nl/VeranderTekst	Fri Jun  2 17:59:04 2000
@@ -0,0 +1 @@
+All pages (except search results) have an EditText link at the bottom. You can edit the page you are reading by clicking that link.
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/pgsrc/nl/VertaalSpatiesNaarTabs ./pgsrc/nl/VertaalSpatiesNaarTabs
--- ../phpwiki/pgsrc/nl/VertaalSpatiesNaarTabs	Thu Jan  1 01:00:00 1970
+++ ./pgsrc/nl/VertaalSpatiesNaarTabs	Sat Jun  3 13:19:56 2000
@@ -0,0 +1,19 @@
+VariousBrowsers have trouble with the tab character used in the TextFormattingRules.  If you can't type a tab, or, if you are fixing up a page written by someone who didn't type tabs, then you should have us convert spans of spaces to tabs for you.  You request space to tab conversion with the checkbox that appears near the bottom of EditText and EditCopy pages.  It looks something like this...
+
+ [[o] I can't type tabs.  Please ConvertSpacesToTabs for me when I save.
+
+A span of spaces must be at least '''three''' spaces long to be recognized 
+as a tab.  Use multiples of '''eight''' spaces to make multiple tabs. 
+Each span of eight spaces will convert to one tab.  If the  
+last span comes up a little short, that's ok, as long as  
+there are at least three spaces in the last (only) span.
+
+'''Check your work.'''  This sort of heuristic can lead to  
+unexpected results. 
+-----
+[Maintenance note:  This page is seen when the user clicks on the 
+"ConvertSpacesToTabs" link on any edit screen.  It describes what happens  
+when you ask the system to do this, why you would want it to, and ways to 
+avoid the spaces-instead-of-tabs problem.]
+
+
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/pgsrc/nl/VoorPagina ./pgsrc/nl/VoorPagina
--- ../phpwiki/pgsrc/nl/VoorPagina	Thu Jan  1 01:00:00 1970
+++ ./pgsrc/nl/VoorPagina	Sat Sep 30 17:18:15 2000
@@ -0,0 +1,9 @@
+*Wat is een WikiWikiWeb? Een beschrijving van deze toepassing.
+*Leer HoeWikiTeGebruiken en leer over PaginasToevoegen.
+*Speel in de ZandBak om met Wiki pagina's te oefenen.
+*Zet je naam alsjeblieft in RecenteBezoekers.
+*Zie RecenteVeranderingen voor de meest recente toevoegingen en veranderingen.
+*Ontdek welke pagina's het MeestBezocht worden.
+*Lees de UitgaveNoten
+
+
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/pgsrc/nl/WabiSabi ./pgsrc/nl/WabiSabi
--- ../phpwiki/pgsrc/nl/WabiSabi	Thu Jan  1 01:00:00 1970
+++ ./pgsrc/nl/WabiSabi	Fri Jun  2 17:59:04 2000
@@ -0,0 +1,26 @@
+Since wabi-sabi represents a comprehensive Japanese world view or aesthetic system, it is difficult to explain precisely in western terms.  According to Leonard Koren, wabi-sabi is the most conspicuous and characteristic feature of what we think of as traditional Japanese beauty and it "occupies roughly the same position in the Japanese pantheon of aesthetic values as do the Greek ideals of beauty and perfection in the West."
+
+Wabi-sabi is a beauty of things imperfect, impermanent, and incomplete.
+
+It is the beauty of things modest and humble.
+
+It is the beauty of things unconventional.
+
+The concepts of wabi-sabi correlate with the concepts of Zen Buddhism, as the first Japanese involved with wabi-sabi were tea masters, priests, and monks who practiced Zen. Zen Buddhism originated in India, traveled to China in the 6th century, and was first introduced in Japan around the 12th century. Zen emphasizes "direct, intuitive insight into transcendental truth beyond all intellectual conception." At the core of wabi- sabi is the importance of transcending ways of looking and thinking about things/existence.
+
+	*All things are impermanent
+	*All things are imperfect
+	*All things are incomplete 
+
+Material characteristics of wabi-sabi:
+
+	*suggestion of natural process
+	*irregular
+	*intimate
+	*unpretentious
+	*earthy
+	*simple
+
+For more about wabi-sabi, see
+http://www.art.unt.edu/ntieva/artcurr/japan/wabisabi.htm
+
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/pgsrc/nl/WikiWikiWeb ./pgsrc/nl/WikiWikiWeb
--- ../phpwiki/pgsrc/nl/WikiWikiWeb	Thu Jan  1 01:00:00 1970
+++ ./pgsrc/nl/WikiWikiWeb	Thu Aug 10 05:03:07 2000
@@ -0,0 +1,12 @@
+A WikiWikiWeb is a site where everyone can collaborate on the content. The most well-known and widely used Wiki is the Portland Pattern Repository at http://c2.com/cgi-bin/wiki?WikiWikiWeb.
+
+I found these statements there particularly relevant:
+
+''The point is to make the EditText form simple and the FindPage search fast.''
+
+''In addition to being quick, this site also aspires to Zen ideals generally labeled WabiSabi. Zen finds beauty in the imperfect and ephemeral. When it comes down to it, that's all you need.''
+
+You can say hello on RecentVisitors, or read about HowToUseWiki and AddingPages. Currently this Wiki has no "theme" for discussion, so go ahead and play with it and have fun!
+
+--SteveWainstead
+
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/pgsrc/nl/ZandBak ./pgsrc/nl/ZandBak
--- ../phpwiki/pgsrc/nl/ZandBak	Thu Jan  1 01:00:00 1970
+++ ./pgsrc/nl/ZandBak	Sat Sep 30 17:46:46 2000
@@ -0,0 +1,4 @@
+Hier kun je heerlijk met Wiki spelen.
+
+Veel plezier :-)
+
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/pgsrc/nl/ZoekPagina ./pgsrc/nl/ZoekPagina
--- ../phpwiki/pgsrc/nl/ZoekPagina	Thu Jan  1 01:00:00 1970
+++ ./pgsrc/nl/ZoekPagina	Sat Sep 30 18:29:15 2000
@@ -0,0 +1,18 @@
+Hier zijn een paar goede plaatsen om te beginnen met  bladeren.
+
+	* HoeWikiTeGebruiken maakt snel wegwijs in Wiki.
+	* RecenteVeranderingen worden automatisch bijgehouden.
+	* MeerOverTechnieken van het bladeren en veranderen van deze server.
+
+
+Hier is een titel zoeker.  Probeer iets als ''wiki'' 
+of ''broodje''.
+
+%%Search%%
+
+Gebruik deze voor het doorzoeken van alle tekst.  Dit kan een paar seconden duren.  De resultaten tonen alle regels op een pagina die een oplossing bevatten.
+
+%%Fullsearch%%
+
+
+
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/po/nl.po ./po/nl.po
--- ../phpwiki/po/nl.po	Thu Jan  1 01:00:00 1970
+++ ./po/nl.po	Sat Sep 30 18:35:19 2000
@@ -0,0 +1,137 @@
+# nl.po -- PhpWiki's dutch language file
+# Copyright (C) 2000 Jan Nieuwenhuizen <ja...@gn...>.
+# Jan Nieuwenhuizen <ja...@gn...>, 2000.
+#
+#
+# Don't change the format of the first three lines,
+# the TP robot wants them like this (I hope).
+#
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: phpwiki 1.1.7\n"
+"POT-Creation-Date: 2000-09-30 18:35+0200\n"
+"PO-Revision-Date: 2000-09-30 02:23+0200\n"
+"Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
+"Language-Team: Dutch <nl...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Date: 1998-05-26 11:26:28+0200\n"
+"From:  <ja...@gn...>\n"
+
+# #: test_dbmlib.php3:41 test_dbmlib.php3:75 wiki_linguas.php3:21
+#: test_dbmlib.php3:41 test_dbmlib.php3:75 wiki_linguas.php3:23
+msgid "TestPage"
+msgstr "TestPagina"
+
+#: wiki_config.php3:136
+msgid "./pgsrc"
+msgstr "./pgsrc/nl"
+
+#: wiki_config.php3:144
+msgid "templates/browse.html"
+msgstr "templates/nl/browse.html"
+
+#: wiki_config.php3:145
+msgid "templates/editpage.html"
+msgstr "templates/nl/editpage.html"
+
+#: wiki_config.php3:146
+msgid "templates/editlinks.html"
+msgstr "templates/nl/editlinks.html"
+
+#: wiki_config.php3:147
+msgid "templates/message.html"
+msgstr "templates/nl/message.html"
+
+#: wiki_diff.php3:1017
+#, c-format
+msgid "Diff of %s."
+msgstr "Diff van %s."
+
+#: wiki_display.php3:14 wiki_linguas.php3:13
+msgid "FrontPage"
+msgstr "VoorPagina"
+
+#: wiki_editpage.php3:49
+#, c-format
+msgid "Describe %s here."
+msgstr "Beschrijf %s hier."
+
+#: wiki_linguas.php3:9
+msgid "AddingPages"
+msgstr "PaginasToevoegen"
+
+#: wiki_linguas.php3:10
+msgid "ConvertSpacesToTabs"
+msgstr "VertaalSpatiesNaarTabs"
+
+#: wiki_linguas.php3:11
+msgid "EditText"
+msgstr "VeranderTekst"
+
+#: wiki_linguas.php3:12
+msgid "FindPage"
+msgstr "ZoekPagina"
+
+#: wiki_linguas.php3:14
+msgid "GoodStyle"
+msgstr "GoedeStijl"
+
+#: wiki_linguas.php3:15
+msgid "HowToUseWiki"
+msgstr "HoeWikiTeGebruiken"
+
+#: wiki_linguas.php3:16
+msgid "MoreAboutMechanics"
+msgstr "MeerOverTechnieken"
+
+#: wiki_linguas.php3:17
+msgid "MostPopular"
+msgstr "MeestBezocht"
+
+#: wiki_linguas.php3:18 wiki_stdlib.php3:318 wiki_stdlib.php3:381
+msgid "RecentChanges"
+msgstr "RecenteVeranderingen"
+
+#: wiki_linguas.php3:19
+msgid "RecentVisitors"
+msgstr "RecenteBezoekers"
+
+#: wiki_linguas.php3:20
+msgid "ReleaseNotes"
+msgstr "UitgaveNoten"
+
+#: wiki_linguas.php3:21
+msgid "SandBox"
+msgstr "ZandBak"
+
+#: wiki_linguas.php3:22
+msgid "SteveWainstead"
+msgstr ""
+
+#: wiki_linguas.php3:24
+msgid "TextFormattingRules"
+msgstr "TekstFormatterinsRegels"
+
+#: wiki_linguas.php3:25
+msgid "WabiSabi"
+msgstr ""
+
+#: wiki_linguas.php3:26
+msgid "WikiWikiWeb"
+msgstr ""
+
+#: wiki_pageinfo.php3:22
+msgid "PageInfo"
+msgstr "PaginaInfo"
+
+#: wiki_savepage.php3:60
+#, c-format
+msgid "Thank you for editing %s."
+msgstr "Bedankt voor het veranderen van %s."
+
+#: wiki_savepage.php3:90
+msgid "Your careful attention to detail is much appreciated."
+msgstr "Je zorgvuldige aandacht voor detail wordt erg gewaardeerd."
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/po/phpwiki.pot ./po/phpwiki.pot
--- ../phpwiki/po/phpwiki.pot	Thu Jan  1 01:00:00 1970
+++ ./po/phpwiki.pot	Sat Sep 30 18:35:19 2000
@@ -0,0 +1,130 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2000-09-30 18:35+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: ENCODING\n"
+
+#: test_dbmlib.php3:41 test_dbmlib.php3:75 wiki_linguas.php3:23
+msgid "TestPage"
+msgstr ""
+
+#: wiki_config.php3:136
+msgid "./pgsrc"
+msgstr ""
+
+#: wiki_config.php3:144
+msgid "templates/browse.html"
+msgstr ""
+
+#: wiki_config.php3:145
+msgid "templates/editpage.html"
+msgstr ""
+
+#: wiki_config.php3:146
+msgid "templates/editlinks.html"
+msgstr ""
+
+#: wiki_config.php3:147
+msgid "templates/message.html"
+msgstr ""
+
+#: wiki_diff.php3:1017
+#, c-format
+msgid "Diff of %s."
+msgstr ""
+
+#: wiki_display.php3:14 wiki_linguas.php3:13
+msgid "FrontPage"
+msgstr ""
+
+#: wiki_editpage.php3:49
+#, c-format
+msgid "Describe %s here."
+msgstr ""
+
+#: wiki_linguas.php3:9
+msgid "AddingPages"
+msgstr ""
+
+#: wiki_linguas.php3:10
+msgid "ConvertSpacesToTabs"
+msgstr ""
+
+#: wiki_linguas.php3:11
+msgid "EditText"
+msgstr ""
+
+#: wiki_linguas.php3:12
+msgid "FindPage"
+msgstr ""
+
+#: wiki_linguas.php3:14
+msgid "GoodStyle"
+msgstr ""
+
+#: wiki_linguas.php3:15
+msgid "HowToUseWiki"
+msgstr ""
+
+#: wiki_linguas.php3:16
+msgid "MoreAboutMechanics"
+msgstr ""
+
+#: wiki_linguas.php3:17
+msgid "MostPopular"
+msgstr ""
+
+#: wiki_linguas.php3:18 wiki_stdlib.php3:318 wiki_stdlib.php3:381
+msgid "RecentChanges"
+msgstr ""
+
+#: wiki_linguas.php3:19
+msgid "RecentVisitors"
+msgstr ""
+
+#: wiki_linguas.php3:20
+msgid "ReleaseNotes"
+msgstr ""
+
+#: wiki_linguas.php3:21
+msgid "SandBox"
+msgstr ""
+
+#: wiki_linguas.php3:22
+msgid "SteveWainstead"
+msgstr ""
+
+#: wiki_linguas.php3:24
+msgid "TextFormattingRules"
+msgstr ""
+
+#: wiki_linguas.php3:25
+msgid "WabiSabi"
+msgstr ""
+
+#: wiki_linguas.php3:26
+msgid "WikiWikiWeb"
+msgstr ""
+
+#: wiki_pageinfo.php3:22
+msgid "PageInfo"
+msgstr ""
+
+#: wiki_savepage.php3:60
+#, c-format
+msgid "Thank you for editing %s."
+msgstr ""
+
+#: wiki_savepage.php3:90
+msgid "Your careful attention to detail is much appreciated."
+msgstr ""
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/templates/nl/README ./templates/nl/README
--- ../phpwiki/templates/nl/README	Thu Jan  1 01:00:00 1970
+++ ./templates/nl/README	Sat Sep 30 16:45:34 2000
@@ -0,0 +1,86 @@
+$Id: README,v 1.1 2000/06/18 16:05:34 ahollosi Exp $
+
+PhpWiki distinguishes between four different templates:
+
+- template for browsing pages (default: browse.html)
+  This template is used when viewing Wiki pages.
+  
+- template for editing pages (default: editpage.html)
+  This template is used when users edit a page by clicking on
+  the EditText link.
+
+- template for editing references (default: editlinks.html)
+  This template is used when users edit references of a page
+  by clicking on the EditLinks link on the EditText page.
+
+- template for plain messages from PhpWiki (default: message.html)
+  This template is used when displaying search results, or when
+  displaying error messages.
+
+  
+The location of the template files is defined in wiki_config.php3
+The specification is relative to the index.php3 script.
+
+Template files are regular HTML files, which contain special
+placeholders. Placeholders are surrounded by '###'.
+You must not use '###' for other purposes.
+
+
+Following placeholders are provided by PhpWiki:
+
+###SCRIPTURL###
+	This is the URL of the main PhpWiki script.
+	All URL's referring to the Wiki itself should use this placeholder.
+
+###PAGE###
+	The page title. Any special HTML characters are replaced by their
+	entities. Do not use this placeholder in links. Use ###PAGEURL###
+	instead.
+
+###CONTENT###
+	The actual page content. This is either the Wikipage itself,
+	the search result, or a message text.
+
+###ALLOWEDPROTOCOLS###
+	Protocols allowed for external links and references.
+	Default: http|https|mailto|ftp|news|gopher
+
+
+The following placeholders are not available for the 'MESSAGE' template:
+
+###PAGEURL###
+	Page title encoded for use in URLs.
+
+###LASTMODIFIED###
+	Date when the page was last modified.
+
+###LASTAUTHOR###
+	Author of latest modification. Usually this is the hostname or
+	the IP address.
+
+###VERSION###
+	Revision number of the page.
+	Note: this is also used for detecting concurrent updates to a page.
+	See hidden input field in EDITPAGE template for how to use it.
+
+###IFCOPY###
+	Special placeholder. Should only be used in EDITPAGE template.
+	If EditCopy link should be shown, then ###IFCOPY### is ignored.
+	If EditCopy should not be shown, the rest of the line is deleted.
+
+
+Only for EditLinks:
+###1###, ###2###, ....
+	Placeholder for references. Up to NUM_LINKS placeholders will be
+	substituted. NUM_LINKS is defined in wiki_config.php3
+
+
+
+Examples:
+
+<A HREF="###SCRIPTURL###">the entry (default) page</A>
+<A HREF="###SCRIPTURL###?###PAGEURL###">the current page</A>
+<A HREF="###SCRIPTURL###?FindPage">the FindPage page</A>
+<head><title>PhpWiki Page: ###PAGE###</title></head>
+
+see default templates for more examples.
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/templates/nl/browse.html ./templates/nl/browse.html
--- ../phpwiki/templates/nl/browse.html	Thu Jan  1 01:00:00 1970
+++ ./templates/nl/browse.html	Sat Sep 30 18:22:50 2000
@@ -0,0 +1,26 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<title>###PAGE###</title>
+</head>
+
+<body bgcolor=ivory text=black alink=red link=darkblue vlink=darkmagenta>
+<table cellpadding=2>
+<tr><td bgcolor=black><a href="###SCRIPTURL###"><img src="###LOGO###" border=0 alt="[phpwiki]"></a></td>
+<td><h1><a href="###SCRIPTURL###?full=###PAGEURL###">###PAGE###</a></h1>
+</td></tr></table>
+<P>
+###CONTENT###
+
+<hr noshade>
+<a href="###SCRIPTURL###?edit=###PAGEURL###">VeranderTekst</a>
+ van deze pagina (laatste verandering ###LASTMODIFIED###
+[<a href="###SCRIPTURL###?info=###PAGEURL###">info</a>]
+[<a href="###SCRIPTURL###?diff=###PAGEURL###">diff</a>])
+<br>
+<a href="###SCRIPTURL###?ZoekPagina">ZoekPagina</a> door bladeren of zoeken
+<hr noshade>
+<small>###RELATEDPAGES###</small>
+
+</body>
+</html>
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/templates/nl/editlinks.html ./templates/nl/editlinks.html
--- ../phpwiki/templates/nl/editlinks.html	Thu Jan  1 01:00:00 1970
+++ ./templates/nl/editlinks.html	Sat Sep 30 16:45:34 2000
@@ -0,0 +1,39 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<title>###PAGE###</title>
+</head>
+
+<body bgcolor=moccasin text=black alink=red link=darkblue vlink=darkmagenta>
+
+<form method="POST" action="###SCRIPTURL###">
+
+<table cellpadding=2>
+<tr><td bgcolor=black><a href="###SCRIPTURL###"><img src="###LOGO###" border=0 alt="[phpwiki]"></a></td>
+<td><h1>Edit ###PAGE### Links
+<input type="submit" value=" Save ">
+<input type="reset" value=" Reset "></h1>
+</td></tr></table>
+
+<P>
+[1] <input type="text" size="55" name="r1" value="###R1###"><br>
+[2] <input type="text" size="55" name="r2" value="###R2###"><br>
+[3] <input type="text" size="55" name="r3" value="###R3###"><br>
+[4] <input type="text" size="55" name="r4" value="###R4###"><br>
+[5] <input type="text" size="55" name="r5" value="###R5###"><br>
+[6] <input type="text" size="55" name="r6" value="###R6###"><br>
+[7] <input type="text" size="55" name="r7" value="###R7###"><br>
+[8] <input type="text" size="55" name="r8" value="###R8###"><br>
+[9] <input type="text" size="55" name="r9" value="###R9###"><br>
+[10] <input type="text" size="55" name="r10" value="###R10###"><br>
+[11] <input type="text" size="55" name="r11" value="###R11###"><br>
+[12] <input type="text" size="55" name="r12" value="###R12###"><br>
+
+<p>
+Type the full URL (http:// ...) for each reference cited in the text.
+<BR>Protocols allowed are: ###ALLOWEDPROTOCOLS###
+
+<input type="hidden" name="post" value="###PAGEURL###">
+</form>
+</body>
+</html>
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/templates/nl/editpage.html ./templates/nl/editpage.html
--- ../phpwiki/templates/nl/editpage.html	Thu Jan  1 01:00:00 1970
+++ ./templates/nl/editpage.html	Sat Sep 30 18:39:59 2000
@@ -0,0 +1,50 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<title>###PAGE###</title>
+</head>
+
+<body bgcolor=moccasin text=black alink=red link=darkblue vlink=darkmagenta>
+
+<form method="POST" action="###SCRIPTURL###">
+
+<table cellpadding=2>
+<tr><td bgcolor=black><a href="###SCRIPTURL###"><img src="###LOGO###" border=0 alt="[phpwiki]"></a></td>
+<td><h1>Verander ###PAGE###
+<input type="submit" value=" Bewaar "></h1>
+</td></tr></table>
+
+<textarea name="content" ROWS="22" COLS="80" wrap="virtual">###CONTENT###</textarea>
+<br>
+
+<input type="checkbox" name="convert" value="tabs" >
+I kan geen tabs typen. 
+<a href="###SCRIPTURL###?VertaalSpatiesNaarTabs">VertaalSpatiesNaarTabs</a>
+voor mij als ik bewaar.
+<p><a href="###SCRIPTURL###?GoedeStijl">GoedeStijl</a> tips for
+veranderen.
+
+<br>
+<a href="###SCRIPTURL###?links=###PAGEURL###">VeranderKoppelingen</a>
+naar andere webservers.
+
+###IFCOPY###<br><a href="###SCRIPTURL###?copy=###PAGEURL###">VeranderKopie</a> van vorige auteur.
+
+<hr noshade>
+<small>
+<b>Emphasis:</b> '' for italics, ''' for bold, ''''' for both
+<br><b>Lists:</b> tab-* for bullet lists, tab-# for numbered lists, tab-Term:-tab for definition lists
+<br><b>References:</b> JoinCapitalizedWords or use square brackets for a [page link] or URL [http://cool.wiki.int/].
+<br><b>References:</b> Use [1],[2],[3],... and EditLinks. Avoid linking with "!": !DoNotHyperlink, name links like [text | URL]
+<br><b>Misc:</b>"!", "!!", "!!!" make headings,
+"%%%" makes a linebreak, "- - - -" makes a horizontal rule, escape "[" with "[["
+<br>meer op
+<a href="###SCRIPTURL###?TextFormattingRules">
+<b>TekstFormatteringsRegels.</b></a>
+</small>
+
+<input type="hidden" name="post" value="###PAGEURL###">
+<input type="hidden" name="editversion" value="###VERSION###">
+</form>
+</body>
+</html>
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/templates/nl/message.html ./templates/nl/message.html
--- ../phpwiki/templates/nl/message.html	Thu Jan  1 01:00:00 1970
+++ ./templates/nl/message.html	Sat Sep 30 16:45:34 2000
@@ -0,0 +1,17 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<title>###PAGE###</title>
+</head>
+
+<body bgcolor=linen text=black alink=red link=darkblue vlink=darkmagenta>
+
+<table cellpadding=2>
+<tr><td bgcolor=black><a href="###SCRIPTURL###"><img src="###LOGO###" border=0 alt="[phpwiki]"></a></td>
+<td><h1>###PAGE###</h1>
+</td></tr></table>
+
+###CONTENT###
+
+</body>
+</html>
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/test_dbmlib.php3 ./test_dbmlib.php3
--- ../phpwiki/test_dbmlib.php3	Tue Aug 29 04:37:42 2000
+++ ./test_dbmlib.php3	Sat Sep 30 15:33:44 2000
@@ -38,7 +38,7 @@
    // IsWikPage()
    // Test for pages to see if they are there
    //
-   $pagename = "TestPage";
+   $pagename = gettext ("TestPage");
    echo "Testing for existence of $pagename<br>\n";
    $res = IsWikiPage($dbi, $pagename);
    if ($res) {
@@ -72,7 +72,7 @@
    // retrieves and failed retrieves
    //
 
-   $pagename = "TestPage";
+   $pagename = gettext ("TestPage");
    echo "Retrieving page '$pagename'<br>\n";
    $pagehash = RetrievePage($dbi, $pagename, $WikiPageStore);
    $type = gettype($pagehash);
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/translate.sh ./translate.sh
--- ../phpwiki/translate.sh	Thu Jan  1 01:00:00 1970
+++ ./translate.sh	Sat Sep 30 18:09:02 2000
@@ -0,0 +1,11 @@
+#!/bin/bash
+#translate
+
+ALL_LINGUAS=nl
+
+xgettext -o po/phpwiki.pot *php3
+for i in $ALL_LINGUAS; do
+	msgmerge -o po/$i.po po/$i.po po/phpwiki.pot
+	mkdir -p locale/$i/LC_MESSAGES
+	msgfmt -o locale/$i/LC_MESSAGES/phpwiki.mo po/$i.po
+done
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/wiki_config.php3 ./wiki_config.php3
--- ../phpwiki/wiki_config.php3	Sat Sep 23 16:34:22 2000
+++ ./wiki_config.php3	Sat Sep 30 18:18:34 2000
@@ -4,6 +4,15 @@
    }
    rcs_id('$Id: wiki_config.php3,v 1.25 2000/09/23 14:34:22 ahollosi Exp $');
 
+   if (!function_exists('gettext')) {
+      function gettext($text) { return $text; };
+   } else {
+      // If you have php4, your can select favourite lingua here
+      // putenv ("LANG=nl");
+      bindtextdomain ("phpwiki", "./locale");
+      textdomain ("phpwiki"); 
+   }
+
    /*
       Constants and settings. Edit the values below for
       your site. You need two image files, a banner and 
@@ -124,7 +133,7 @@
     * The files can also be plain text files, in which case the page name
     * is taken from the file name.
     */
-   define('WIKI_PGSRC', './pgsrc'); // Default (old) behavior.
+   define('WIKI_PGSRC', gettext ("./pgsrc")); // Default (old) behavior.
    //define('WIKI_PGSRC', './wiki.zip'); // New style.
   
    $ScriptName = "index.php3";
@@ -132,10 +141,10 @@
 
    // Template files (filenames are relative to script position)
    $templates = array(
-   	"BROWSE" =>    "templates/browse.html",
-	"EDITPAGE" =>  "templates/editpage.html",
-	"EDITLINKS" => "templates/editlinks.html",
-	"MESSAGE" =>   "templates/message.html"
+   	"BROWSE" =>    gettext ("templates/browse.html"),
+	"EDITPAGE" =>  gettext ("templates/editpage.html"),
+	"EDITLINKS" => gettext ("templates/editlinks.html"),
+	"MESSAGE" =>   gettext ("templates/message.html")
 	);
 
    $SignatureImg = "$ServerAddress/signature.png";
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/wiki_diff.php3 ./wiki_diff.php3
--- ../phpwiki/wiki_diff.php3	Tue Aug 15 04:59:20 2000
+++ ./wiki_diff.php3	Sat Sep 30 18:34:44 2000
@@ -1014,6 +1014,7 @@
 	}
     }
 
-  GeneratePage('MESSAGE', $html, 'Diff of '.htmlspecialchars($pagename), 0);
+  GeneratePage('MESSAGE', $html, sprintf (gettext ("Diff of %s."),
+	htmlspecialchars($pagename))), 0);
 }
 ?>
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/wiki_display.php3 ./wiki_display.php3
--- ../phpwiki/wiki_display.php3	Tue Aug 29 04:37:42 2000
+++ ./wiki_display.php3	Sat Sep 30 15:33:54 2000
@@ -11,7 +11,7 @@
    if ($argv[0]) {
       $pagename = rawurldecode($argv[0]);
    } else { 
-      $pagename = "FrontPage"; 
+      $pagename = gettext ("FrontPage");
 
       // if there is no FrontPage, create a basic set of Wiki pages
       if (! IsWikiPage($dbi, $pagename)) {
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/wiki_editpage.php3 ./wiki_editpage.php3
--- ../phpwiki/wiki_editpage.php3	Tue Aug 29 04:37:42 2000
+++ ./wiki_editpage.php3	Sat Sep 30 18:06:51 2000
@@ -46,7 +46,8 @@
            $pagehash["copy"] = 1;
       }
    } else {
-      $textarea = "Describe " . htmlspecialchars($pagename) . " here.";
+      $textarea = sprintf (gettext ("Describe %s here."),
+				htmlspecialchars($pagename));
       unset($pagehash);
       $pagehash["version"] = 0;
    }
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/wiki_linguas.php3 ./wiki_linguas.php3
--- ../phpwiki/wiki_linguas.php3	Thu Jan  1 01:00:00 1970
+++ ./wiki_linguas.php3	Sat Sep 30 16:49:22 2000
@@ -0,0 +1,27 @@
+<!-- $Id: $ -->
+<?php
+   /*
+     xgettext -o po/phpwiki.pot *php3
+     msgmerge -o po/nl.po po/nl.po po/phpwiki.pot
+     mkdir -p locale/nl/LC_MESSAGES
+     msgfmt -o locale/nl/LC_MESSAGES/phpwiki.mo po/nl.po
+    */
+   gettext ("AddingPages");
+   gettext ("ConvertSpacesToTabs");
+   gettext ("EditText");
+   gettext ("FindPage");
+   gettext ("FrontPage");
+   gettext ("GoodStyle");
+   gettext ("HowToUseWiki");
+   gettext ("MoreAboutMechanics");
+   gettext ("MostPopular");
+   gettext ("RecentChanges");
+   gettext ("RecentVisitors");
+   gettext ("ReleaseNotes");
+   gettext ("SandBox");
+   gettext ("SteveWainstead");
+   gettext ("TestPage");
+   gettext ("TextFormattingRules");
+   gettext ("WabiSabi");
+   gettext ("WikiWikiWeb");
+?>
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/wiki_pageinfo.php3 ./wiki_pageinfo.php3
--- ../phpwiki/wiki_pageinfo.php3	Tue Aug 29 04:37:42 2000
+++ ./wiki_pageinfo.php3	Sat Sep 30 15:34:17 2000
@@ -19,7 +19,7 @@
 
    // don't bother unless we were asked
    if (! $info) {
-      GeneratePage('MESSAGE', $html, "PageInfo", 0);
+      GeneratePage('MESSAGE', $html, gettext ("PageInfo"), 0);
       exit;
    }
 
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/wiki_savepage.php3 ./wiki_savepage.php3
--- ../phpwiki/wiki_savepage.php3	Tue Aug 29 04:37:42 2000
+++ ./wiki_savepage.php3	Sat Sep 30 18:05:06 2000
@@ -57,8 +57,9 @@
    // create page header
    $enc_url = rawurlencode($pagename);
    $enc_name = htmlspecialchars($pagename);
-   $html = "Thank you for editing " .
-	"<a href=\"$ScriptUrl?$enc_url\">$enc_name</a><br>\n";
+   $html = sprintf (gettext ("Thank you for editing %s."),
+	"<a href=\"$ScriptUrl?$enc_url\">$enc_name</a>");
+   $html .= "<br>\n";
 
    if (! empty($content)) {
       // patch from Grant Morgan <gr...@ry...> for magic_quotes_gpc
@@ -86,7 +87,8 @@
    InsertPage($dbi, $pagename, $pagehash);
    UpdateRecentChanges($dbi, $pagename, $newpage);
 
-   $html .= "Your careful attention to detail is much appreciated.\n";
+   $html .= gettext ("Your careful attention to detail is much appreciated.");
+   $html .= "\n";
 
    if ($WikiPageStore == "/tmp/wikidb") {
       $html .= "<P><B>Warning: the Wiki DBM file still lives in the " .
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/wiki_stdlib.php3 ./wiki_stdlib.php3
--- ../phpwiki/wiki_stdlib.php3	Sat Sep 23 16:31:06 2000
+++ ./wiki_stdlib.php3	Sat Sep 30 15:20:48 2000
@@ -315,7 +315,8 @@
       global $ScriptUrl;
       global $WikiPageStore;
 
-      $recentchanges = RetrievePage($dbi, "RecentChanges", $WikiPageStore);
+      $recentchanges = RetrievePage($dbi, gettext ("RecentChanges"), 
+      	$WikiPageStore);
 
       // this shouldn't be necessary, since PhpWiki loads 
       // default pages if this is a new baby Wiki
@@ -377,7 +378,7 @@
 
       $recentchanges["content"] = $newpage;
 
-      InsertPage($dbi, "RecentChanges", $recentchanges);
+      InsertPage($dbi, gettext ("RecentChanges"), $recentchanges);
    }
 
 

-- 
Jan Nieuwenhuizen <ja...@gn...> | GNU LilyPond - The music typesetter
http://www.xs4all.nl/~jantien       | http://www.lilypond.org

Re: [Phpwiki-talk] line count

[Steve W. <sw...@wc...>]

Wow. How did you do the breakdown? The numbers are interesting and useful.
Also, I didn't think I needed to account for brackets when matching a line
of code, reasoning that any line of code had to have at least one
alphanumeric character.

sw


On Sat, 30 Sep 2000, Arno Hollosi wrote:

> >Subtracting comments, comment blocks and blank lines, I count 2,426 lines
> >of executable code (and a few html comments) in *php3 with this perl script:
> 
> Actually, there's a slight flaw in the script:
> 	[a-zA-Z0-9]/ && $count++;
> should include brackets as well.
> And "*/" lines don't count as comment lines in your script.
> 
> correcting those two errors I get (without admin/):
> 
> 4905 lines in total
> 3108 lines code (63%)
>  952 lines comment (19%)
>  821 empty lines (17%)
>   24 lines not accounted for (mostly closing php tags)
> 
> There are a total of 170 functions (96 when counting db-interface functions 
> only once), 220 if-statements, 34 for-loops, and 31 while-loops.
> 
> Finally, "wc *.php3" says:
>   lines   words   bytes
>    4905   15526  142812 total
> 
> /Arno
> p.s. no, I was not bored ;o)
> _______________________________________________
> Phpwiki-talk mailing list
> Php...@li...
> http://lists.sourceforge.net/mailman/listinfo/phpwiki-talk
> 

...............................ooo0000ooo.................................
   Hear FM quality freeform radio through the Internet: http://wcsb.org/
                     home page: www.wcsb.org/~swain 

Re: [Phpwiki-talk] line count

[Arno H. <aho...@in...>]

>Subtracting comments, comment blocks and blank lines, I count 2,426 lines
>of executable code (and a few html comments) in *php3 with this perl script:

Actually, there's a slight flaw in the script:
	[a-zA-Z0-9]/ && $count++;
should include brackets as well.
And "*/" lines don't count as comment lines in your script.

correcting those two errors I get (without admin/):

4905 lines in total
3108 lines code (63%)
 952 lines comment (19%)
 821 empty lines (17%)
  24 lines not accounted for (mostly closing php tags)

There are a total of 170 functions (96 when counting db-interface functions 
only once), 220 if-statements, 34 for-loops, and 31 while-loops.

Finally, "wc *.php3" says:
  lines   words   bytes
   4905   15526  142812 total

/Arno
p.s. no, I was not bored ;o)

[Phpwiki-talk] line count

[Steve W. <sw...@wc...>]

Subtracting comments, comment blocks and blank lines, I count 2,426 lines
of executable code (and a few html comments) in *php3 with this perl
script:

#!/usr/bin/perl

while (<STDIN>) {
    m#\*/# && do { $flag = 0 };
    next if $flag;
    m#/\*# && do { $flag = 1; next };
    next if m#^\s*//#;
    /[a-zA-Z0-9]/ && $count++;
}

print "$count\n";

and:

cat *php3|./linecount.pl


just thought you'd be interested...

sw

...............................ooo0000ooo.................................
   Hear FM quality freeform radio through the Internet: http://wcsb.org/
                     home page: www.wcsb.org/~swain 

[Phpwiki-talk] wikilinks plus scoring

[Arno H. <aho...@in...>]

Hi all,

in a short coding frenzy I added functionality for the wikilink table. I also 
added scoring not completely unlike google: score of a page is sum of 
importance of pages linking to that page. Importance is count of how many 
pages link to a given page.

Works ok - but only with mySQL.

I have added a navgiation bar at the bottom of the "browse.html" template: 
most important incoming/outgoing links, most popular pages nearby (meaning 
linked by page or linking to page).

Let me know what you think.

Feel free to duplicate the functionality for other databases :o)
(don't worry - the missing functions for dbm, pgsql, ... don't break phpwiki)

Remember: the thing is just a quick hack - I'm open for changes.

/Arno

[Phpwiki-talk] Re: phpwiki 1.1.8

[Arno H. <aho...@in...>]

> > > > E.g. I got a strange bug, where if you edit a file and write
> > > > it would be rendered as "word1word2" (no space!!)
> any chance you can create an error on Sourceforge?
> http://phpwiki.sourceforge.net:80/phpwiki/index.php3?TestPage

Can't reproduce.
SF uses wiki_savepage v1.12 - the bug was introduced in v1.13 (post 1.1.7)

> http://wcsb.org:80/~swain/phpwiki1/index.php3?TestPage
> This version runs on mSQL and I just ran a cvs update -d on it.

Can't reproduce. Seems my fix works ok.

> Wow, I must have missed something entirely. There should be only one call
> to OpenDataBase, and that should be in index.php3.
> [swain@boojie phpwiki1]$ grep OpenDataBase *php3
> Sigh. I am going to have to install MySQL to run tests on. The quickest
> way to debug this is to put an echo statement in OpenDataBase for all libs
> and make sure it only appears once.

I just did this and actually diff,info etc. are ok.
When doing a "save page" it gets called twice. Not that bad, but you know ...

> Heh. On wcsb.org search boxes don't render at all at the moment. They work
> on SF... I'll add search boxes to TestPage.

Fixed :o) The new escape is %%Search%% instead of [Search] because of 
collision with '[]' links - this was changed ages ago - simple edit of the 
SearchPage. Isn't wiki just nice in that it allows you to edit such 
fundamental service pages? :o)

/Arno

[Phpwiki-talk] Re: phpwiki 1.1.8

[Steve W. <sw...@wc...>]

On Thu, 21 Sep 2000, Arno Hollosi wrote:

> > > E.g. I got a strange bug, where if you edit a file and write
> > > word1
> > > word2
> > > it would be rendered as "word1word2" (no space!!)
> 
> > No, I haven't encountered this yet.
> 
> Could you verify that? Also, could you verify that my fix in wiki_transform
> doesn't break things at your end? (try pre-formatted text and see if
> erroneous empty lines are displayed)

I will try to test it tonight after 10pm EST... any chance you can create
an error on Sourceforge?
http://phpwiki.sourceforge.net:80/phpwiki/index.php3?TestPage

or here:
http://wcsb.org:80/~swain/phpwiki1/index.php3?TestPage

This version runs on mSQL and I just ran a cvs update -d on it.

> > > The current form of OpenDataBase is silly. It should be split into a
> > > "ConnectDataBase" and "SelectDataBase".
> > hmm. Perhaps I don't understand. Open the database, and interact with the
> > database. 
> 
> As it is now, OpenDataBase connects to e.g. mySQL every time it is called. 

Wow, I must have missed something entirely. There should be only one call
to OpenDataBase, and that should be in index.php3.

[swain@boojie phpwiki1]$ grep OpenDataBase *php3
index.php3:   $dbi = OpenDataBase($WikiPageStore);
test_dbmlib.php3:   // OpenDataBase()
test_dbmlib.php3:   $dbi = OpenDataBase($WikiPageStore);
test_dbmlib.php3:      echo "Return type from
OpenDataBase($WikiPageStore): $vartype<br>\n";
wiki_db_filesystem.php3:      OpenDataBase($table)
wiki_db_filesystem.php3:   function OpenDataBase($dbname) {
wiki_db_filesystem.php3:      $hcdb = OpenDataBase($WikiDB['hitcount']);
wiki_db_filesystem.php3:      $hcdb = OpenDataBase($WikiDB['hitcount']);
wiki_dbmlib.php3:      OpenDataBase($table)
wiki_dbmlib.php3:   function OpenDataBase($dbname) {
wiki_diff.php3://  $dba = OpenDataBase($ArchivePageStore);
wiki_editpage.php3:      // $cdbi = OpenDataBase($WikiPageStore);
wiki_msql.php3:      OpenDataBase($dbname)
wiki_msql.php3:   function OpenDataBase($dbinfo) {
wiki_mysql.php3:      OpenDataBase($dbname)
wiki_mysql.php3:   function OpenDataBase($dbname) {
wiki_mysql.php3:      $adbi = OpenDataBase($ArchivePageStore);
wiki_pageinfo.php3:   // $dbi = OpenDataBase($WikiPageStore);   --- done
by index.php3
wiki_pageinfo.php3:   // $dbi = OpenDataBase($ArchivePageStore);
wiki_pgsql.php3:      OpenDataBase($table)
wiki_pgsql.php3:   function OpenDataBase($table) {

Sigh. I am going to have to install MySQL to run tests on. The quickest
way to debug this is to put an echo statement in OpenDataBase for all libs
and make sure it only appears once.

> The inconsistence I'm complaining about is: some functions rely on the 
> pagestore opened by OpenDataBase($pagestore) (e.g. the search functions), 
> some are using a 3rd argument (e.g. RetrievePage), and some are splitted into 
> two separate functions alltogether (InsertPage, SaveCopyToArchive).
> This is bad and will lead to obscure errors.

Yes... I agree, and we'll rectify it.

> A possible solution: get rid of multiple functions and 3rd arguments, and 
> split OpenDateBase in two functions: a real OpenDB that connects to resp. 
> opens the DB, and a SelectPageStore(). Or use 3 arguments throughout.


That would mean:
OpenDataBase()
SelectPageStore()
InsertOrUpdatePage()
RetrievePage()


> Going to correct another bug now: search results display lines without 
> safeguarding against HTML - try a fulltext search on wiki and look for the 
> results of TestPage and you see what I mean.

Heh. On wcsb.org search boxes don't render at all at the moment. They work
on SF... I'll add search boxes to TestPage.

 
> Oh, and of course the entire documentation could need an overhaul.
> Any volunteers? ;o)

The lowest of activities! Of course I'll do it :-)

sw


...............................ooo0000ooo.................................
   Hear FM quality freeform radio through the Internet: http://wcsb.org/
                     home page: www.wcsb.org/~swain 

[Phpwiki-talk] Re: phpwiki 1.1.8

[Arno H. <aho...@in...>]

> Strange your email hasn't come through...

Neither did yours - but the phpwiki-talk archive on Geocrawler has all 
messages. My first email surfaced with a 24hours delay. Anyone else seeing 
these delays with the list?

> > E.g. I got a strange bug, where if you edit a file and write
> > word1
> > word2
> > it would be rendered as "word1word2" (no space!!)

> No, I haven't encountered this yet.

Could you verify that? Also, could you verify that my fix in wiki_transform
doesn't break things at your end? (try pre-formatted text and see if
erroneous empty lines are displayed)

> > The current form of OpenDataBase is silly. It should be split into a
> > "ConnectDataBase" and "SelectDataBase".
> hmm. Perhaps I don't understand. Open the database, and interact with the
> database. 

As it is now, OpenDataBase connects to e.g. mySQL every time it is called. 
OpenDataBase might be called several times when editing or saving - and 
everytime it connects to mySQL again. Similar when using dbmlib all dbm files 
get opened several times. What we really want is to connect/open once,
and then just select which database we are using: wiki or archive.

> But there is a third argument now to specify the table (page or
> archive). I realized there is an inconsistency that there is one
> RetrievePage and two functions for inserting pages (InsertPage and
> SaveCopyToArchive) and that it's a mess and needs cleaning up... 

The inconsistence I'm complaining about is: some functions rely on the 
pagestore opened by OpenDataBase($pagestore) (e.g. the search functions), 
some are using a 3rd argument (e.g. RetrievePage), and some are splitted into 
two separate functions alltogether (InsertPage, SaveCopyToArchive).
This is bad and will lead to obscure errors.

A possible solution: get rid of multiple functions and 3rd arguments, and 
split OpenDateBase in two functions: a real OpenDB that connects to resp. 
opens the DB, and a SelectPageStore(). Or use 3 arguments throughout.

Going to correct another bug now: search results display lines without 
safeguarding against HTML - try a fulltext search on wiki and look for the 
results of TestPage and you see what I mean.

Oh, and of course the entire documentation could need an overhaul.
Any volunteers? ;o)

/Arno

[Phpwiki-talk] Re: phpwiki 1.1.8

[Steve W. <sw...@wc...>]

Strange your email hasn't come through...

> I've slightly modified wiki_mysql.php3 so that it runs with OpenDataBase as 
> intended.
> 
> Are we using "lib/*" yet? index.php3 still uses wiki_*.php3, so I fixed those 
> files.

No, I only added the directory and tested it on my home box. I read
through a lot of CVS docs and couldn't find a good way to rename files, so
the log information will be broken up unfortunately.


> It looks like the current CVS MAIN branch isn't in good shape.
> 
> E.g. I got a strange bug, where if you edit a file and write
> 
> word1
> word2
> 
> it would be rendered as "word1word2" (no space!!)
> 
> The cause: Jeff's change in version 1.1.3 of wiki_savepage
> He modified
>          $pagehash["content"] = explode("\n", $content);
> to
>          $pagehash["content"] = preg_split('/[ \t\r]*\n/', chop($content));
> in order to get rid of all unnecessary spaces.
 
> Actually this removed the trailing '\r' our lines used to have in the
> pagehash[content] array - that's why some parts may behave strange.
> 
> This (IMHO serious) bug was introduced 2000/07/20 (I don't blame Jeff, these 
> things just happen). But it got unnoticed until now - or can't you reproduce 
> the bug?

No, I haven't encountered this yet. In the last week or two I did see a
link that didn't link, but didn't have time/energy to investigate... I
should start using the bug tracking software on SF for that. Now I'll have
to go find it again.
 
> Next, "admin/" is broken - it doesn't use the latest DB interface.
> 
> The current form of OpenDataBase is silly. It should be split into a
> "ConnectDataBase" and "SelectDataBase". Also, I find the change of 3 
> arguments for RetrievePage() questionable. Either use OpenDataBase 
> throughout, or use 3 argument fucntions throughout, but don't mix the two 
> cases. This is a Bad Thing to do.

hmm. Perhaps I don't understand. Open the database, and interact with the
database. But there is a third argument now to specify the table (page or
archive). I realized there is an inconsistency that there is one
RetrievePage and two functions for inserting pages (InsertPage and
SaveCopyToArchive) and that it's a mess and needs cleaning up... since
PhpWiki is a fairly small application (that does an awful lot though),
it's not too late to munge these things.

I think we need to differentiate the page store and the archive, otherwise
the archive format has to be the same as the page store format (or schema,
if you prefer). It seems to me that in the long run we want either one
page store entirely, or two separate stores that differ in
schema/format/attributes/whatever. I think I lean towards the latter camp
(if we decide that archived pages are stored only as diffs, why store them
in the page table?) because the small amount of duplication now will pay
off in the long run.

> 
> So what I'm saying is: before Steve releases 1.1.8 we should get our act 
> together and do some cleanup and testing.

Aye! :-)

sw

................................ooo0000ooo.................................
   Hear FM quality freeform radio through the Internet: http://wcsb.org/
                     home page: www.wcsb.org/~swain 

[Phpwiki-talk] follow-up on pre-1.1.8

[Arno H. <aho...@in...>]

Hi again,

I've slightly modified wiki_mysql.php3 so that it runs with OpenDataBase as 
intended.

Are we using "lib/*" yet? index.php3 still uses wiki_*.php3, so I fixed those 
files.

It looks like the current CVS MAIN branch isn't in good shape.

E.g. I got a strange bug, where if you edit a file and write

word1
word2

it would be rendered as "word1word2" (no space!!)

The cause: Jeff's change in version 1.1.3 of wiki_savepage
He modified
	$pagehash["content"] = explode("\n", $content);
to
	$pagehash["content"] = preg_split('/[ \t\r]*\n/', chop($content));
in order to get rid of all unnecessary spaces.

Actually this removed the trailing '\r' our lines used to have in the
pagehash[content] array - that's why some parts may behave strange.

This (IMHO serious) bug was introduced 2000/07/20 (I don't blame Jeff, these 
things just happen). But it got unnoticed until now - or can't you reproduce 
the bug?

Next, "admin/" is broken - it doesn't use the latest DB interface.

The current form of OpenDataBase is silly. It should be split into a
"ConnectDataBase" and "SelectDataBase". Also, I find the change of 3 
arguments for RetrievePage() questionable. Either use OpenDataBase 
throughout, or use 3 argument fucntions throughout, but don't mix the two 
cases. This is a Bad Thing to do.


So what I'm saying is: before Steve releases 1.1.8 we should get our act 
together and do some cleanup and testing.

/Arno

[Phpwiki-talk] don't release 1.1.8 yet

[Arno H. <aho...@in...>]

Hi all,

yes it's me - I know I have been silent for almost two months now.
It's a long story and I don't think I'd like to tell it. Anyway, I
still don't have much time left, but more than recently.

I had a short look at the most current CVS snapshot.
The mySQL portion does NOT work! It only needs minor tweaking, but I assume 
you don't want to release a phpwiki with broken mySQL support.

I shall fix this and other minor things I come across ASAP.

/Arno

[Phpwiki-talk] 1.1.8

[Steve W. <sw...@wc...>]

I'd like to release 1.1.8 this week. I've gotten the DBM lib up to date,
Ari has contributed a flat file database which works for the important
things (search, load, browse), and who knows what else in the last six
weeks.

Check in anything you want included, and I'll ship a tarball in the middle
of the week.

sw

...............................ooo0000ooo.................................
   Hear FM quality freeform radio through the Internet: http://wcsb.org/
                     home page: www.wcsb.org/~swain 

[Phpwiki-talk] weird wiki_diff error on SourceForge

[Steve W. <sw...@wc...>]

In the last two days I keep getting:

Fatal error: Unsupported operand types in
/home/groups/phpwiki/htdocs/phpwiki/wiki_diff.php3 on line 869

on SourceForge whenever I try to use the diff utility. I suspect that it's
some problem on their end, since I haven't done a "cvs update -d" in three
or four weeks.

The line in question is:

            $x += $ncopy;
            $y += $ncopy;

Both these lines cause an error, and if I comment them out diff compiles
again... but $x, $y, and $ncopy all are used in numeric contexts at all
times based on my grepping the code.

Jeff, any ideas? I think they might have either upgraded recently (they're
using 4.02 now, see http://phpwiki.sourceforge.net/phpinfo.php3) or else
their server is in some unstable state, which has happened a couple of
times before and they need a reboot. I'm using 4.00 at home so I can't
test this out yet.

sw

...............................ooo0000ooo.................................
   Hear FM quality freeform radio through the Internet: http://wcsb.org/
                     home page: www.wcsb.org/~swain 

Re: [Phpwiki-talk] some good news...

[Michael D. E. <md...@md...>]

> It's always nice to hear someone is happy with PhpWiki...

> you have written a very groovy php app.
>
> thanks a lot..

Hi,

phpwiki IS a very groovy application and really: thanks a lot  :-)))))

I have it running in an intranet, so I can't give you an URL.
I'm waiting for the possibility to delete pages, because we have many
newbies which are experimenting a lot. If they are experienced phpwiki
users they don't need their experiments and they have to be deleted.

Have a great day

Michael D. Eschner

[Phpwiki-talk] some good news...

[Steve W. <sw...@wc...>]

It's always nice to hear someone is happy with PhpWiki...

Subject: not a bug
Date: Thu, 31 Aug 2000 13:55:58 -0400
From: ron phelps <ron...@ce...>
To: sw...@pa...

well Steve..
you have written a very groovy php app.

thanks a lot..
I will be using this on the Nursesportal somewhere
as a free form converstation area for nurses who want to
discuss Nursing Issues..


right now it resides at http://ezpresentations.com/phpwiki/index.php3
because i only have two domains moved over to my new server..
and ezpresentations is not being used yet..

so when i get it on its own domain
I;ll send you the address to the working copy..

thanks again
ron

ps
it was extremely easy to setup in mysql
wow..

ron
webmaster
http://nursesportal.com



...............................ooo0000ooo.................................
   Hear FM quality freeform radio through the Internet: http://wcsb.org/
                     home page: www.wcsb.org/~swain 

[Phpwiki-talk] new Wiki clone

[Steve W. <sw...@wc...>]

http://moin.sourceforge.net/

Python based... just thought I'd point it out...

sw

...............................ooo0000ooo.................................
   Hear FM quality freeform radio through the Internet: http://wcsb.org/
                     home page: www.wcsb.org/~swain 

Re: [Phpwiki-talk] Modularization ideas

[Jeff D. <da...@da...>]

Hi All,

Sorry I dropped off the face of the earth.  I suddenly became very busy
(combination of work and last-ditch-end-of-summer-looms recreation).

(I will probably remain busy for at least another couple of weeks...)

I am still here though, and will try to find time soon to add the
PATH_INFO and admin browse stuff to the main branch.

>I think this was Jeff's goal as well, but I don't know if he realized it
>(Jeff?). I think we'd all like to see rendering modularized, so go ahead
>with it, but don't bother forking the code base.

Yes it was my main goal, and I think I accomplished it --- though I admit
that my rendering code less than transparent in clarity.  (In fact, off all the
hacks in the jeffs_hacks-branch, I'm least happy with the rendering code.)
If you've got something better, go for it!


>I've just finished Jakob Nielsen's "Designing Web Usability" and have some
>ideas about the page layout, and as time permits I'll be checking in those
>changes this week (at work, we are now in the "death march" to reach a
>deadline, so time is precious).
>
>I want to shrink the logo, add a nav bar across the top and maybe the
>bottom too (to reduce the amount of scrolling needed), and add Ari's Wiki
>feature of how many times a page was edited (not necessary but I like it).

Note that in the jeffs_hacks branch, the addition of nav bars are can
be accomplished by a simple editing of templates files (probably just one:
template/wrapper.html).

>Arno drafted the "wikilinks" table which hasn't been implemented yet, but
>I want to add a right-hand rail listing all the pages that link to the
>current one. I got this idea from Nielsen's book; having "related pages"
>in a right hand rail is a Web convention apparently, and I have long been
>bothered by how this feature is hidden away in the page title link (i.e.
>click the page title 'FrontPage' and see all the pages that link to
>FrontPage).

A great idea.  Also note that the links table is implemented in jeffs_hacks.
Again (toot, toot) I think adding your right hand rail to jeffs_hacks
is a simple matter of editing templates (it might take a little php hacking,
too --- I'm not sure without looking.)



I think you should take a look at the database interface in jeffs_hacks again,
and consider it for inclusion into the main branch.  While some of the code
in jeffs_hacks admitedly fairly obtuse, I think the database code is
pretty straightforward.   I really don't see much room for (other than
incremental) improvement in it.  (Other than that the minisql and psql
backends still don't exist.)

Your ghost,
Jeff

Re: [Phpwiki-talk] Modularization ideas

[Steve W. <sw...@wc...>]

I think this was Jeff's goal as well, but I don't know if he realized it
(Jeff?). I think we'd all like to see rendering modularized, so go ahead
with it, but don't bother forking the code base.

I've just finished Jakob Nielsen's "Designing Web Usability" and have some
ideas about the page layout, and as time permits I'll be checking in those
changes this week (at work, we are now in the "death march" to reach a
deadline, so time is precious).

I want to shrink the logo, add a nav bar across the top and maybe the
bottom too (to reduce the amount of scrolling needed), and add Ari's Wiki
feature of how many times a page was edited (not necessary but I like it).

Arno drafted the "wikilinks" table which hasn't been implemented yet, but
I want to add a right-hand rail listing all the pages that link to the
current one. I got this idea from Nielsen's book; having "related pages"
in a right hand rail is a Web convention apparently, and I have long been
bothered by how this feature is hidden away in the page title link (i.e.
click the page title 'FrontPage' and see all the pages that link to
FrontPage).

Ideally it should be configurable; if the Wiki admin doesn't want the
performance penalty of listing all related pages (a mere SELECT statement
though it is) or the page clutter of a list of titles, they can leave it
out. 

I think the nav bar I drafted last night was:

EditText | Changes | PageInfo | Help | MostPopular | RecentChanges |
FindPage

and it will just be a set of plain text links, to satisfy Lynx and Emacs
w3 mode (which I test PhpWiki in periodically. There could also be a
WhatLinksToThisPage link of some kind rather than list the pages on the
right side. Users can add an imagemap if they want.

A long term goal I have is to revamp FindPage entirely... there are many
things a search can do that are totally feasible in PhpWiki, like all
pages returned by the search have the search term highlighted when the
user clicks on them.

sw

On Tue, 29 Aug 2000, Aredridel Niothke wrote:

> Jeff's OO work aside, I was wondering if it would be appropriate to make 
> the rendering engine modular? I've taken this approach to some extent on the 
> Wiki I've been hacking on, and I was thinking it would be rather nice to be 
> able to change which wiki markup language is used on a wiki upon unpacking the 
> tarball: Specifically, one could have an HTML parser, so HTML could be used 
> safely, or a "standard PHPWiki" language, or the language I've used on the 
> NBTSWikiWiki (http://www.nbtsc.org/wiki), which has the goal of being almost 
> as readable unrendered as in HTML.
> 
> It's quite possible to modularize the renderer and let the user simply
> uncomment a few include lines in their wiki_config.php3 to select the wiki
> language.
> 
> Does anyone have any objection to my checking in such changes? Should I
> branch the code?
> 
> 	Aredridel
> _______________________________________________
> Phpwiki-talk mailing list
> Php...@li...
> http://lists.sourceforge.net/mailman/listinfo/phpwiki-talk
> 

...............................ooo0000ooo.................................
   Hear FM quality freeform radio through the Internet: http://wcsb.org/
                     home page: www.wcsb.org/~swain 

[Phpwiki-talk] Modularization ideas

[Aredridel N. <are...@er...>]

Jeff's OO work aside, I was wondering if it would be appropriate to make 
the rendering engine modular? I've taken this approach to some extent on the 
Wiki I've been hacking on, and I was thinking it would be rather nice to be 
able to change which wiki markup language is used on a wiki upon unpacking the 
tarball: Specifically, one could have an HTML parser, so HTML could be used 
safely, or a "standard PHPWiki" language, or the language I've used on the 
NBTSWikiWiki (http://www.nbtsc.org/wiki), which has the goal of being almost 
as readable unrendered as in HTML.

It's quite possible to modularize the renderer and let the user simply
uncomment a few include lines in their wiki_config.php3 to select the wiki
language.

Does anyone have any objection to my checking in such changes? Should I
branch the code?

	Aredridel