Thread: Re: [Phpwiki-talk] Internationalization finally committed

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

On Friday, 20 October 2000, Arno Hollosi writes:

> I have finally rolled in Jan's patch.
> Some slight modifications were needed.

Okay, thanks.  I've synced/merged and made a new patch with the
remaining translations (and internationalisations) that I did.

Greetings,
Jan.

diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/lib/diff.php ./lib/diff.php

--- ../phpwiki/lib/diff.php	Thu Oct 19 23:36:50 2000
+++ ./lib/diff.php	Fri Oct 20 09:06:30 2000
@@ -1,4 +1,4 @@
-<!-- $Id: diff.php,v 1.2 2000/10/19 21:36:50 ahollosi Exp $ -->
+<!-- $Id: diff.php,v 1.9 2000/08/15 02:59:20 wainstead Exp $ -->
 <?php
 // diff.php
 //
@@ -672,7 +672,7 @@
 		$x += -$edit;
 	  }
 	if ($x != $xlim)
-	    die("WikiDiff::apply: line count mismatch: $x != $xlim");
+	    die (sprintf (gettext ("WikiDiff::apply: line count mismatch: %s != %s"), $x, $xlim));
 	return $output;
       }
     
@@ -732,7 +732,7 @@
       {
 	$test = $this->apply($from_lines);
 	if (serialize($test) != serialize($to_lines))
-	    die("WikiDiff::_check: failed");
+	    die (gettext ("WikiDiff::_check: failed"));
 
 	reset($this->edits);
 	$prev = current($this->edits);
@@ -742,11 +742,12 @@
 	  {
 	    $type = is_array($edit) ? 'a' : ($edit > 0 ? 'c' : 'd');
 	    if ( $prevtype == $type )
-		die("WikiDiff::_check: edit sequence is non-optimal");
+		die (gettext ("WikiDiff::_check: edit sequence is non-optimal"));
 	    $prevtype = $type;
 	  }
 	$lcs = $this->lcs();
-	echo "<strong>WikiDiff Okay: LCS = $lcs</strong>\n";
+	printf ("<strong>" . gettext ("WikiDiff Okay: LCS = %s") . "</strong>", $lcs);
+	print ("\n");
       }
 }
 
@@ -984,28 +985,50 @@
 //  $dba = OpenDataBase($ArchivePageStore);
   $archive= RetrievePage($dbi, $pagename, $ArchivePageStore);
 
-  $html = '<table><tr><td align="right">Current page:</td>';
-  if (is_array($wiki))
-      $html .= "<td>version $wiki[version],</td><td>last modified on "
-	  . date($datetimeformat, $wiki['lastmodified'])
-	  . "</td><td>by $wiki[author]</td>";
-  else
-      $html .= "<td colspan=3><em>None</em></td>";
-  $html .= '</tr><tr><td align="right">Archived page:</td>';
-  if (is_array($archive))
-      $html .= "<td>version $archive[version],</td><td>last modified on "
-	  . date($datetimeformat, $archive['lastmodified'])
-	  . "</td><td>by $archive[author]</td>";
-  else
-      $html .= "<td colspan=3><em>None</em></td>";
+  $html = '<table><tr><td align="right">';
+  $html .= gettext ("Current page:");
+  $html .= '</td>';
+  if (is_array($wiki)) {
+      $html .= "<td>";
+      $html .= sprintf (gettext ("version %s"), $wiki[version]);
+      $html .= "</td><td>";
+      $html .= sprintf (gettext ("last modified on %s"),
+	date($datetimeformat, $wiki['lastmodified']));
+      $html .= "</td><td>";
+      $html .= sprintf (gettext ("by %s"), $wiki[author]);
+      $html .= "</td>";
+  } else {
+      $html .= "<td colspan=3><em>";
+      $html .= gettext ("None");
+      $html .= "</em></td>";
+  }
+  $html .= "</tr>\n";
+  $html .= '<tr><td align="right">';
+  $html .= gettext ("Archived page:");
+  $html .= '</td>';
+  if (is_array($archive)) {
+      $html .= "<td>";
+      $html .= sprintf (gettext ("version %s"), $archive[version]);
+      $html .= "</td><td>";
+      $html .= sprintf (gettext ("last modified on %s"),
+	date($datetimeformat, $archive['lastmodified']));
+      $html .= "</td><td>";
+      $html .= sprintf (gettext ("by %"), $archive[author]);
+      $html .= "</td>";
+  } else {
+      $html .= "<td colspan=3><em>";
+      $html .= gettext ("None");
+      $html .= "</em></td>";
+  }
   $html .= "</tr></table><p>\n";
 
