phpwiki-checkins

[Carsten K. <car...@us...>]

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

Modified Files:
	WikiDB.php 
Log Message:
Found more strings needing gettext _() and sprintf. Error strings containing function names now use sprintf. Some debugging strings intentionally left alone.

Index: WikiDB.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiDB.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** WikiDB.php	2001/10/29 17:58:37	1.2
--- WikiDB.php	2001/12/28 09:53:29	1.3
***************
*** 351,355 ****
          if ($latestversion && $version == $latestversion) {
              $backend->unlock();
!             trigger_error("Attempt to delete most recent revision of '$pagename'",
                            E_USER_ERROR);
              return;
--- 351,355 ----
          if ($latestversion && $version == $latestversion) {
              $backend->unlock();
!             trigger_error(sprintf(_("Attempt to delete most recent revision of '%s'"),$pagename),
                            E_USER_ERROR);
              return;
***************
*** 399,403 ****
          if ($latestversion && $version == $latestversion) {
              $backend->unlock();
!             trigger_error("Attempt to merge most recent revision of '$pagename'",
                            E_USER_ERROR);
              return;
--- 399,403 ----
          if ($latestversion && $version == $latestversion) {
              $backend->unlock();
!             trigger_error(sprintf(_("Attempt to merge most recent revision of '%s'"),$pagename),
                            E_USER_ERROR);
              return;
***************
*** 486,490 ****
              $pdata = $cache->get_versiondata($pagename, $latestversion);
              if ($data['mtime'] < $pdata['mtime']) {
!                 trigger_error("$pagename: Date of new revision non-monotonic",
                                E_USER_NOTICE);
                  $data['orig_mtime'] = $data['mtime'];
--- 486,490 ----
              $pdata = $cache->get_versiondata($pagename, $latestversion);
              if ($data['mtime'] < $pdata['mtime']) {
!                 trigger_error(sprintf(_("%s: Date of new revision is %s"),$pagename,"'non-monotonic'"),
                                E_USER_NOTICE);
                  $data['orig_mtime'] = $data['mtime'];
***************
*** 511,515 ****
          // to control when to optimize.
          if (time() % 50 == 0) {
!             trigger_error('"Optimizing" backend', E_USER_NOTICE);
              $backend->optimize();
          }
--- 511,515 ----
          // to control when to optimize.
          if (time() % 50 == 0) {
!             trigger_error(sprintf(_("Optimizing %s"),'backend'), E_USER_NOTICE);
              $backend->optimize();
          }
***************
*** 835,840 ****
          if (empty($data['%content'])) {
              // Replace empty content with default value.
!             return sprintf(gettext("Describe [%s] here."),
!                            $this->_pagename);
          }
  
--- 835,840 ----
          if (empty($data['%content'])) {
              // Replace empty content with default value.
!             return sprintf(_("Describe %s here."),
!                            "[". $this->_pagename ."]");
          }