Menu
▾
▴
[Phpwiki-talk] Patch: internationalisation with php3 fallback [Was: ...]
|
From: Jan N. <ja...@gn...> - 2000-10-01 18:03:05
|
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
|