-
   if (is_array($wiki) && is_array($archive))
     {
       $diff = new WikiDiff($archive['content'], $wiki['content']);
-      if ($diff->isEmpty())
-	  $html .= '<hr>[Versions are identical]';
+      if ($diff->isEmpty()) {
+	  $html .= '<hr>';
+	  $html .= gettext ("[Versions are identical]");
+      }
       else
 	{
 	  //$fmt = new WikiDiffFormatter;
@@ -1014,7 +1037,7 @@
 	}
     }
 
-  GeneratePage('MESSAGE', $html, sprintf(gettext("Diff of %s."),
-		htmlspecialchars($pagename)), 0);
+  GeneratePage('MESSAGE', $html, sprintf (gettext ("Diff of %s."),
+	htmlspecialchars($pagename)), 0);
 }
 ?>
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/lib/display.php ./lib/display.php
--- ../phpwiki/lib/display.php	Thu Oct 19 23:36:50 2000
+++ ./lib/display.php	Fri Oct 20 09:39:55 2000
@@ -1,4 +1,4 @@
-<!-- $Id: display.php,v 1.3 2000/10/19 21:36:50 ahollosi Exp $ -->
+<!-- $Id: display.php,v 1.8 2000/08/29 02:37:42 aredridel Exp $ -->
 <?php
    /*
       display.php: render a page. This has all the display 
@@ -11,7 +11,7 @@
    if ($argv[0]) {
       $pagename = rawurldecode($argv[0]);
    } else { 
-      $pagename = gettext("FrontPage");
+      $pagename = gettext ("FrontPage");
 
       // if there is no FrontPage, create a basic set of Wiki pages
       if (! IsWikiPage($dbi, $pagename)) {
@@ -26,10 +26,11 @@
    if (is_array($pagehash)) {
       // we render the page if it's a hash, else ask the user to write one.
       // This file returns a variable $html containing all the HTML markup
-      include("lib/transform.php");
+      include "lib/transform.php";
    } else {
-      $html .= sprintf(gettext("Describe %s here."),
-		       "$pagename<a href='$ScriptUrl?edit=$enc_name'>?</a>");
+      $html .= sprintf (gettext ("Describe %s here."),
+         "$pagename<a href='$ScriptUrl?edit=$enc_name'>?</a>");
+      $html .= '\n';
    }
 
    GeneratePage('BROWSE', $html, $pagename, $pagehash);
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/lib/editlinks.php ./lib/editlinks.php
--- ../phpwiki/lib/editlinks.php	Sun Oct  8 19:33:26 2000
+++ ./lib/editlinks.php	Fri Oct 13 12:30:03 2000
@@ -1,4 +1,4 @@
-<!-- $Id: editlinks.php,v 1.1 2000/10/08 17:33:26 wainstead Exp $ -->
+<!-- $Id: editlinks.php,v 1.7 2000/08/29 02:37:42 aredridel Exp $ -->
 <?php
    // Thanks to Alister <al...@mi...> for this code.
    // This allows an arbitrary number of reference links.
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/lib/editpage.php ./lib/editpage.php
--- ../phpwiki/lib/editpage.php	Fri Oct 20 00:25:45 2000
+++ ./lib/editpage.php	Fri Oct 20 09:09:40 2000
@@ -1,4 +1,4 @@
-<!-- $Id: editpage.php,v 1.3 2000/10/19 22:25:45 ahollosi Exp $ -->
+<!-- $Id: editpage.php,v 1.13 2000/08/29 02:37:42 aredridel Exp $ -->
 <?php
 
    // editpage relies on $pagename and $ScriptUrl
@@ -16,21 +16,24 @@
       if (get_magic_quotes_gpc()) {
          $pagename = stripslashes($pagename);
       }
-      $banner = htmlspecialchars("Copy of $pagename");
+      $banner = htmlspecialchars (sprintf (gettext ("Copy of %s"), $pagename));
       $pagehash = RetrievePage($dbi, $pagename, $ArchivePageStore);
 
-   } else
-      ExitWiki("No page name passed into editpage!");
+   } else {
+      ExitWiki (gettext ("No page name passed into editpage!"));
+   }
 
 
    if (is_array($pagehash)) {
 
       if (($pagehash['flags'] & FLAG_PAGE_LOCKED) && !$admin_edit) {
-	 $html = "<p>This page has been locked by the administrator\n" .
-		 "and cannot be edited.\n" .
-		 "<p>Sorry for the inconvinience.\n";
-	 GeneratePage('MESSAGE', $html, "Problem while editing $pagename", 0);
-	 ExitWiki('');
+	 $html = "<p>";
+	 $html .= gettext ("This page has been locked by the administrator and cannot be edited.");
+	 $html .= "\n<p>";
+	 $html .= gettext ("Sorry for the inconvinience.");
+	 $html .= "\n";
+	 GeneratePage('MESSAGE', $html, sprintf (gettext ("Problem while editing %s"), $pagename), 0);
+	 ExitWiki ("");
       }
 
       $textarea = implode("\n", $pagehash["content"]);
@@ -44,8 +47,8 @@
            $pagehash["copy"] = 1;
       }
    } else {
-      $textarea = sprintf(gettext("Describe %s here."),
-			  htmlspecialchars($pagename));
+      $textarea = sprintf (gettext ("Describe %s here."),
+				htmlspecialchars($pagename));
       unset($pagehash);
       $pagehash["version"] = 0;
    }
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/lib/fullsearch.php ./lib/fullsearch.php
--- ../phpwiki/lib/fullsearch.php	Sun Oct  8 19:33:26 2000
+++ ./lib/fullsearch.php	Wed Oct 18 13:54:44 2000
@@ -1,4 +1,4 @@
-<!-- $Id: fullsearch.php,v 1.1 2000/10/08 17:33:26 wainstead Exp $ -->
+<!-- $Id: fullsearch.php,v 1.10 2000/09/21 19:21:25 ahollosi Exp $ -->
 <?php
    /*
       Search the text of pages for a match.
@@ -11,8 +11,10 @@
    if(get_magic_quotes_gpc())
       $full = stripslashes($full);
 
-   $result = "<P><B>Searching for \"" . htmlspecialchars($full) .
-		"\" ....</B></P>\n<DL>\n";
+   $result = "<P><B>";
+   $result .= sprintf (gettext ("Searching for \"%s\" ....."),
+      htmlspecialchars($full));
+   $result .= "</B></P>\n<DL>\n";
 
    // quote regexp chars
    $full = preg_quote($full);
@@ -38,6 +40,9 @@
       }
    }
 
-   $result .= "</dl>\n<hr noshade>$found matches found in $count pages.\n";
-   GeneratePage('MESSAGE', $result, "Full Text Search Results", 0);
+   $result .= "</dl>\n<hr noshade>";
+   $result .= sprintf (gettext ("%d matches found in %d pages."),
+     $found, $count);
+   $result .= "\n";
+   GeneratePage('MESSAGE', $result, gettext ("Full Text Search Results"), 0);
 ?>
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/lib/msql.php ./lib/msql.php
--- ../phpwiki/lib/msql.php	Fri Oct 20 00:25:45 2000
+++ ./lib/msql.php	Fri Oct 20 09:14:11 2000
@@ -1,4 +1,4 @@
-<!-- $Id: msql.php,v 1.2 2000/10/19 22:25:45 ahollosi Exp $ -->
+<!-- $Id: msql.php,v 1.16 2000/09/16 19:20:46 wainstead Exp $ -->
 <?php
 
    /*
@@ -26,14 +26,16 @@
       global $msql_db;
 
       if (! ($dbc = msql_connect())) {
-         $msg =  "Cannot establish connection to database, giving up.";
-         $msg .= "<BR>Error message: " . msql_error();
-         ExitWiki($msg);
+         $msg = gettext ("Cannot establish connection to database, giving up.");
+	 $msg .= "<BR>";
+	 $msg .= sprintf (gettext ("Error message: %s"), msql_error ());
+	 ExitWiki ($msg);
       }
       if (!msql_select_db($msql_db, $dbc)) {
-         $msg =  "Cannot open database $msql_db, giving up.";
-         $msg .= "<BR>Error message: " . msql_error();
-         ExitWiki($msg);
+         $msg = gettext ("Cannot open database %s, giving up.");
+	 $msg .= "<BR>";
+	 $msg .= sprintf (gettext ("Error message: %s"), msql_error ());
+	 ExitWiki ($msg);
       }
 
       $dbi['dbc'] = $dbc;
@@ -194,8 +196,10 @@
 
       // first, insert the metadata
       $retval = msql_query($query, $dbi['dbc']);
-      if ($retval == false) 
-         echo "Insert/update failed: ", msql_error(), "<br>\n";
+      if ($retval == false) {
+         printf (gettext ("Insert/update failed: %s"), msql_error ());
+         printf ("<br>\n");
+      }
 
 
       // second, insert the page data
@@ -203,8 +207,11 @@
       $query = "delete from $dbi[page_table] where pagename='$pagename'";
       // echo "Delete query: $query<br>\n";
       $retval = msql_query($query, $dbi['dbc']);
-      if ($retval == false) 
-         echo "Delete on $dbi[page_table] failed: ", msql_error(), "<br>\n";
+      if ($retval == false) {
+         printf (gettext ("Delete on %s failed: %s"), $dbi[page_table],
+            msql_error());
+         printf ("<br>\n");
+      }
 
       // insert the new lines
       reset($pagehash["content"]);
@@ -217,8 +224,8 @@
          // echo "Page line insert query: $query<br>\n";
          $retval = msql_query($query, $dbi['dbc']);
          if ($retval == false) 
-            echo "Insert into $dbi[page_table] failed: ", 
-                  msql_error(), "<br>\n";
+            printf (gettext ("Insert into %s failed: %s"), $dbi[page_table],
+               msql_error() "<br>\n");
          
       }
 
@@ -267,7 +274,7 @@
       // first, insert the metadata
       $retval = msql_query($query, $dbi['dbc']);
       if ($retval == false) 
-         echo "Insert/update failed: ", msql_error(), "<br>\n";
+         printf (gettext ("Insert/update failed: %s"), msql_error() . "<br>\n");
 
 
       // second, insert the page data
@@ -275,8 +282,11 @@
       $query = "delete from $ArchivePageStore[page_table] where pagename='$pagename'";
       // echo "Delete query: $query<br>\n";
       $retval = msql_query($query, $dbi['dbc']);
-      if ($retval == false) 
-         echo "Delete on $ArchivePageStore[page_table] failed: ", msql_error(), "<br>\n";
+      if ($retval == false) {
+         printf (gettext ("Delete on %s failed: %s"),
+          $ArchivePageStore[page_table], msql_error());
+         print ("<br>\n");
+      }
 
       // insert the new lines
       reset($pagehash["content"]);
@@ -288,10 +298,11 @@
                   "VALUES('$pagename', $x, '$line')";
          // echo "Page line insert query: $query<br>\n";
          $retval = msql_query($query, $dbi['dbc']);
-         if ($retval == false) 
-            echo "Insert into $ArchivePageStore[page_table] failed: ", 
-                  msql_error(), "<br>\n";
-         
+         if ($retval == false) {
+            printf (gettext ("Insert into %s failed: %s"),
+              $ArchivePageStore[page_table], msql_error());
+            printf ("<br>\n");
+         }
       }
 
 
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/lib/mysql.php ./lib/mysql.php
--- ../phpwiki/lib/mysql.php	Fri Oct 20 00:25:45 2000
+++ ./lib/mysql.php	Fri Oct 20 09:17:06 2000
@@ -1,4 +1,4 @@
-<?php rcs_id('$Id: mysql.php,v 1.2 2000/10/19 22:25:45 ahollosi Exp $');
+<?php rcs_id('$Id: mysql.php,v 1.16 2000/09/23 14:31:06 ahollosi Exp $');
 
    /*
       Database functions:
@@ -30,14 +30,16 @@
       global $mysql_server, $mysql_user, $mysql_pwd, $mysql_db;
 
       if (!($dbc = mysql_pconnect($mysql_server, $mysql_user, $mysql_pwd))) {
-         $msg =  "Cannot establish connection to database, giving up.";
-	 $msg .= "<br>MySQL error: " . mysql_error();
-         ExitWiki($msg);
+         $msg = gettext ("Cannot establish connection to database, giving up.");
+	 $msg .= "<BR>";
+	 $msg .= sprintf (gettext ("MySQL error: %s"), msql_error ());
+	 ExitWiki ($msg);
       }
       if (!mysql_select_db($mysql_db, $dbc)) {
-         $msg =  "Cannot open database, giving up.";
-	 $msg .= "<br>MySQL error: " . mysql_error();
-         ExitWiki($msg);
+         $msg =  gettext ("Cannot open database, giving up.");
+	 $msg .= "<BR>";
+	 $msg .= sprintf (gettext ("MySQL error: %s"), msql_error ());
+	 ExitWiki ($msg);
       }
       $dbi['dbc'] = $dbc;
       $dbi['table'] = $dbname;
@@ -108,8 +110,9 @@
 
       if (!mysql_query("replace into $dbi[table] ($COLUMNS) values ($VALUES)",
       			$dbi['dbc'])) {
-	    $msg = "Error writing page '$pagename' " . mysql_error();
-            ExitWiki($msg);
+            $msg = sprintf (gettext ("error writing page '%s'"), $pagename);
+	    echo mysql_error ();
+            ExitWiki ("");
       }
    }
 
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/lib/pageinfo.php ./lib/pageinfo.php
--- ../phpwiki/lib/pageinfo.php	Thu Oct 19 23:36:50 2000
+++ ./lib/pageinfo.php	Fri Oct 20 09:17:35 2000
@@ -1,4 +1,4 @@
-<!-- $Id: pageinfo.php,v 1.3 2000/10/19 21:36:50 ahollosi Exp $ -->
+<!-- $Id: pageinfo.php,v 1.7 2000/08/29 02:37:42 aredridel Exp $ -->
 <!-- Display the internal structure of a page. Steve Wainstead, June 2000 -->
 <?php
    if (get_magic_quotes_gpc()) {
@@ -63,5 +63,5 @@
    // $dbi = OpenDataBase($ArchivePageStore);
    $html .= ViewPageProps($info, $ArchivePageStore);
 
-   GeneratePage('MESSAGE', $html, gettext("PageInfo").": '$info'", 0);
+   GeneratePage('MESSAGE', $html, gettext("PageInfo"), 0);
 ?>
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/lib/savepage.php ./lib/savepage.php
--- ../phpwiki/lib/savepage.php	Thu Oct 19 23:36:50 2000
+++ ./lib/savepage.php	Fri Oct 13 12:35:17 2000
@@ -1,4 +1,4 @@
-<!-- $Id: savepage.php,v 1.2 2000/10/19 21:36:50 ahollosi Exp $ -->
+<!-- $Id: savepage.php,v 1.16 2000/08/29 02:37:42 aredridel Exp $ -->
 <?php
 
 /*
@@ -57,8 +57,8 @@
    // create page header
    $enc_url = rawurlencode($pagename);
    $enc_name = htmlspecialchars($pagename);
-   $html = sprintf(gettext("Thank you for editing %s."),
-		   "<a href=\"$ScriptUrl?$enc_url\">$enc_name</a>");
+   $html = sprintf (gettext ("Thank you for editing %s."),
+	"<a href=\"$ScriptUrl?$enc_url\">$enc_name</a>");
    $html .= "<br>\n";
 
    if (! empty($content)) {
@@ -98,7 +98,7 @@
    }
 
    $html .= "<P><img src=\"$SignatureImg\"></P><hr noshade><P>";
-   include("lib/transform.php");
+   include "lib/transform.php";
 
    GeneratePage('BROWSE', $html, $pagename, $pagehash);
 ?>
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/lib/search.php ./lib/search.php
--- ../phpwiki/lib/search.php	Sun Oct  8 19:33:26 2000
+++ ./lib/search.php	Fri Oct 13 12:30:03 2000
@@ -1,4 +1,4 @@
-<!-- $Id: search.php,v 1.1 2000/10/08 17:33:26 wainstead Exp $ -->
+<!-- $Id: search.php,v 1.6 2000/08/29 02:37:42 aredridel Exp $ -->
 <?php
    // Title search: returns pages having a name matching the search term
 
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/lib/setupwiki.php ./lib/setupwiki.php
--- ../phpwiki/lib/setupwiki.php	Sun Oct  8 19:33:26 2000
+++ ./lib/setupwiki.php	Fri Oct 13 15:15:38 2000
@@ -1,6 +1,6 @@
-<!-- $Id: setupwiki.php,v 1.1 2000/10/08 17:33:26 wainstead Exp $ -->
+<!-- $Id: setupwiki.php,v 1.15 2000/08/29 02:37:42 aredridel Exp $ -->
 <?php
-require 'lib/ziplib.php';
+require "lib/ziplib.php";
 
 function SavePage ($dbi, $page, $source)
 {
@@ -18,8 +18,10 @@
       SaveCopyToArchive($dbi, $pagename, $current);
     }
 
-  printf("Inserting page <b>%s</b>, version %s from %s<br>\n",
-	 htmlspecialchars($pagename), $version, $source);
+  printf (gettext ("Inserting page %s, version %s from %s"),
+	 "<b>" . htmlspecialchars ($pagename) . "</b>", $version, $source);
+  print ("<br>\n");
+
   flush();
   InsertPage($dbi, $pagename, $page);
 }
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/lib/stdlib.php ./lib/stdlib.php
--- ../phpwiki/lib/stdlib.php	Fri Oct 20 00:25:45 2000
+++ ./lib/stdlib.php	Fri Oct 20 09:38:50 2000
@@ -1,4 +1,4 @@
-<!-- $Id: stdlib.php,v 1.3 2000/10/19 22:25:45 ahollosi Exp $ -->
+<!-- $Id: stdlib.php,v 1.29 2000/09/23 14:31:06 ahollosi Exp $ -->
 <?php
    /*
       Standard functions for Wiki functionality
@@ -17,7 +17,7 @@
          UpdateRecentChanges($dbi, $pagename, $isnewpage) 
          ParseAndLink($bracketlink)
          ExtractWikiPageLinks($content)
-	 ExitWiki($errormsg)
+         ExitWiki($errormsg)
    */
 
 
