CVS: phpwiki/lib CachedMarkup.php,1.27,1.28 WikiDB.php,1.118,1.119 config.php,1.125,1.126 loadsave.php,1.133,1.134

Update of /cvsroot/phpwiki/phpwiki/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16276

Modified Files:
        CachedMarkup.php WikiDB.php config.php loadsave.php 
Log Message:
gettext msg unification

Index: CachedMarkup.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/CachedMarkup.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -2 -b -p -d -r1.27 -r1.28
--- CachedMarkup.php    17 Dec 2004 16:12:09 -0000      1.27
+++ CachedMarkup.php    20 Dec 2004 16:05:00 -0000      1.28
@@ -57,5 +57,6 @@ class CacheableMarkup extends XmlContent
             return unserialize($packed);
         }
-        trigger_error("Can't unpack bad cached markup. Probably php_zlib 
extension not loaded.", E_USER_WARNING);
+        trigger_error("Can't unpack bad cached markup. Probably php_zlib 
extension not loaded.", 
+                      E_USER_WARNING);
         return false;
     }

Index: WikiDB.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiDB.php,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -2 -b -p -d -r1.118 -r1.119
--- WikiDB.php  13 Dec 2004 13:22:57 -0000      1.118
+++ WikiDB.php  20 Dec 2004 16:05:00 -0000      1.119
@@ -1034,5 +1034,5 @@ class WikiDB_Page 
             $difflink = WikiURL($this->_pagename,array(),true);
             $content = $this->_pagename . " " . $version . " " .  
Iso8601DateTime($meta['mtime']) . "\n";
-            $content .= _("New Page");
+            $content .= _("New page");
         }
         $editedby = sprintf(_("Edited by: %s"), $meta['author']);
@@ -2145,4 +2145,7 @@ function _sql_debuglog_shutdown_function
 
 // $Log$
+// Revision 1.119  2004/12/20 16:05:00  rurban
+// gettext msg unification
+//
 // Revision 1.118  2004/12/13 13:22:57  rurban
 // new BlogArchives plugin for the new blog theme. enable default box method

Index: config.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/config.php,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -2 -b -p -d -r1.125 -r1.126
--- config.php  21 Nov 2004 11:59:18 -0000      1.125
+++ config.php  20 Dec 2004 16:05:00 -0000      1.126
@@ -260,5 +260,6 @@ function pcre_fix_posix_classes ($regexp
         $charset = 'utf-8';
     if (in_array($GLOBALS['LANG'],array('ja')))
-        $charset = 'EUC-JP';
+        $charset = 'utf-8';
+        //$charset = 'euc-jp';
     if (strtolower($charset) == 'utf-8') { // thanks to John McPherson
         // until posix class names/pcre work with utf-8
@@ -411,4 +412,7 @@ function getUploadDataPath() {
 
 // $Log$
+// Revision 1.126  2004/12/20 16:05:00  rurban
+// gettext msg unification
+//
 // Revision 1.125  2004/11/21 11:59:18  rurban
 // remove final \n to be ob_cache independent

Index: loadsave.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/loadsave.php,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -2 -b -p -d -r1.133 -r1.134
--- loadsave.php        8 Dec 2004 12:57:41 -0000       1.133
+++ loadsave.php        20 Dec 2004 16:05:01 -0000      1.134
@@ -98,9 +98,9 @@ function EndLoadDump(&$request)
                  $editedby."\n\n".
                  $content))
-            trigger_error(sprintf(_("PageChange Notification sent to %s"),
-                                  join(',',$all_users)), E_USER_NOTICE);
+            trigger_error(sprintf(_("PageChange Notification of %s sent to 
%s"),
+                                  join("\n",$pages), join(',',$all_users)), 
E_USER_NOTICE);
         else
-            trigger_error(sprintf(_("PageChange Notification Error: Couldn't 
send to %s"),
-                                  join(',',$all_users)), E_USER_WARNING);
+            trigger_error(sprintf(_("PageChange Notification Error: Couldn't 
send %s to %s"),
+                                  join("\n",$pages), join(',',$all_users)), 
E_USER_WARNING);
         unset($pages);
         unset($all_emails);
@@ -723,5 +723,5 @@ function SavePage (&$request, &$pageinfo
     }
     if ($current->getVersion() == 0) {
-        $mesg->pushContent(' - ', _("new page"));
+        $mesg->pushContent(' - ', _("New page"));
         $isnew = true;
     }
@@ -1256,4 +1256,7 @@ function LoadPostFile (&$request)
 /**
  $Log$
+ Revision 1.134  2004/12/20 16:05:01  rurban
+ gettext msg unification
+
  Revision 1.133  2004/12/08 12:57:41  rurban
  page-specific timeouts for long multi-page requests



-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now. 
http://productguide.itmanagersjournal.com/