[phpwiki-checkins] CVS: phpwiki/lib ziplib.php,1.11,1.12

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

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

Modified Files:
	ziplib.php 
Log Message:
sprintf fine-tuning for gettext

Index: ziplib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/ziplib.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** ziplib.php	2001/12/12 05:12:46	1.11
--- ziplib.php	2001/12/19 12:08:04	1.12
***************
*** 582,585 ****
--- 582,586 ----
        $string = substr($string, strlen($match[0]));
      }
+     //" <--(kludge for dumb syntax coloring)
  
    return array($type, $subtype, $param);
***************
*** 642,646 ****
      if (!($headers = ParseRFC822Headers($data))
          || empty($headers['content-type'])) {
!         //trigger_error("Can't find content-type header", E_USER_WARNING);
          return false;
      }
--- 643,647 ----
      if (!($headers = ParseRFC822Headers($data))
          || empty($headers['content-type'])) {
!         //trigger_error( sprintf(_("Can't find %s"),'content-type header'), E_USER_WARNING);
          return false;
      }
***************
*** 648,653 ****
    
      if (!(list ($type, $subtype, $params) = ParseMimeContentType($typeheader))) {
!         trigger_error("Can't parse content-type: ("
!              . htmlspecialchars($typeheader) . ")", E_USER_WARNING);
          return false;
      }
--- 649,654 ----
    
      if (!(list ($type, $subtype, $params) = ParseMimeContentType($typeheader))) {
!         trigger_error( sprintf(_("Can't parse %s"),'content-type:')
!              . " (" . htmlspecialchars($typeheader) . ")", E_USER_WARNING);
          return false;
      }
***************
*** 656,660 ****
      }
      else if ("$type/$subtype" != 'application/x-phpwiki') {
!         trigger_error("Bad content-type: $type/$subtype", E_USER_WARNING);
          return false;
      }
--- 657,661 ----
      }
      else if ("$type/$subtype" != 'application/x-phpwiki') {
!         trigger_error( sprintf(_("Bad %s"),"content-type: $type/$subtype"), E_USER_WARNING);
          return false;
      }
***************
*** 701,705 ****
          $data = QuotedPrintableDecode($data);
      else if ($encoding && $encoding != 'binary')
!         ExitWiki("Unknown encoding type: $encoding");
  
      $data .= GenerateFootnotesFromRefs($params);
--- 702,706 ----
          $data = QuotedPrintableDecode($data);
      else if ($encoding && $encoding != 'binary')
!         ExitWiki( sprintf(_("Unknown %s"), 'encoding type: $encoding') );
  
      $data .= GenerateFootnotesFromRefs($params);