@@ -33,7 +33,10 @@
       CloseDataBase($dbi);
 
       if($errormsg <> '') {
-         print "<P><hr noshade><h2>WikiFatalError</h2>\n";
+         $msg = "<P><hr noshade><h2>";
+	 $msg .= gettext("WikiFatalError");
+	 $msg .= "</h2>\n";
+	 print ($msg);
          print $errormsg;
          print "\n</BODY></HTML>";
       }
@@ -49,7 +52,9 @@
 
       $links = GetWikiPageLinks($dbi, $pagename);
 
-      $txt = "<b>" . NUM_RELATED_PAGES . " best incoming links:</b>\n";
+      $txt = "<b>";
+      $txt .= sprintf (gettext ("%d best incoming links:"), NUM_RELATED_PAGES);
+      $txt .= "</b>\n";
       for($i = 0; $i < NUM_RELATED_PAGES; $i++) {
          if(isset($links['in'][$i])) {
             list($name, $score) = $links['in'][$i];
@@ -57,7 +62,9 @@
          }
       }
 
-      $txt .= "\n<br><b>" . NUM_RELATED_PAGES . " best outgoing links:</b>\n";
+      $txt .= "\n<br><b>";
+      $txt .= sprintf (gettext ("%d best outgoing links:"), NUM_RELATED_PAGES);
+      $txt .= "</b>\n";
       for($i = 0; $i < NUM_RELATED_PAGES; $i++) {
          if(isset($links['out'][$i])) {
             list($name, $score) = $links['out'][$i];
@@ -66,7 +73,9 @@
          }
       }
 
