[phpwiki-checkins] CVS: phpwiki/lib main.php,1.21,1.22

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

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

Modified Files:
	main.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: main.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/main.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** main.php	2001/12/16 18:33:25	1.21
--- main.php	2001/12/28 09:53:15	1.22
***************
*** 24,28 ****
          return urldecode($query_string);
      
!     return gettext("HomePage");
  }
  
--- 24,28 ----
          return urldecode($query_string);
      
!     return _("HomePage");
  }
  
***************
*** 83,89 ****
      $dbi = WikiDB::open($GLOBALS['DBParams']);
      
!     if ( $action == 'browse' && $request->getArg('pagename') == gettext("HomePage") ) {
          // if there is no HomePage, create a basic set of Wiki pages
!         if ( ! $dbi->isWikiPage(gettext("HomePage")) ) {
              include_once("lib/loadsave.php");
              SetupWiki($dbi);
--- 83,89 ----
      $dbi = WikiDB::open($GLOBALS['DBParams']);
      
!     if ( $action == 'browse' && $request->getArg('pagename') == _("HomePage") ) {
          // if there is no HomePage, create a basic set of Wiki pages
!         if ( ! $dbi->isWikiPage(_("HomePage")) ) {
              include_once("lib/loadsave.php");
              SetupWiki($dbi);
***************
*** 97,101 ****
  
      if (isset($DisabledActions) && in_array($action, $DisabledActions))
!         ExitWiki(sprintf(gettext("Action %s is disabled in this wiki."), $action));
     
      // Enable the output of most of the warning messages.
--- 97,101 ----
  
      if (isset($DisabledActions) && in_array($action, $DisabledActions))
!         ExitWiki(sprintf(_("Action %s is disabled in this wiki."), $action));
     
      // Enable the output of most of the warning messages.
***************
*** 183,187 ****
      case 'lock':
      case 'unlock':
!         $user->must_be_admin("lock or unlock pages");
          $page = $dbi->getPage($request->getArg('pagename'));
          $page->set('locked', $action == 'lock');
--- 183,187 ----
      case 'lock':
      case 'unlock':
!         $user->must_be_admin(_("lock or unlock pages"));
          $page = $dbi->getPage($request->getArg('pagename'));
          $page->set('locked', $action == 'lock');
***************
*** 217,221 ****
  
      default:
!         echo QElement('p', sprintf("Bad action: '%s'", urlencode($action)));
          break;
      }
--- 217,221 ----
  
      default:
!         echo QElement('p', sprintf(_("Bad action: '%s'"), urlencode($action)));
          break;
      }