Menu
▾
▴
[phpwiki-checkins] CVS: phpwiki/lib/WikiDB/backend cvs.php,1.5,1.6
|
From: Carsten K. <car...@us...> - 2001-12-19 12:07:47
|
Update of /cvsroot/phpwiki/phpwiki/lib/WikiDB/backend
In directory usw-pr-cvs1:/tmp/cvs-serv30283/phpwiki/lib/WikiDB/backend
Modified Files:
cvs.php
Log Message:
sprintf fine-tuning for gettext
Index: cvs.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiDB/backend/cvs.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** cvs.php 2001/12/19 08:54:01 1.5
--- cvs.php 2001/12/19 12:07:43 1.6
***************
*** 180,184 ****
// check argument
if ( ! is_array( $newdata ) ) {
! trigger_error(_("update_pagedata: Argument 'newdata' was not array"),
E_USER_WARNING);
}
--- 180,184 ----
// check argument
if ( ! is_array( $newdata ) ) {
! trigger_error("update_pagedata: " . sprintf(_("Argument %s was not array"),"'newdata'"),
E_USER_WARNING);
}
***************
*** 188,192 ****
if ( ! $metaData ) {
! $this->_cvsDebug( _("update_pagedata: no meta data found") );
// this means that the page does not exist, we need to create
// it.
--- 188,192 ----
if ( ! $metaData ) {
! $this->_cvsDebug( "update_pagedata: " . _("no meta data found") );
// this means that the page does not exist, we need to create
// it.
***************
*** 241,245 ****
return $metaData[CMD_VERSION];
} else {
! $this->_cvsDebug( sprintf(_("get_latest_versioned FAILED for [%s]"),$pagename) );
return 0;
}
--- 241,245 ----
return $metaData[CMD_VERSION];
} else {
! $this->_cvsDebug( "get_latest_versioned " . sprintf(_("FAILED for [%s]"),$pagename) );
return 0;
}
***************
*** 258,262 ****
function get_versiondata($pagename, $version, $want_content = false)
{
! $this->_cvsDebug( sprintf(_("get_versiondata: [%s] [%s] [%s]"),$pagename,$version,$want_content) );
$filedata = "";
--- 258,262 ----
function get_versiondata($pagename, $version, $want_content = false)
{
! $this->_cvsDebug( "get_versiondata: [$pagename] [$version] [$want_content]" );
$filedata = "";
***************
*** 313,317 ****
function delete_page($pagename)
{
! $this->_cvsDebug( sprintf(_("delete_page [%s]"),$pagename) ;
$filename = $this->_docDir . "/" . $pagename;
$metaFile = $this->_docDir . "/CVS/_" . $pagename;
--- 313,317 ----
function delete_page($pagename)
{
! $this->_cvsDebug( "delete_page [$pagename]") ;
$filename = $this->_docDir . "/" . $pagename;
$metaFile = $this->_docDir . "/CVS/_" . $pagename;
***************
*** 335,339 ****
// TODO: revision somewhere in the middle of a revision tree, and
// TODO: this is basically not possible!
! trigger_error( _("delete_versiondata: Not Implemented"), E_USER_WARNING);
}
--- 335,339 ----
// TODO: revision somewhere in the middle of a revision tree, and
// TODO: this is basically not possible!
! trigger_error( "delete_versiondata: " . _("Not Implemented"), E_USER_WARNING);
}
***************
*** 345,349 ****
// TODO: file directly but i don't know of a way of doing it via
// TODO: the cvs tools).
! trigger_error( _("set_versiondata: Not Implemented"), E_USER_WARNING);
}
--- 345,349 ----
// TODO: file directly but i don't know of a way of doing it via
// TODO: the cvs tools).
! trigger_error( "set_versiondata: " . _("Not Implemented"), E_USER_WARNING);
}
***************
*** 351,355 ****
{
// TODO: same problem as set_versiondata
! trigger_error("set_versiondata: Not Implemented", E_USER_WARNING);
}
--- 351,355 ----
{
// TODO: same problem as set_versiondata
! trigger_error( "set_versiondata: " . _("Not Implemented"), E_USER_WARNING);
}
***************
*** 448,452 ****
{
// TODO: to be implemented
! trigger_error(_("lock: Not Implemented"), E_USER_WARNING);
}
--- 448,452 ----
{
// TODO: to be implemented
! trigger_error( "lock: " . _("Not Implemented"), E_USER_WARNING);
}
***************
*** 454,458 ****
{
// TODO: to be implemented
! trigger_error(_("unlock: Not Implemented"), E_USER_WARNING);
}
--- 454,458 ----
{
// TODO: to be implemented
! trigger_error( "unlock: " . _("Not Implemented"), E_USER_WARNING);
}
***************
*** 612,624 ****
$this->_cvsDebug( "CP: $cmdOutput" );
if ( isset( $revInfo[1] ) ) {
! $this->_cvsDebug( _("CP: got revision information") );
return $revInfo[1];
} else {
ereg( "\ninitial revision: 1[.]([0-9]+)", $cmdOutput, $revInfo );
if ( isset( $revInfo[1] ) ) {
! $this->_cvsDebug( _("CP: is initial release") );
return 1;
}
! $this->_cvsDebug( _("CP: returning old version") );
return $meta_data[CMD_VERSION];
}
--- 612,624 ----
$this->_cvsDebug( "CP: $cmdOutput" );
if ( isset( $revInfo[1] ) ) {
! $this->_cvsDebug( "CP: " . _("got revision information") );
return $revInfo[1];
} else {
ereg( "\ninitial revision: 1[.]([0-9]+)", $cmdOutput, $revInfo );
if ( isset( $revInfo[1] ) ) {
! $this->_cvsDebug( "CP: " . _("is initial release") );
return 1;
}
! $this->_cvsDebug( "CP: " . _("returning old version") );
return $meta_data[CMD_VERSION];
}
***************
*** 697,701 ****
return $rVal;
} else {
! $this->_cvsError(_("deleteFile: Unable to open file"),
__LINE__, $filename, EM_NOTICE_ERRORS );
return false;
--- 697,701 ----
return $rVal;
} else {
! $this->_cvsError( "deleteFile: " . _("Unable to open file"),
__LINE__, $filename, EM_NOTICE_ERRORS );
return false;
***************
*** 761,765 ****
exec( $cmdLine, $cmdOutput, $cmdReturnVal );
if ( $exitOnNonZero && ($cmdReturnVal != 0) ) {
! $this->_cvsDebug( sprintf(_("Command failed [%s], Output: ["),$cmdLine) .
join("\n",$cmdOutput) . "]" );
$this->_cvsError( sprintf(_("Command failed [%s], Return value: %s"),$cmdLine,$cmdReturnVal),
--- 761,765 ----
exec( $cmdLine, $cmdOutput, $cmdReturnVal );
if ( $exitOnNonZero && ($cmdReturnVal != 0) ) {
! $this->_cvsDebug( sprintf(_("Command failed [%s], Output:"),$cmdLine) ." [".
join("\n",$cmdOutput) . "]" );
$this->_cvsError( sprintf(_("Command failed [%s], Return value: %s"),$cmdLine,$cmdReturnVal),
***************
*** 815,819 ****
fclose($fd);
} else {
! $this->_cvsError( "Could not open file '$filename' for writing",
__LINE__ );
}
--- 815,819 ----
fclose($fd);
} else {
! $this->_cvsError( sprintf(_("Could not open file '%s' for writing"),$filename),
__LINE__ );
}
***************
*** 833,839 ****
if ( is_file( $src . "/" . $entry )
&& copy( $src . "/" . $entry, $dest . "/" . $entry ) ) {
! $this->_cvsDebug( sprintf(_("Copied to [%s/%s]"),$dest,$entry) );
} else {
! $this->_cvsDebug( sprintf(_("Failed to copy [%s/%s]"),$src,$entry) );
}
}
--- 833,839 ----
if ( is_file( $src . "/" . $entry )
&& copy( $src . "/" . $entry, $dest . "/" . $entry ) ) {
! $this->_cvsDebug( sprintf(_("Copied to [%s]"),"$dest/$entry") );
} else {
! $this->_cvsDebug( sprintf(_("Failed to copy [%s]"),"$src/$entry") );
}
}
|