-      $txt .= "\n<br><b>" . NUM_RELATED_PAGES . " most popular nearby:</b>\n";
+      $txt .= "\n<br><b>";
+      $txt .= sprintf (gettext ("%d most popular nearby:"), NUM_RELATED_PAGES);
+      $txt .= "</b>\n";
       for($i = 0; $i < NUM_RELATED_PAGES; $i++) {
          if(isset($links['popular'][$i])) {
             list($name, $score) = $links['popular'][$i];
@@ -279,7 +288,7 @@
                $stack->push($tag);
                if ($stack->cnt() > 10) {
                   // arbitrarily limit tag nesting
-                  ExitWiki("Stack bounds exceeded in SetHTMLOutputMode");
+                  ExitWiki (gettext ("Stack bounds exceeded in SetHTMLOutputMode"));
                }
             }
    
@@ -314,8 +323,9 @@
             $stack->push($tag);
          }
    
-      } else {    // error
-         ExitWiki("Passed bad tag depth value in SetHTMLOutputMode");
+      } else {
+         // error
+         ExitWiki ("Passed bad tag depth value in SetHTMLOutputMode");
       }
 
       return $retvar;
@@ -333,7 +343,8 @@
       global $ScriptUrl;
       global $WikiPageStore;
 
-      $recentchanges = RetrievePage($dbi, gettext("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
@@ -395,7 +406,7 @@
 
       $recentchanges["content"] = $newpage;
 
-      InsertPage($dbi, gettext("RecentChanges"), $recentchanges);
+      InsertPage($dbi, gettext ("RecentChanges"), $recentchanges);
    }
 
 
@@ -506,5 +517,5 @@
       }
 
       return $wikilinks;
