Thread: [phpwiki-checkins] CVS: phpwiki/lib loadsave.php,1.5,1.6 stdlib.php,1.38,1.39 userauth.php,1.5,1.6

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv8408/lib
Modified Files:
	loadsave.php stdlib.php userauth.php 
Log Message:
Gettext()ification of more strings, by Jan Nieuwenhuizen <ja...@gn...>
(with a few fixes by me.)
Index: loadsave.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/loadsave.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** loadsave.php	2001年04月07日 00:34:30	1.5
--- loadsave.php	2001年05月31日 17:43:05	1.6
***************
*** 13,18 ****
 {
 // FIXME: This is a hack
! echo Element('p', QElement('b', gettext("Complete.")));
! echo Element('p', "Return to " . LinkExistingWikiWord($GLOBALS['pagename']));
 echo "</body></html>\n";
 }
--- 13,18 ----
 {
 // FIXME: This is a hack
! echo Element('p', QElement('b', gettext ("Complete.")));
! echo Element('p', gettext ("Return to ") . LinkExistingWikiWord($GLOBALS['pagename']));
 echo "</body></html>\n";
 }
***************
*** 260,268 ****
 usort($parts, 'SortByPageVersion');
 for (reset($parts); $page = current($parts); next($parts))
! 	 SavePage($dbi, $page, $defaults, "MIME file $filename", $basename);
 }
 else if ( ($page = ParseSerializedPage($text)) )
 {
! SavePage($dbi, $page, $defaults, "Serialized file $filename", $basename);
 }
 else
--- 260,270 ----
 usort($parts, 'SortByPageVersion');
 for (reset($parts); $page = current($parts); next($parts))
! 	 SavePage($dbi, $page, $defaults, 
! 	 	 gettext ("MIME file") . " $filename", $basename);
 }
 else if ( ($page = ParseSerializedPage($text)) )
 {
! SavePage($dbi, $page, $defaults, 
! gettext ("Serialized file") . " $filename", $basename);
 }
 else
***************
*** 270,274 ****
 // Assume plain text file.
 $page['content'] = preg_split('/[ \t\r]*\n/', chop($text));
! SavePage($dbi, $page, $defaults, "plain file $filename", $basename);
 }
 }
--- 272,277 ----
 // Assume plain text file.
 $page['content'] = preg_split('/[ \t\r]*\n/', chop($text));
! SavePage($dbi, $page, $defaults, 
! gettext ("plain file") . " $filename", $basename);
 }
 }
***************
*** 284,288 ****
 	 || ($exclude && in_array($fn, $exclude)) )
 {
! 	 print Element('dt', LinkExistingWikiWord($fn)) . QElement('dd', 'Skipping');
 	 continue;
 }
--- 287,292 ----
 	 || ($exclude && in_array($fn, $exclude)) )
 {
! 	 print Element('dt', LinkExistingWikiWord($fn))
! 	 . QElement('dd', gettext("Skipping"));
 	 continue;
 }
***************
*** 358,362 ****
 StartLoadDump("Loading '$source'");
 echo "<dl>\n";
! LoadAny($dbi, $source, false, array(gettext('RecentChanges')));
 echo "</dl>\n";
 EndLoadDump();
--- 362,366 ----
 StartLoadDump("Loading '$source'");
 echo "<dl>\n";
! LoadAny($dbi, $source, false, array(gettext("RecentChanges")));
 echo "</dl>\n";
 EndLoadDump();
***************
*** 368,377 ****
 
 //FIXME: This is a hack
! $user->userid = 'The PhpWiki programming team';
 
! StartLoadDump('Loading up virgin wiki');
 echo "<dl>\n";
 
! $ignore = array(gettext('RecentChanges'));
 
 LoadAny($dbi, FindLocalizedFile(WIKI_PGSRC), false, $ignore);
--- 372,381 ----
 
 //FIXME: This is a hack
! $user->userid = gettext("The PhpWiki programming team");
 
! StartLoadDump(gettext("Loading up virgin wiki"));
 echo "<dl>\n";
 
! $ignore = array(gettext("RecentChanges"));
 
 LoadAny($dbi, FindLocalizedFile(WIKI_PGSRC), false, $ignore);
***************
*** 404,408 ****
 
 if (IsZipFile($fd))
! LoadZip($dbi, $fd, false, array(gettext('RecentChanges')));
 else
 Loadfile($dbi, $name, fread($fd, MAX_UPLOAD_SIZE));
--- 408,412 ----
 
 if (IsZipFile($fd))
! LoadZip($dbi, $fd, false, array(gettext("RecentChanges")));
 else
 Loadfile($dbi, $name, fread($fd, MAX_UPLOAD_SIZE));
Index: stdlib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/stdlib.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -r1.38 -r1.39
*** stdlib.php	2001年04月07日 00:34:30	1.38
--- stdlib.php	2001年05月31日 17:43:05	1.39
***************
*** 643,647 ****
 // add the updated page's name to the array
 if($isnewpage) {
! $newpage[$k++] = "* [$pagename] (new) ..... $userid\r";
 } else {
 $diffurl = "phpwiki:" . rawurlencode($pagename) . "?action=diff";
--- 643,647 ----
 // add the updated page's name to the array
 if($isnewpage) {
! $newpage[$k++] = "* [$pagename] " . gettext("(new)") . " ..... $userid\r";
 } else {
 $diffurl = "phpwiki:" . rawurlencode($pagename) . "?action=diff";
Index: userauth.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/userauth.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** userauth.php	2001年03月14日 19:45:12	1.5
--- userauth.php	2001年05月31日 17:43:05	1.6
***************
*** 77,86 ****
 }
 
! function must_be_admin ($action = "do that") {
! if (! $this->is_admin())
! 	 ExitWiki("You must be logged in as an administrator to $action.");
 }
 
- 
 // This is a bit of a hack:
 function setPreferences ($prefs) {
--- 77,92 ----
 }
 
! function must_be_admin ($action = "") {
! if (! $this->is_admin()) 
! {
! 	 if ($action)
! 	 $to_what = sprintf(gettext("to perform action '%s'"), $action);
! 	 else
! 	 $to_what = gettext("to do that");
! 	 ExitWiki(gettext("You must be logged in as an administrator")
! 		 . " $to_what");
! }
 }
 
 // This is a bit of a hack:
 function setPreferences ($prefs) {
***************
*** 144,149 ****
 if (!defined('ADMIN_USER') || !defined('ADMIN_PASSWD')
 	 || ADMIN_USER == '' || ADMIN_PASSWD =='') {
! 	 return "<p><b>You must set the administrator account and password " .
! 	 "before you can log in.</b></p>\n";
 }
 
--- 150,157 ----
 if (!defined('ADMIN_USER') || !defined('ADMIN_PASSWD')
 	 || ADMIN_USER == '' || ADMIN_PASSWD =='') {
! 	 return
! 	 "<p><b>"
! 	 . gettext("You must set the administrator account and password before you can log in.")
! 	 . "</b></p>\n";
 }