From 619b3dc7326a14f345568e06f70475c8d10226c0 Mon Sep 17 00:00:00 2001 From: wainstead Date: Fri, 6 Apr 2001 18:21:37 +0000 Subject: [PATCH] Did find-grep to replace all occurances of FrontPage to HomePage. git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@476 96ab9672-09ca-45d6-a79d-3d69d39ca109 --- HISTORY | 4 ++-- INSTALL.flatfile | 4 ++-- UPGRADING | 4 ++-- index.php | 8 ++++---- lib/config.php | 10 +++++----- lib/main.php | 8 ++++---- locale/README | 2 +- locale/de/LC_MESSAGES/phpwiki.mo | Bin 5764 -> 5763 bytes locale/de/LC_MESSAGES/phpwiki.php | 2 +- locale/de/pgsrc/PhpWikiAdministration | 2 +- locale/es/LC_MESSAGES/phpwiki.mo | Bin 6667 -> 6666 bytes locale/es/LC_MESSAGES/phpwiki.php | 2 +- locale/nl/LC_MESSAGES/phpwiki.mo | Bin 6272 -> 6271 bytes locale/nl/LC_MESSAGES/phpwiki.php | 2 +- locale/po/de.po | 2 +- locale/po/es.po | 2 +- locale/po/nl.po | 2 +- locale/po/phpwiki.pot | 2 +- locale/po/sv.po | 2 +- locale/sv/LC_MESSAGES/phpwiki.mo | Bin 6076 -> 6075 bytes locale/sv/LC_MESSAGES/phpwiki.php | 2 +- pgsrc/MagicPhpWikiURLs | 2 +- pgsrc/PhpWikiAdministration | 2 +- pgsrc/TestPage | 6 +++--- pgsrc/TextFormattingRules | 2 +- templates/README | 4 ++-- templates/browse.html | 2 +- templates/editpage.html | 2 +- templates/message.html | 2 +- 29 files changed, 41 insertions(+), 41 deletions(-) diff --git a/HISTORY b/HISTORY index 7969c0b52..3c9d2be23 100644 --- a/HISTORY +++ b/HISTORY @@ -96,7 +96,7 @@ Bug fixes: * Spanish version updated * More robust support for flat file based Wiki (INSTALL.flatfile included) -* "named internal links," i.e. [wow | FrontPage] +* "named internal links," i.e. [wow | HomePage] * New IF syntax added to templates * New PhpWikiAdministration page added * New term/defintion syntax (for
tags) @@ -300,7 +300,7 @@ reverse linking of page titles 0.05: 12/14/99: Added title searches, RecentChanges, fixed numerous bugs like only trying to render valid page names, the last-edited-date, removed -the navigation toolbars, linked the new logo to FrontPage, and a half +the navigation toolbars, linked the new logo to HomePage, and a half dozen other odd things. It's almost ready. 0.04: 12/12/99: Several additions to markup: diff --git a/INSTALL.flatfile b/INSTALL.flatfile index 9ca859509..8710c63bf 100644 --- a/INSTALL.flatfile +++ b/INSTALL.flatfile @@ -3,7 +3,7 @@ MySQL or Postgresql, and your system does not support DBM files or (worse) has a broken implementation like NDBM on Solaris, then a flat file Wiki should work for you. Note that as of 1.2 most of the Wiki functionality is there... the MostPopular is not implemented yet -so you will want to delete that link from the FrontPage (or better +so you will want to delete that link from the HomePage (or better yet, write it and mail us a patch ;-) Installation is similar to using a DBM file for storing the pages. @@ -129,4 +129,4 @@ phpwiki-talk list at phpwiki-talk@lists.sourceforge.net. Steve Wainstead swain@panix.com -$Id: INSTALL.flatfile,v 1.3 2001-03-03 19:43:14 wainstead Exp $ \ No newline at end of file +$Id: INSTALL.flatfile,v 1.4 2001-04-06 18:21:36 wainstead Exp $ \ No newline at end of file diff --git a/UPGRADING b/UPGRADING index 4742f4887..ccacc4bd8 100644 --- a/UPGRADING +++ b/UPGRADING @@ -37,7 +37,7 @@ or do something like: to blow away a mysql based wiki. Now with your web browser, go browse to -the FrontPage of your new wiki. It will detect +the HomePage of your new wiki. It will detect that it's working with a virgin database and will pull in the pages from the source specified in WIKI_PGSRC. @@ -45,4 +45,4 @@ specified in WIKI_PGSRC. Jeff -$Id: UPGRADING,v 1.1 2001-02-11 20:18:58 wainstead Exp $ \ No newline at end of file +$Id: UPGRADING,v 1.2 2001-04-06 18:21:36 wainstead Exp $ \ No newline at end of file diff --git a/index.php b/index.php index 1ab4a302d..31ae5d25b 100644 --- a/index.php +++ b/index.php @@ -23,7 +23,7 @@ define ('PHPWIKI_VERSION', '1.3.0pre'); require "lib/prepend.php"; -rcs_id('$Id: index.php,v 1.14 2001-03-11 17:51:54 wainstead Exp $'); +rcs_id('$Id: index.php,v 1.15 2001-04-06 18:21:36 wainstead Exp $'); ///////////////////////////////////////////////////////////////////// // @@ -238,8 +238,8 @@ define('INTERWIKI_MAP_FILE', "lib/interwiki.map"); /* * Define to 'true' to use PATH_INFO to pass the pagename's. - * e.g. http://www.some.where/index.php/FrontPage instead - * of http://www.some.where/index.php?pagename=FrontPage + * e.g. http://www.some.where/index.php/HomePage instead + * of http://www.some.where/index.php?pagename=HomePage * FIXME: more docs (maybe in README). */ //define('USE_PATH_INFO', false); @@ -253,7 +253,7 @@ define('INTERWIKI_MAP_FILE', "lib/interwiki.map"); * If you do this, you should set VIRTUAL_PATH here. * * E.g. your phpwiki might be installed at at /scripts/phpwiki/index.php, - * but * you've made it accessible through eg. /wiki/FrontPage. + * but * you've made it accessible through eg. /wiki/HomePage. * * One way to do this is to create a directory named 'wiki' in your * server root. The directory contains only one file: an .htaccess diff --git a/lib/config.php b/lib/config.php index 6baea3a98..c41e6fc83 100644 --- a/lib/config.php +++ b/lib/config.php @@ -1,5 +1,5 @@ is_authenticated()) // All requests require the database $dbi = OpenDataBase($WikiPageStore); -// if there is no FrontPage, create a basic set of Wiki pages -if ( ! IsWikiPage($dbi, gettext("FrontPage")) ) +// if there is no HomePage, create a basic set of Wiki pages +if ( ! IsWikiPage($dbi, gettext("HomePage")) ) { include_once("lib/loadsave.php"); SetupWiki($dbi); diff --git a/locale/README b/locale/README index cdc4729c4..1241e62a8 100644 --- a/locale/README +++ b/locale/README @@ -24,7 +24,7 @@ files. Do the following: Note: it is more important to translate the templates than to translate the pgsrc/ files. For the pgsrc/ files it is sufficient to change their -names to Islandic and maybe translate the FrontPage (or how it is +names to Islandic and maybe translate the HomePage (or how it is called in Islandic). Again, for anything you don't know, look at the `nl' or `de' versions. diff --git a/locale/de/LC_MESSAGES/phpwiki.mo b/locale/de/LC_MESSAGES/phpwiki.mo index c1cac0159da76a1aa8eeed6672cce24b0dc9269b..d48ff8a96878e0fc09542a62145b31a3b24099c4 100644 GIT binary patch delta 17 YcmZqCZPwjzl%2&RKR0#rDfV4_06YK&w*UYD delta 18 ZcmZqHZPDFul%3VBC_k@c^GWtyd;mj!2R8r! diff --git a/locale/de/LC_MESSAGES/phpwiki.php b/locale/de/LC_MESSAGES/phpwiki.php index 386785148..907cafed9 100644 --- a/locale/de/LC_MESSAGES/phpwiki.php +++ b/locale/de/LC_MESSAGES/phpwiki.php @@ -40,7 +40,7 @@ $locale["Versions are identical"] = "Versionen sind identisch"; $locale["Diff of %s."] = "Diff von %s."; -$locale["FrontPage"] = +$locale["HomePage"] = "StartSeite"; $locale["Describe %s here."] = "Beschreibe %s hier."; diff --git a/locale/de/pgsrc/PhpWikiAdministration b/locale/de/pgsrc/PhpWikiAdministration index 15459b397..112e56872 100644 --- a/locale/de/pgsrc/PhpWikiAdministration +++ b/locale/de/pgsrc/PhpWikiAdministration @@ -40,7 +40,7 @@ __Load__ If you have dumped a set of pages from PhpWiki, you can reload them here. Note that pages in your database will be overwritten; thus, if you dumped -your FrontPage when you load it from this form it will overwrite the one +your HomePage when you load it from this form it will overwrite the one in your database now. If you want to be selective just delete the pages from the directory you don't want to load. diff --git a/locale/es/LC_MESSAGES/phpwiki.mo b/locale/es/LC_MESSAGES/phpwiki.mo index 7d06872682229b7c1fa05b72b49fc56e027bdcc8..0d19575a8673506e291b9df7135a636060f39c4d 100644 GIT binary patch delta 17 YcmeA+=`z_+%)#Q3pPRb5f@88E060|!4FCWD delta 18 ZcmeA&={DI=%)#nbl%H3!xtwFNAOJs}28{p! diff --git a/locale/es/LC_MESSAGES/phpwiki.php b/locale/es/LC_MESSAGES/phpwiki.php index 39a674b6b..d807e77bd 100644 --- a/locale/es/LC_MESSAGES/phpwiki.php +++ b/locale/es/LC_MESSAGES/phpwiki.php @@ -48,7 +48,7 @@ $locale["Versions are identical"] = "Las versiones son idénticas"; $locale["Diff of %s."] = "Diferencia de %s."; -$locale["FrontPage"] = +$locale["HomePage"] = "PaginaPrincipal"; $locale["Describe %s here."] = "Describe %s aquí."; diff --git a/locale/nl/LC_MESSAGES/phpwiki.mo b/locale/nl/LC_MESSAGES/phpwiki.mo index 05cd8ad9983d8b6523f74ca4ce2ea1043b84fd44..bdde012cbd516c11d96fa3edc5d0e08e6630c53e 100644 GIT binary patch delta 17 YcmZoL{BN*9g@eT-KR0!=CP%mc063%tl>h($ delta 18 Zcmexw&|tVhg@e_tC_k@cvj#`F002P$1{DAR diff --git a/locale/nl/LC_MESSAGES/phpwiki.php b/locale/nl/LC_MESSAGES/phpwiki.php index 8d00ceb67..369bffa01 100644 --- a/locale/nl/LC_MESSAGES/phpwiki.php +++ b/locale/nl/LC_MESSAGES/phpwiki.php @@ -40,7 +40,7 @@ $locale["Versions are identical"] = "Versies zijn identiek"; $locale["Diff of %s."] = "Diff van %s."; -$locale["FrontPage"] = +$locale["HomePage"] = "VoorPagina"; $locale["Describe %s here."] = "Beschrijf %s hier."; diff --git a/locale/po/de.po b/locale/po/de.po index 3edc6634b..57b66c60f 100644 --- a/locale/po/de.po +++ b/locale/po/de.po @@ -120,7 +120,7 @@ msgid "Diff of %s." msgstr "Diff von %s." #: lib/display.php:12 -msgid "FrontPage" +msgid "HomePage" msgstr "StartSeite" #: lib/display.php:29 lib/editpage.php:50 diff --git a/locale/po/es.po b/locale/po/es.po index 9d61733d9..4c9dde878 100644 --- a/locale/po/es.po +++ b/locale/po/es.po @@ -155,7 +155,7 @@ msgstr "Diferencia de %s." # lib/display.php:14 #: lib/display.php:12 -msgid "FrontPage" +msgid "HomePage" msgstr "PaginaPrincipal" # lib/display.php:31 lib/editpage.php:50 diff --git a/locale/po/nl.po b/locale/po/nl.po index c6dd672c6..828594167 100644 --- a/locale/po/nl.po +++ b/locale/po/nl.po @@ -126,7 +126,7 @@ msgid "Diff of %s." msgstr "Diff van %s." #: lib/display.php:14 -msgid "FrontPage" +msgid "HomePage" msgstr "VoorPagina" #: lib/display.php:31 lib/editpage.php:50 diff --git a/locale/po/phpwiki.pot b/locale/po/phpwiki.pot index c91d9d545..9bb01e587 100644 --- a/locale/po/phpwiki.pot +++ b/locale/po/phpwiki.pot @@ -120,7 +120,7 @@ msgid "Diff of %s." msgstr "" #: lib/display.php:14 -msgid "FrontPage" +msgid "HomePage" msgstr "" #: lib/display.php:31 lib/editpage.php:50 diff --git a/locale/po/sv.po b/locale/po/sv.po index 2dc849be2..ce9bbbaaf 100644 --- a/locale/po/sv.po +++ b/locale/po/sv.po @@ -120,7 +120,7 @@ msgid "Diff of %s." msgstr "Diff av %s." #: lib/display.php:12 -msgid "FrontPage" +msgid "HomePage" msgstr "Framsida" #: lib/display.php:29 lib/editpage.php:50 diff --git a/locale/sv/LC_MESSAGES/phpwiki.mo b/locale/sv/LC_MESSAGES/phpwiki.mo index 6d17f850cf04d0c324bcb112dd0215d9ea43a54a..542309d901bb90691d734d4f4e121f4cb3524536 100644 GIT binary patch delta 17 Ycmdm^zgvGp9|wy^es1dK$sC&e06w_}F8}}l delta 18 Zcmdn3zej&V9|x;jQGQ;@=1Cly`~XIE2Co1B diff --git a/locale/sv/LC_MESSAGES/phpwiki.php b/locale/sv/LC_MESSAGES/phpwiki.php index da77c2b51..4a2944159 100644 --- a/locale/sv/LC_MESSAGES/phpwiki.php +++ b/locale/sv/LC_MESSAGES/phpwiki.php @@ -48,7 +48,7 @@ $locale["Versions are identical"] = "Versionerna är identiska"; $locale["Diff of %s."] = "Diff av %s."; -$locale["FrontPage"] = +$locale["HomePage"] = "Framsida"; $locale["Describe %s here."] = "Beskriv %s här."; diff --git a/pgsrc/MagicPhpWikiURLs b/pgsrc/MagicPhpWikiURLs index ccf5be35d..b80f77f97 100644 --- a/pgsrc/MagicPhpWikiURLs +++ b/pgsrc/MagicPhpWikiURLs @@ -55,7 +55,7 @@ will generate a link which will take you directly to editing the SandBox, like s Other possibilites: * [ Diff the SandBox | phpwiki:SandBox?action=diff ], -* [ Lock the FrontPage | phpwiki:FrontPage?action=lock ], +* [ Lock the HomePage | phpwiki:HomePage?action=lock ], * [ Get a Full Zip Dump | phpwiki:?action=zip&include=all ], * [ Page titles containing 'wiki' | phpwiki:?action=search&searchterm=wiki ], diff --git a/pgsrc/PhpWikiAdministration b/pgsrc/PhpWikiAdministration index 6da555adc..a9ad62e75 100644 --- a/pgsrc/PhpWikiAdministration +++ b/pgsrc/PhpWikiAdministration @@ -54,7 +54,7 @@ Your server must have write permissions to the directory! If you have dumped a set of pages from PhpWiki, you can reload them here. Note that pages in your database will be overwritten; thus, if you dumped -your FrontPage when you load it from this form it will overwrite the one +your HomePage when you load it from this form it will overwrite the one in your database now. If you want to be selective just delete the pages from the directory (or zip file) which you don't want to load. diff --git a/pgsrc/TestPage b/pgsrc/TestPage index 499c50429..7d9a5e1f2 100644 --- a/pgsrc/TestPage +++ b/pgsrc/TestPage @@ -66,11 +66,11 @@ this is a plain paragraph again # number ---- __Link tests__ -# normal: FrontPage -# in brackets: [FrontPage] -- named: [the front page|FrontPage] +# normal: HomePage +# in brackets: [HomePage] -- named: [the front page|HomePage] # Link in brackets: [http://phpwiki.sourceforge.net/] # Link outside brackets: http://phpwiki.sourceforge.net/ -# Link with Wiki word: http://phpwiki.sourceforge.net/phpwiki/index.php?FrontPage +# Link with Wiki word: http://phpwiki.sourceforge.net/phpwiki/index.php?HomePage # Two consecutive links: http://phpwiki.sourceforge.net/ http://phpwiki.sourceforge.net/phpwiki/ # [PhpWiki on Sourceforge | http://phpwiki.sourceforge.net/] # [URL with a WikiWord | http://phpwiki.sourceforge.net/phpwiki/index.php?RecentChanges] diff --git a/pgsrc/TextFormattingRules b/pgsrc/TextFormattingRules index be88a332f..be6bdd700 100644 --- a/pgsrc/TextFormattingRules +++ b/pgsrc/TextFormattingRules @@ -50,7 +50,7 @@ will not work'' ! References * Hyperlinks to other pages within the Wiki are made by placing the page name in square brackets: [this is a page link] or UsingWikiWords (preferred) * Hyperlinks to external pages are done like this: [http://www.wcsb.org/] -* You can name the links by providing a name, a bar (|) and then the hyperlink or pagename: [PhpWiki home page | http://phpwiki.sourceforge.net/] - [the front page | FrontPage] +* You can name the links by providing a name, a bar (|) and then the hyperlink or pagename: [PhpWiki home page | http://phpwiki.sourceforge.net/] - [the front page | HomePage] * You can suppress linking to old-style references and URIs by preceding the word with a '!', e.g. !NotLinkedAsWikiName, !http://not.linked.to/ * You can create footnotes by using [[1], [[2], [[3], ... like this here [1]. See footnote for counterpart. (If the [[ is in the first column, it is a footnote ''definition'' rather than a footnote ''reference'' [1].) * Also, the old way of linking URL's is still supported: precede URLs with "http:", "ftp:" or "mailto:" to create links automatically as in: http://c2.com/ diff --git a/templates/README b/templates/README index 77cd32809..f1203f737 100644 --- a/templates/README +++ b/templates/README @@ -1,4 +1,4 @@ -$Id: README,v 1.5 2001-03-02 00:42:50 wainstead Exp $ +$Id: README,v 1.6 2001-04-06 18:21:37 wainstead Exp $ PhpWiki distinguishes between three different templates: @@ -131,7 +131,7 @@ The following placeholders are not available for the 'MESSAGE' template: Examples: -the entry (default) page +the entry (default) page the current page the FindPage page PhpWiki Page: ###PAGE### diff --git a/templates/browse.html b/templates/browse.html index af04e185a..c503907c4 100644 --- a/templates/browse.html +++ b/templates/browse.html @@ -11,7 +11,7 @@ -

[phpwiki] +

[phpwiki] ###PAGE###

diff --git a/templates/editpage.html b/templates/editpage.html index c5d39f0a6..acff77d52 100644 --- a/templates/editpage.html +++ b/templates/editpage.html @@ -13,7 +13,7 @@
-

[phpwiki] +

[phpwiki] Edit ###PAGE###

diff --git a/templates/message.html b/templates/message.html index ae1629b88..420718be1 100644 --- a/templates/message.html +++ b/templates/message.html @@ -12,7 +12,7 @@ -

[phpwiki] +

[phpwiki] ###PAGE###

###CONTENT### -- 2.45.0