-   }
+   }      
 ?>
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/lib/ziplib.php ./lib/ziplib.php
--- ../phpwiki/lib/ziplib.php	Sun Oct  8 19:33:26 2000
+++ ./lib/ziplib.php	Fri Oct 13 12:32:57 2000
@@ -1,4 +1,4 @@
-<?php rcs_id("$Id: ziplib.php,v 1.1 2000/10/08 17:33:26 wainstead Exp $");
+<?php rcs_id("$Id: ziplib.php,v 1.7 2000/08/29 02:37:42 aredridel Exp $");
 
 //FIXME: get rid of this.
 function warn ($msg)
Binary files ../phpwiki/locale/nl/LC_MESSAGES/phpwiki.mo and ./locale/nl/LC_MESSAGES/phpwiki.mo differ
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/locale/nl/LC_MESSAGES/phpwiki.php ./locale/nl/LC_MESSAGES/phpwiki.php
--- ../phpwiki/locale/nl/LC_MESSAGES/phpwiki.php	Thu Oct 19 23:49:52 2000
+++ ./locale/nl/LC_MESSAGES/phpwiki.php	Fri Oct 20 09:42:04 2000
@@ -2,25 +2,95 @@
 $locale["./pgsrc"] =
    "./locale/nl/pgsrc";
 $locale["templates/browse.html"] =
-   "./locale/nl/templates/browse.html";
+   "locale/nl/templates/browse.html";
 $locale["templates/editpage.html"] =
-   "./locale/nl/templates/editpage.html";
+   "locale/nl/templates/editpage.html";
 $locale["templates/editlinks.html"] =
-   "./locale/nl/templates/editlinks.html";
+   "locale/nl/templates/editlinks.html";
 $locale["templates/message.html"] =
-   "./locale/nl/templates/message.html";
+   "locale/nl/templates/message.html";
+$locale["WikiDiff::apply: line count mismatch: %s != %s"] =
+   "";
+$locale["WikiDiff::_check: failed"] =
+   "";
+$locale["WikiDiff::_check: edit sequence is non-optimal"] =
+   "";
+$locale["WikiDiff Okay: LCS = %s"] =
+   "";
+$locale["Current page:"] =
+   "Huidige pagina:";
+$locale["version %s"] =
+   "versie %s";
+$locale["last modified on %s"] =
+   "laatste verandering op %s";
+$locale["by %s"] =
+   "door %s";
+$locale["None"] =
+   "Geen";
+$locale["Archived page:"] =
+   "Gearchiveerde pagina:";
+$locale["by %"] =
+   "door %s";
+$locale["[Versions are identical]"] =
+   "[Versies zijn identiek]";
 $locale["Diff of %s."] =
    "Diff van %s.";
 $locale["FrontPage"] =
    "VoorPagina";
 $locale["Describe %s here."] =
    "Beschrijf %s hier.";
+$locale["Copy of %s"] =
+   "Kopie van %s";
+$locale["No page name passed into editpage!"] =
+   "Geen paginanaam doorgegeven aan veranderpagina";
+$locale["This page has been locked by the administrator and cannot be edited."] =
+   "";
+$locale["Sorry for the inconvinience."] =
+   "Excuses voor het ongemak.";
+$locale["Problem while editing %s"] =
+   "Probleem tijdens veranderen %s";
+$locale["Searching for \"%s\" ....."] =
+   "Zoeken naar \"%s\" ...";
+$locale["%d matches found in %d pages."] =
+   "%d keer gevonden in %d pagina's.";
+$locale["Full Text Search Results"] =
+   "Volledige tekst zoek resultaten";
+$locale["Cannot establish connection to database, giving up."] =
+   "Kan verbinding naar data base niet tot stand brengen, geef op.";
+$locale["Error message: %s"] =
+   "Foutboodschap: %s";
+$locale["Cannot open database %s, giving up."] =
+   "Kan data base %s niet openen, geef op.";
+$locale["Insert/update failed: %s"] =
+   "Insert/update gefaald: %s";
+$locale["Delete on %s failed: %s"] =
+   "Delete op %s gefaald: %s";
+$locale["Insert into %s failed: %s"] =
+   "Insert in %s gefaald: %s";
+$locale["MySQL error: %s"] =
+   "MySQL fout: %s";
+$locale["Cannot open database, giving up."] =
+   "Kan data base niet openen, geef op.";
+$locale["error writing page '%s'"] =
+   "fout bij schrijven pagina `%s'";
 $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.";
+$locale["Inserting page %s, version %s from %s"] =
+   "Voeg pagina %s toe, versie %s van %s";
+$locale["WikiFatalError"] =
+   "WikiFataleFout";
+$locale["%d best incoming links:"] =
+   "%d beste inkomende koppelingen:";
+$locale["%d best outgoing links:"] =
+   "%d beste uitgaande koppelingen:";
+$locale["%d most popular nearby:"] =
+   "%d meest gevraagde in de buurt:";
+$locale["Stack bounds exceeded in SetHTMLOutputMode"] =
+   "";
 $locale["RecentChanges"] =
    "RecenteVeranderingen";
 ?>
diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/locale/nl/pgsrc/HoeWikiTeGebruiken ./locale/nl/pgsrc/HoeWikiTeGebruiken
--- ../phpwiki/locale/nl/pgsrc/HoeWikiTeGebruiken	Thu Oct 19 23:36:50 2000
+++ ./locale/nl/pgsrc/HoeWikiTeGebruiken	Fri Oct 13 15:17:39 2000
@@ -1,36 +1,53 @@
-''"Wiki wiki"'' means "quick" in Hawai'ian.
+''"Wiki wiki"'' betekent "vlug" in het Hawaiiaans.
 
-'''All you really need to know is:'''
+'''Alles wat je echt moet weten 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:
+	* Om een pagina te veranderen, klik op de Verander Tekst koppeling
+onderaan de desbetreffende pagina.  Doe dat nu maar, en lees de bron tekst
+van deze pagina.  Dat is wat zinvoller.
+	* Je maakt schuingedrukte tekst door woorden tussen enkele
+aanhalingtekens te zetten ''zoals dit''.
+	* Je maakt '''vette tekst''' door aan weerszijden drie
+aanhalingtekens te gebruiken.
+	* En, '''''vet schuingedrukt''''' met vijf.
+	* Je maakt punten met een tab en een sterretje *.
+	* Als je Windows gebruikt, dan werkt je tab toets niet.  Dat is de
+schuld van Bill Gates.  Maar je kunt het kleine knopje indrukken, genaamd
+Vertaal Spaties Naar Tabs.  Je kunt een stel spaties tiepen die Wiki dan
+herkent als ware ze een tab.
+	* Om een gewoon, niet proportioneel font te krijgen, spring in met een
+spatie:
+
+ dit is een gedicht
+ niet over proportioneel
+ niks rijmt op gedicht
+ wat rijmt op niet proportioneel
 
- this is a poem 
- about monospacing
- nothing rhymes with poem
- nothing rhymes with monospacing
+	* Je kunt alinea's van elkaar scheiden met een lege regel.  Voorbeeld:
 
-	* You can seperate paragraphs with an extra blank line. Example:
+Ik ben een alinea.
 
-I am a paragraph.
+Ik ben ook een aline.  We zijn gewoon erg korte alinea's.
 
-I am a paragraph too. We're just very small paragraphs.
-
-
-	* You can get horizontal rules with four or more dashes like this:
+	* Je maakt een horizontale lijn met vier of meer streepjes zoals hier:
 ----
-	* 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.
+	* Om hyperkoppelingen te maken hoef je slechts de woorden met
+hoofdletters en aan elkaar te schrijven.  Laten we zeggen dat je een pagina
+wilt maken over die Jan Nieuwenhuizen eet wormen.  Het enige dat je hoeft
+te doen is elk woord met een hoofdletter beginen en ze aan elkaar schrijven:
+JanNieuwenhuizenEetWormen.  Als de pagina nog niet bestaat, verschijnt er een
+vraagteken achter de koppeling, die je uitnodigt om de pagina aan te maken:
+DezePaginaMagNietBestaan.  (Verpest dit voorbeeld nou alsjeblieft niet door
+er een aan te maken.)
+	* Om naar pagina's buiten de Wiki te koppelen, tiep je gewoon de URL
+in en Wiki maakt de koppelinig voor jou: http://www.volkskrant.nl/.
+	* Om plaatjes in te voegen, zet de koppeling gewoon tussen vierkante
+haken zoals hier: [http://www.jouwgastheer.jouwdomein/plaatjes/figuur.png].
+URLs naar plaatjes die niet tussen vierkante haken staan, verschijnen als
+een gewone koppeling naar het plaatje.
+	* Nu ben je klaar om te beginnen met PaginasToevoegen.
 
 ----
-A WikiWikiWeb is meant to be fast and easy to edit. It has very simple markup that you can read about in TextFormattingRules.
+Een WikiWikiWeb is bedoeld om snel en gemakkelijk te kunnen veranderen.  Het
+heeft een erg eenvoudige f...
 
[truncated message content]

Thread: Re: [Phpwiki-talk] Internationalization finally committed

phpwiki-talk