Menu
▾
▴
[phpwiki-checkins] SF.net SVN: phpwiki:[10226] trunk/themes
|
From: <var...@us...> - 2021-01-05 09:56:42
|
Revision: 10226
http://sourceforge.net/p/phpwiki/code/10226
Author: vargenau
Date: 2021-01-05 09:56:40 +0000 (Tue, 05 Jan 2021)
Log Message:
-----------
Use "__" where appropriate
Modified Paths:
--------------
trunk/themes/Crao/templates/actionbar.tmpl
trunk/themes/Crao/templates/editpage.tmpl
trunk/themes/Crao/templates/navbar.tmpl
trunk/themes/MonoBook/templates/actionbar.tmpl
trunk/themes/MonoBook/templates/browse-footer.tmpl
trunk/themes/MonoBook/templates/info.tmpl
trunk/themes/MonoBook/templates/navbar.tmpl
trunk/themes/MonoBook/templates/signin.tmpl
trunk/themes/Portland/templates/actionbar.tmpl
trunk/themes/Portland/templates/editpage.tmpl
trunk/themes/Portland/templates/navbar.tmpl
trunk/themes/Sidebar/templates/actionbar.tmpl
trunk/themes/Sidebar/templates/navbar.tmpl
trunk/themes/Sidebar/templates/signin.tmpl
trunk/themes/Wordpress/templates/actionbar.tmpl
trunk/themes/Wordpress/templates/editpage.tmpl
trunk/themes/blog/templates/actionbar.tmpl
trunk/themes/blog/templates/info.tmpl
trunk/themes/blog/templates/navbar.tmpl
trunk/themes/blog/templates/sidebar.tmpl
trunk/themes/default/templates/actionbar.tmpl
trunk/themes/default/templates/blogform.tmpl
trunk/themes/default/templates/editpage.tmpl
trunk/themes/default/templates/navbar.tmpl
trunk/themes/fusionforge/templates/actionbar.tmpl
trunk/themes/shamino_com/templates/actionbar.tmpl
trunk/themes/shamino_com/templates/browse-footer.tmpl
trunk/themes/smaller/templates/actionbar.tmpl
trunk/themes/smaller/templates/info.tmpl
trunk/themes/smaller/templates/navbar.tmpl
trunk/themes/wikilens/templates/navbar.tmpl
Modified: trunk/themes/Crao/templates/actionbar.tmpl
===================================================================
--- trunk/themes/Crao/templates/actionbar.tmpl 2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/Crao/templates/actionbar.tmpl 2021-01-05 09:56:40 UTC (rev 10226)
@@ -17,13 +17,13 @@
<?php if ($user->isAdmin() or mayAccessPage('remove',$page->getName())) { ?>
<?php echo $SEP?><?php echo Button('remove') ?>
<?php } ?>
-<?php echo $SEP?><?php echo Button("PageHistory", _("PageHistory")) ?>
+<?php echo $SEP?><?php echo Button(__("PageHistory"), _("PageHistory")) ?>
<?php echo $SEP?><?php echo Button("diff") ?>
-<?php echo $SEP?><?php echo Button("PageInfo", _("PageInfo")) ?>
+<?php echo $SEP?><?php echo Button(__("PageInfo"), _("Page Info")) ?>
<?php if ((DEBUG and $request->getArg('action') == 'browse') || $user->isAdmin()) { ?>
<?php // Buttons really only for debugging ?>
-<?php echo $SEP?><?php echo Button("DebugBackendInfo", _("DebugBackendInfo")) ?>
-<?php echo $SEP?><?php echo Button("PageDump", _("PageDump")) ?>
+<?php echo $SEP?><?php echo Button(__("DebugBackendInfo"), _("DebugBackendInfo")) ?>
+<?php echo $SEP?><?php echo Button(__("PageDump"), _("Page Dump")) ?>
<?php $purgeb = Button(array('nocache' => 'purge'),
_("PurgeHtmlCache"), $page->getName());
$purgeb->addTooltip(_("Purge HTML cache for this page. Regenerate from WikiMarkup when next accessed."));
Modified: trunk/themes/Crao/templates/editpage.tmpl
===================================================================
--- trunk/themes/Crao/templates/editpage.tmpl 2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/Crao/templates/editpage.tmpl 2021-01-05 09:56:40 UTC (rev 10226)
@@ -56,7 +56,7 @@
<hr />
<div class="wiki-edithelp">
<?php // FIXME: do we need this at all? If so, it could probably be moved to TextFormattingRules ?>
-<p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p>
+<p><?php echo fmt("See %s tips for editing.", WikiLink(__("Help")."/".__("GoodStyle"))) ?></p>
<<IncludePage page=_("Help/TextFormattingRules") section=_("Synopsis") quiet=1>>
</div>
<?php echo $HIDDEN_INPUTS?>
Modified: trunk/themes/Crao/templates/navbar.tmpl
===================================================================
--- trunk/themes/Crao/templates/navbar.tmpl 2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/Crao/templates/navbar.tmpl 2021-01-05 09:56:40 UTC (rev 10226)
@@ -9,17 +9,17 @@
<div id="navbuttons">
<table class="fullwidth">
<tr class="middle"><td class="align-left">
-<?php echo WikiLink(_("RecentChanges"), "button") ?>
+<?php echo WikiLink(__("RecentChanges"), "button") ?>
<?php if (!empty($revision)) { ?>
-<?php echo $SEP?><?php echo Button("RelatedChanges", _("RelatedChanges")) ?>
-<?php echo $SEP?><?php echo Button(_("LikePages"), _("LikePages")) ?>
-<?php echo $SEP?><?php echo Button(_("BackLinks"), _("BackLinks")) ?>
+<?php echo $SEP?><?php echo Button(__("RelatedChanges"), _("RelatedChanges")) ?>
+<?php echo $SEP?><?php echo Button(__("LikePages"), _("LikePages")) ?>
+<?php echo $SEP?><?php echo Button(__("BackLinks"), _("BackLinks")) ?>
<?php } ?>
</td>
<td class="align-right; width:150px">
<div id="search">
<?php if (!empty($user) && $user->isSignedIn()) { ?>
- <?php echo WikiLink(_("UserPreferences"), 'button', _("Preferences")) ?>
+ <?php echo WikiLink(__("UserPreferences"), 'button', _("Preferences")) ?>
<?php echo $SEP?>
<?php } ?>
<?php if (!empty($user)) { ?>
@@ -35,10 +35,10 @@
<?php echo $SEP?>
<?php } ?>
<?php if (!empty($user) && $user->isAdmin()) { ?>
-<?php echo WikiLink(_("PhpWikiAdministration"), "button", _("Admin")) ?><?php echo $SEP?>
+<?php echo WikiLink(__("PhpWikiAdministration"), "button", _("Admin")) ?><?php echo $SEP?>
<?php } ?>
<?php } ?>
-<?php echo WikiLink(_("FindPage"), "button") ?><input type="text" id="livesearch" name="s" size="12"
+<?php echo WikiLink(__("FindPage"), "button", _("FindPage")) ?><input type="text" id="livesearch" name="s" size="12"
maxlength="256"
onfocus="if (this.value == '<?php echo _("Search")?>') {this.value = '';}"
onmouseout="window.status=''; return true;"
Modified: trunk/themes/MonoBook/templates/actionbar.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/actionbar.tmpl 2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/MonoBook/templates/actionbar.tmpl 2021-01-05 09:56:40 UTC (rev 10226)
@@ -25,7 +25,7 @@
<?php } else {
$talk = new WikiPageName($pagename); ?>
<?php echo ActionButton(array(),$isActionPage ? _("Action Page") : _("Article"), $talk->getParent(), array('title' => "View the page")) ?>
- <?php echo ActionButton(array(),_("Discussion"), $talk->getName(), array('class'=>$isBrowse ? "selected" : "")) ?>
+ <?php echo ActionButton(array(), _("Discussion"), $talk->getName(), array('class'=>$isBrowse ? "selected" : "")) ?>
<?php } ?>
<?php if (($isAdmin or mayAccessPage('edit', $pagename)) and $revision) { ?>
<?php echo ActionButton("edit", $dbh->isWikiPage($page->getName()) ? ($revision->isCurrent() ? _("Edit") : _("Edit Old Revision")) : _("Create Page"), false,
@@ -36,7 +36,7 @@
<?php if ($dbh->isWikiPage($page->getName())) { ?>
- <?php echo ActionButton(_("PageHistory"),_("History"),false,array('title'=>"Past versions of this page.")) ?>
+ <?php echo ActionButton(__("PageHistory"), _("History"), false, array('title'=>"Past versions of this page.")) ?>
<?php if (!empty($revision) and ($isAdmin or mayAccessPage('purge', $pagename))) { ?>
<?php echo ActionButton("purge") ?>
@@ -72,10 +72,10 @@
<?php echo ActionButton('remove') ?>
<?php } ?>
<?php } ?>
- <?php echo ActionButton(array('action'=>_("PageInfo")), _("Page info"), $pagename) ?>
- <?php echo ActionButton(array('action'=>_("AuthorHistory")), _("Author history"), $pagename) ?>
+ <?php echo ActionButton(array('action'=>__("PageInfo")), _("Page Info"), $pagename) ?>
+ <?php echo ActionButton(array('action'=>__("AuthorHistory")), _("Author history"), $pagename) ?>
<?php echo ActionButton("diff") ?>
- <?php echo ActionButton(array('action'=>_("PageDump")), _("Page dump"), $pagename) ?>
+ <?php echo ActionButton(array('action'=>__("PageDump")), _("Page Dump"), $pagename) ?>
<?php if (DEBUG and USECACHE) {
$PurgeCache = ActionButton(array('nocache' => 'purge'),
_("Purge HTML cache"), $pagename);
Modified: trunk/themes/MonoBook/templates/browse-footer.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/browse-footer.tmpl 2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/MonoBook/templates/browse-footer.tmpl 2021-01-05 09:56:40 UTC (rev 10226)
@@ -5,20 +5,20 @@
<ul id="f-list">
<li id="f-lastmod"> <?php echo $WikiTheme->getOwnerMessage($page) ?> <?php echo $WikiTheme->getLastModifiedMessage($revision) ?> <?php echo $WikiTheme->getAuthorMessage($revision) ?> </li>
<li id="f-copyright">All text is available under the terms of the <a class="internal" href="http://www.gnu.org/copyleft/fdl.html">GNU Free Documentation License</a> (see <b>
-<?php if ($request->_dbi->isWikiPage(_("Copyrights"))) { ?>
- <?php echo WikiLink(_("Copyrights")) ?>
+<?php if ($request->_dbi->isWikiPage(__("Copyrights"))) { ?>
+ <?php echo WikiLink(__("Copyrights")) ?>
<?php } else { ?>
<a class="internal" href="http://phpwiki.demo.free.fr/index.php/Copyrights">Copyrights</a>
<?php } ?>
</b> for details).<br /></li>
-<?php if ($request->_dbi->isWikiPage(_("About".WIKI_NAME))) { ?>
- <?php echo WikiLink(_("About".WIKI_NAME)) ?>
+<?php if ($request->_dbi->isWikiPage(__("About").WIKI_NAME)) { ?>
+ <?php echo WikiLink(_("About").WIKI_NAME) ?>
<?php } else { ?>
<li id="f-about"><a href="http://phpwiki.demo.free.fr/index.php/Help/PhpWiki">About PhpWiki</a></li>
<?php } ?>
<li id="f-disclaimer">
-<?php if ($request->_dbi->isWikiPage(_("GeneralDisclaimer"))) { ?>
- <?php echo WikiLink(_("GeneralDisclaimer")) ?>
+<?php if ($request->_dbi->isWikiPage(__("GeneralDisclaimer"))) { ?>
+ <?php echo WikiLink(__("GeneralDisclaimer")) ?>
<?php } else { ?>
<a href="http://phpwiki.demo.free.fr/index.php/GeneralDisclaimer">Disclaimer</a>
<?php } ?>
Modified: trunk/themes/MonoBook/templates/info.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/info.tmpl 2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/MonoBook/templates/info.tmpl 2021-01-05 09:56:40 UTC (rev 10226)
@@ -169,14 +169,14 @@
<div id="actionbuttons">
<?php echo Button("viewsource", _("View Source")) ?>
- <?php echo $SEP?><?php echo Button("PageHistory", _("PageHistory")) ?>
- <?php echo $SEP?><?php echo Button("AuthorHistory", _("AuthorHistory")) ?>
+ <?php echo $SEP?><?php echo Button(__("PageHistory"), _("PageHistory")) ?>
+ <?php echo $SEP?><?php echo Button(__("AuthorHistory"), _("AuthorHistory")) ?>
<?php echo $SEP?><?php echo Button("Diff") ?>
<?php echo $SEP?><?php echo Button(array('action'=>'diff','previous' => 'minor'),_("Diff previous Revision"),$page->getName()) ?>
<?php echo $SEP?><?php echo Button(array('action'=>'diff','previous' => 'author'),_("Diff previous Author"),$page->getName()) ?>
<?php if ((defined('DEBUG') && DEBUG) || $user->isAdmin()) { ?>
<?php // Buttons really only for debugging ?>
- <?php echo $SEP?><?php echo Button("DebugBackendInfo", _("DebugBackendInfo")) ?>
+ <?php echo $SEP?><?php echo Button(__("DebugBackendInfo"), _("DebugBackendInfo")) ?>
<?php
$PurgeCache = Button(array('nocache' => 'purge'),
_("PurgeHtmlCache"), $page->getName());
Modified: trunk/themes/MonoBook/templates/navbar.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/navbar.tmpl 2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/MonoBook/templates/navbar.tmpl 2021-01-05 09:56:40 UTC (rev 10226)
@@ -10,13 +10,13 @@
<h2><?php echo _("Navigation") ?></h2>
<div class="pBody">
<ul>
- <li><?php echo WikiLink(HOME_PAGE, "",_("Home Page")) ?></li>
- <li><?php $link = WikiLink(_("RecentChanges"), "",_("Recent changes")); $link->addTooltip(_("The list of recent changes in the wiki.")); ?><?php echo $link ?></li>
- <li><?php echo WikiLink(_("RecentComments"), "",_("Recent comments")) ?></li>
- <li><?php echo WikiLink(_("RecentNewPages"), "",_("Recent new pages")) ?></li>
- <li><?php echo Button(array('action'=>_("LikePages")),_("Like pages"), $page->getName()) ?></li>
- <li><?php echo WikiLink(_("RandomPage"), "",_("Random Page")) ?></li>
- <li><?php echo WikiLink(_("PhpWikiDocumentation"),"",_("Help")) ?></li>
+ <li><?php echo WikiLink(HOME_PAGE, "", _("Home Page")) ?></li>
+ <li><?php $link = WikiLink(__("RecentChanges"), "", _("Recent changes")); $link->addTooltip(_("The list of recent changes in the wiki.")); ?><?php echo $link ?></li>
+ <li><?php echo WikiLink(__("RecentComments"), "", _("Recent comments")) ?></li>
+ <li><?php echo WikiLink(__("RecentNewPages"), "", _("Recent new pages")) ?></li>
+ <li><?php echo Button(array('action'=>__("LikePages")),_("Like pages"), $page->getName()) ?></li>
+ <li><?php echo WikiLink(__("RandomPage"), "", _("Random Page")) ?></li>
+ <li><?php echo WikiLink(__("PhpWikiDocumentation"),"", _("Help")) ?></li>
</ul>
</div>
</div>
@@ -26,13 +26,13 @@
<h2><?php echo _("Search") ?></h2>
<div class="pBody">
<?php echo Template("search",
- array('SEARCH_BEFORE' => WikiLink(_("FindPage"), "",_("Find page")),
+ array('SEARCH_BEFORE' => WikiLink(__("FindPage"), "", _("Find page")),
'SEARCH_AFTER' => HTML::input(array('id' => 'searchGoButton',
'type'=>'submit',
'value'=>_("Go"))))) ?>
<!-- <form action="<?php echo WikiURL(_("TitleSearch"))?>"
method="get" accept-charset="UTF-8">
- <?php echo WikiLink(_("FindPage"), "searchButton",_("Search:")) ?>
+ <?php echo WikiLink(__("FindPage"), "searchButton", _("Search:")) ?>
<input type="hidden" name="auto_redirect" value="1" />
<input type="text" name="s" size="12" maxlength="256"
title='<?php echo _("Quick Search")?>'
@@ -49,16 +49,16 @@
<div class="pBody">
<ul>
<?php if ($revision) { ?>
- <li><?php echo Button(array('action'=>_("BackLinks")), _("What links here"), $page->getName()) ?></li>
+ <li><?php echo Button(array('action'=>__("BackLinks")), _("What links here"), $page->getName()) ?></li>
<?php } ?>
<?php $links = $page->getPageLinks(); if ($links->count() > 1) { ?>
- <li><?php echo $WikiTheme->makeLinkButton($revision,_("Related changes"),_("RelatedChanges")) ?></li>
+ <li><?php echo $WikiTheme->makeLinkButton($revision, _("Related changes"), __("RelatedChanges")) ?></li>
<?php } ?>
<?php if ($user->isAdmin()) { ?>
- <li><?php echo WikiLink(_("PhpWikiAdministration"), "", _("Administration")) ?></li>
+ <li><?php echo WikiLink(__("PhpWikiAdministration"), "", _("Administration")) ?></li>
<?php } ?>
<?php if ($user->isSignedIn()) { ?>
- <li><?php $link = WikiLink(_("UpLoad"),"",_("Upload File")); $link->addTooltip(_("Upload images or media files")); ?><?php echo $link ?></li>
+ <li><?php $link = WikiLink(__("UpLoad"), "", _("Upload File")); $link->addTooltip(_("Upload images or media files")); ?><?php echo $link ?></li>
<?php } ?>
<?php $PrintableLink = $WikiTheme->makeButton(_("Printable version"), "javascript:PrinterStylesheet();", 'wikiaction'); ?>
<script type="text/javascript"><!--
@@ -70,7 +70,7 @@
?>
<li><?php echo $btn ?></li>
<?php } ?>
- <li><?php echo WikiLink(_("AllPages"), "",_("All pages")) ?></li>
+ <li><?php echo WikiLink(__("AllPages"), "", _("All pages")) ?></li>
</ul>
</div>
</div>
Modified: trunk/themes/MonoBook/templates/signin.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/signin.tmpl 2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/MonoBook/templates/signin.tmpl 2021-01-05 09:56:40 UTC (rev 10226)
@@ -5,9 +5,9 @@
<ul>
<?php if ($user->isAuthenticated()) { ?>
<li id="pt-userpage"><?php echo WikiLink($id, 'auto') ?></li>
- <li><?php echo WikiLink($id . "/Discussion", 'auto' ,_("My Discussion")) ?></li>
- <li><?php echo WikiLink(_("UserPreferences"), "",_("My Preferences")) ?></li>
- <li><?php echo WikiLink(_("MyRecentChanges"), "",_("My Changes")) ?></li>
+ <li><?php echo WikiLink($id . "/Discussion", 'auto' , _("My Discussion")) ?></li>
+ <li><?php echo WikiLink(__("UserPreferences"), "", _("My Preferences")) ?></li>
+ <li><?php echo WikiLink(__("MyRecentChanges"), "", _("My Changes")) ?></li>
<li><?php echo HTML::a(array('href'=>'?'.urlencode('auth[logout]').'=1'),$sp,_("Logout"),$sp) ?></li>
<?php } else { ?>
<?php // Login or Register ?>
Modified: trunk/themes/Portland/templates/actionbar.tmpl
===================================================================
--- trunk/themes/Portland/templates/actionbar.tmpl 2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/Portland/templates/actionbar.tmpl 2021-01-05 09:56:40 UTC (rev 10226)
@@ -9,9 +9,9 @@
?>
<?php echo $EditB ?>
<a href="<?php echo WikiURL($revision,array('action'=>'diff'))?>"><?php echo $WikiTheme->getLastModifiedMessage($revision) ?></a>
- <?php echo $SEP?><?php echo Button("PageHistory", _("PageHistory")) ?>
- <?php echo $SEP?><?php echo Button("PageInfo", _("PageInfo")) ?>
+ <?php echo $SEP?><?php echo Button(__("PageHistory"), _("PageHistory")) ?>
+ <?php echo $SEP?><?php echo Button(__("PageInfo"), _("Page Info")) ?>
<?php if (defined('DEBUG') && DEBUG || $user->isAdmin()) { ?>
- <?php echo $SEP?><?php echo Button("DebugBackendInfo", _("DebugBackendInfo")) ?> <?php // For debugging only, really ?>
+ <?php echo $SEP?><?php echo Button(__("DebugBackendInfo"), _("DebugBackendInfo")) ?> <?php // For debugging only, really ?>
<?php } ?>
<br />
Modified: trunk/themes/Portland/templates/editpage.tmpl
===================================================================
--- trunk/themes/Portland/templates/editpage.tmpl 2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/Portland/templates/editpage.tmpl 2021-01-05 09:56:40 UTC (rev 10226)
@@ -26,7 +26,7 @@
<br />
<?php echo $MINOR_EDIT_CB ?>
<?php echo fmt("I'm just doing minor edits. Please divert the usual logging to %s instead.",
- WikiLink(_("RecentEdits"))) ?>
+ WikiLink(__("RecentEdits"))) ?>
<br />
<?php if (isset($PREVIEW_CONTENT)) { ?>
<hr />
@@ -37,7 +37,7 @@
<div class="wiki-edithelp">
<?php // FIXME: do we need this at all? If so, it could probably be moved to TextFormattingRules ?>
-<p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p>
+<p><?php echo fmt("See %s tips for editing.", WikiLink(__("Help")."/".__("GoodStyle"))) ?></p>
<<IncludePage page=_("Help/TextFormattingRules") section=_("Synopsis") quiet=1>>
</div>
<?php echo $HIDDEN_INPUTS?>
Modified: trunk/themes/Portland/templates/navbar.tmpl
===================================================================
--- trunk/themes/Portland/templates/navbar.tmpl 2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/Portland/templates/navbar.tmpl 2021-01-05 09:56:40 UTC (rev 10226)
@@ -1,12 +1,12 @@
<nav role="navigation" aria-label="<?php echo _("Main Menu") ?>">
<?php // The bottom navigation/search bar ?>
- <?php echo WikiLink(_("FindPage"), "button") ?> by searching
+ <?php echo WikiLink(__("FindPage"), "button") ?> by searching
<?php if ($revision) { ?>
- (or browse <?php echo Button(_("LikePages"), _("LikePages")) ?>)
+ (or browse <?php echo Button(__("LikePages"), _("LikePages")) ?>)
<?php } ?>
<?php if ($user->isAdmin()) { ?>
- <?php echo $SEP?><?php echo Button($page->get('locked') ? 'unlock' : 'lock')?>
+ <?php echo $SEP?><?php echo Button($page->get('locked') ? 'unlock' : 'lock') ?>
<?php echo $SEP?><?php echo Button('remove') ?>
<?php } ?>
<hr />
@@ -13,9 +13,9 @@
<table class="toolbar fullwidth" id="actionbar">
<tr class="baseline">
<td>
- <?php echo WikiLink(_("RecentChanges"), "button") ?>
+ <?php echo WikiLink(__("RecentChanges"), "button") ?>
<?php if ($user->isAdmin()) { ?>
- <?php echo $SEP?><?php echo WikiLink(_("PhpWikiAdministration"), "button") ?>
+ <?php echo $SEP?><?php echo WikiLink(__("PhpWikiAdministration"), "button") ?>
<?php } ?>
</td>
<td class="align-right">
Modified: trunk/themes/Sidebar/templates/actionbar.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/actionbar.tmpl 2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/Sidebar/templates/actionbar.tmpl 2021-01-05 09:56:40 UTC (rev 10226)
@@ -23,10 +23,10 @@
<?php } elseif ($page->exists()) { ?>
<?php echo ActionButton("viewsource", _("View Source")) ?>
<?php } ?>
- <?php echo ActionButton(_("PageHistory"),_("History"),false,array('title'=>_("Past versions of this page."))) ?>
+ <?php echo ActionButton(__("PageHistory"), _("History"), false, array('title'=>_("Past versions of this page."))) ?>
<?php echo ActionButton("diff") ?>
<?php if ($user->isSignedIn()) { ?>
- <?php echo ActionButton(_("WatchPage"), _("Watch"), false,
+ <?php echo ActionButton(__("WatchPage"), _("Watch"), false,
array('title'=>_("Add/Remove this to/from the list of pages you're monitoring for changes"))) ?>
<?php } ?>
</ul>
@@ -54,12 +54,12 @@
<?php echo ActionButton('setacl') ?>
<?php }} ?>
<?php echo ActionButton("viewsource", _("View Source")) ?>
- <?php echo ActionButton(array('action'=>'PageInfo'), _("PageInfo"), $pagename) ?>
- <?php echo ActionButton(_("AuthorHistory")) ?>
- <?php echo ActionButton(_("PageHistory")) ?>
+ <?php echo ActionButton(array('action'=>__('PageInfo')), _("Page Info"), $pagename) ?>
+ <?php echo ActionButton(__("AuthorHistory"), _("AuthorHistory")) ?>
+ <?php echo ActionButton(__("PageHistory"), _("PageHistory")) ?>
<?php echo ActionButton("diff") ?>
<?php if ($isAdmin) { ?>
- <?php echo ActionButton(_("PageDump")) ?>
+ <?php echo ActionButton(__("PageDump"), _("Page Dump")) ?>
<?php if (USECACHE) { ?>
<?php echo ActionButton(array('nocache' => 'purge'), _("PurgeHtmlCache"), $pagename,
array('title'=>_("Purge HTML cache for this page. Regenerate from WikiMarkup when next accessed."))) ?>
Modified: trunk/themes/Sidebar/templates/navbar.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/navbar.tmpl 2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/Sidebar/templates/navbar.tmpl 2021-01-05 09:56:40 UTC (rev 10226)
@@ -10,9 +10,9 @@
<div class="_pBody">
<ul>
<li><?php echo WikiLink(HOME_PAGE) ?></li>
- <li><?php echo WikiLink("Help:HowToUseWiki","auto","How to use this Wiki") ?></li>
- <li><?php echo WikiLink("Help:AddingPages","auto","Adding Pages") ?></li>
- <li><?php echo WikiLink("CategoryCategory","auto","List all Categories") ?></li>
+ <li><?php echo WikiLink("Help:HowToUseWiki", "auto", "How to use this Wiki") ?></li>
+ <li><?php echo WikiLink("Help:AddingPages", "auto", "Adding Pages") ?></li>
+ <li><?php echo WikiLink("CategoryCategory", "auto", "List all Categories") ?></li>
</ul>
</div>
</div>
@@ -23,8 +23,8 @@
<h2><?php echo _("Main Categories")?></h2>
<div class="pBody">
<ul>
- <li><?php echo WikiLink("CategoryWikiPlugin") ?></li>
- <li><?php echo WikiLink("CategoryActionPage") ?></li>
+ <li><?php echo WikiLink(__("CategoryWikiPlugin")) ?></li>
+ <li><?php echo WikiLink(__("CategoryActionPage")) ?></li>
</ul>
</div>
</div>
@@ -34,7 +34,7 @@
<h2><?php echo _("Search")?></h2>
<div class="pBody">
<?php echo Template("search",
- array('SEARCH_BEFORE' => ''/*HTML::h2(WikiLink(_("FindPage")))*/,
+ array('SEARCH_BEFORE' => ''/*HTML::h2(WikiLink(__("FindPage")))*/,
'SEARCH_AFTER' => HTML::raw('<br /><input type="submit" name="searchtype" value="title" class="searchButton" title="Press to perform a wiki title search" /> <input type="submit" name="searchtype" value="fulltext" class="searchButton" title="Wiki fulltext search" />'))) ?>
</div>
</div>
@@ -44,14 +44,14 @@
<h2><?php echo _("Toolbox") ?><?php echo $WikiTheme->folderArrow('p-tb', 'Open') ?></h2>
<div class="pBody" id="p-tb-body">
<ul>
- <li><?php $link = WikiLink(_("RecentChanges"), "",_("RecentChanges")); $link->addTooltip(_("The list of recent changes in the wiki.")); ?><?php echo $link ?> </li>
- <li><?php echo WikiLink(_("RecentNewPages")) ?></li>
+ <li><?php $link = WikiLink(__("RecentChanges"), "", _("Recent Changes")); $link->addTooltip(_("The list of recent changes in the wiki.")); ?><?php echo $link ?> </li>
+ <li><?php echo WikiLink(__("RecentNewPages")) ?></li>
<?php if (!empty($revision)) { ?>
- <li><?php echo Button(array('action'=>_("BackLinks")), _("What links here"), $page->getName()) ?></li>
+ <li><?php echo Button(array('action'=>__("BackLinks")), _("What links here"), $page->getName()) ?></li>
<?php } ?>
<?php if (!empty($user) && $user->isSignedIn()) { ?>
- <li><?php $link = WikiLink(_("UpLoad"),"",_("Upload File")); $link->addTooltip(_("Upload images or media files")); ?><?php echo $link ?></li>
- <li><?php echo WikiLink(_("UserPreferences"), "",_("Preferences")) ?></li>
+ <li><?php $link = WikiLink(__("UpLoad"), "", _("Upload File")); $link->addTooltip(_("Upload images or media files")); ?><?php echo $link ?></li>
+ <li><?php echo WikiLink(__("UserPreferences"), "", _("Preferences")) ?></li>
<?php } ?>
<?php $PrintableLink = $WikiTheme->makeButton(_("Printable version"), "javascript:PrinterStylesheet();", 'wikiaction'); ?>
<script type="text/javascript"><!--
@@ -61,11 +61,11 @@
// Do not display the pdf icon
$btn = new Button(_("Display as Pdf"), WikiURL($page->getName(), array('action' => 'pdf')), 'wikiaction');
?>
- <li><?php echo $btn ?> <?php echo WikiLink("Help:PDF","",HTML::img(array('src'=>$WikiTheme->_findData('images/mini_help.png'),'width'=>12,'height'=>13,'alt'=>'PDF help','title'=>'PDF help'))) ?></li>
+ <li><?php echo $btn ?> <?php echo WikiLink("Help:PDF", "", HTML::img(array('src'=>$WikiTheme->_findData('images/mini_help.png'),'width'=>12,'height'=>13,'alt'=>'PDF help','title'=>'PDF help'))) ?></li>
<?php } ?>
- <li><?php echo WikiLink(_("AllPages")) ?></li>
+ <li><?php echo WikiLink(__("AllPages"), "", _("All pages")) ?></li>
<?php if (!empty($user) && $user->isAdmin()) { ?>
- <li><?php echo WikiLink(_("PhpWikiAdministration"), "", _("Administration")) ?></li>
+ <li><?php echo WikiLink(__("PhpWikiAdministration"), "", _("Administration")) ?></li>
<?php } ?>
</ul>
</div>
Modified: trunk/themes/Sidebar/templates/signin.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/signin.tmpl 2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/Sidebar/templates/signin.tmpl 2021-01-05 09:56:40 UTC (rev 10226)
@@ -2,8 +2,8 @@
<div class="portlet" id="p-personal"><div class="pBody"><ul>
<?php if ($user->isAuthenticated()) {
$sp = HTML::raw(" "); $id = $user->getAuthenticatedId(); ?>
- <li id="pt-mypages"><?php echo WikiLink("RecentChangesMyPages", 'auto', HTML($sp,"MyPages",$sp)) ?></li>
- <li id="pt-mychanges"><?php echo WikiLink("MyRecentChanges", 'auto', HTML($sp,"MyChanges",$sp)) ?></li>
+ <li id="pt-mypages"><?php echo WikiLink(__("RecentChangesMyPages"), 'auto', HTML($sp,"MyPages",$sp)) ?></li>
+ <li id="pt-mychanges"><?php echo WikiLink(__("MyRecentChanges"), 'auto', HTML($sp,"MyChanges",$sp)) ?></li>
<li id="pt-userpage"><?php echo WikiLink($id, 'auto') ?></li>
<li id="pt-logout"><?php echo HTML::a(array('href'=>'?'.urlencode('auth[logout]').'=1'), $sp,_("Logout"),$sp) ?></li>
<?php } elseif (ALLOW_ANON_USER) {
Modified: trunk/themes/Wordpress/templates/actionbar.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/actionbar.tmpl 2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/Wordpress/templates/actionbar.tmpl 2021-01-05 09:56:40 UTC (rev 10226)
@@ -15,14 +15,14 @@
<li><a class="wikilink" href="<?php echo WikiURL(HOME_PAGE)?>"><?php echo WIKI_NAME ?></a>
<ul>
<li>
- <?php echo WikiLink(_("HomePage"), "button") ?>
+ <?php echo WikiLink(__("HomePage"), "button") ?>
</li>
<li>
- <?php echo WikiLink(_("RecentChanges"), "button") ?>
+ <?php echo WikiLink(__("RecentChanges"), "button") ?>
</li>
<?php if (!empty($user) && $user->isAdmin()) { ?>
<li>
- <?php echo $SEP?><?php echo WikiLink(_("PhpWikiAdministration"), "button") ?>
+ <?php echo $SEP?><?php echo WikiLink(__("PhpWikiAdministration"), "button") ?>
</li>
<?php } ?>
<?php if (!empty($user)) { ?>
@@ -54,7 +54,7 @@
<?php } ?>
<?php } ?>
<?php if ($user->isAdmin() or mayAccessPage('remove', $page->getName())) { ?>
- <li><?php echo $SEP?><?php echo Button('revert',_("Revert"), $revision->isCurrent() ? $page->GetRevisionBefore() : $revision) ?></li>
+ <li><?php echo $SEP?><?php echo Button('revert', _("Revert"), $revision->isCurrent() ? $page->GetRevisionBefore() : $revision) ?></li>
<li><?php echo $SEP?><?php echo Button('remove') ?></li>
<?php } ?>
</ul>
@@ -66,13 +66,13 @@
<?php echo $WikiTheme->getLastModifiedMessage($revision) ?></a>
</li>
<li>
- <?php echo $SEP?><?php echo Button("PageHistory", _("PageHistory")) ?><?php echo $SEP?>
+ <?php echo $SEP?><?php echo Button(__("PageHistory"), _("PageHistory")) ?><?php echo $SEP?>
</li>
- <li> <?php echo Button("PageInfo", _("PageInfo")) ?> </li>
+ <li> <?php echo Button(__("PageInfo"), _("Page Info")) ?> </li>
<?php if ((DEBUG and $request->getArg('action') == 'browse') || $user->isAdmin()) { ?>
<li>
- <?php echo $SEP?><?php echo Button("DebugBackendInfo", _("DebugBackendInfo")) ?> <?php // For debugging only, really ?>
- <?php echo $SEP?><?php echo Button("PageDump", _("PageDump")) ?>
+ <?php echo $SEP?><?php echo Button(__("DebugBackendInfo"), _("DebugBackendInfo")) ?> <?php // For debugging only, really ?>
+ <?php echo $SEP?><?php echo Button(__("PageDump"), _("Page Dump")) ?>
</li>
<?php } ?>
</ul>
@@ -87,7 +87,7 @@
</li>
<li>
<?php if ($revision) { ?>
- <?php echo Button(_("LikePages"), _("LikePages")) ?>
+ <?php echo Button(__("LikePages"), _("LikePages")) ?>
<?php } ?>
</li>
</ul>
Modified: trunk/themes/Wordpress/templates/editpage.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/editpage.tmpl 2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/Wordpress/templates/editpage.tmpl 2021-01-05 09:56:40 UTC (rev 10226)
@@ -39,7 +39,7 @@
<?php echo $MINOR_EDIT_CB ?>
<label for="edit-minor_edit">
<?php echo fmt("I'm just doing minor edits. Please divert the usual logging to %s instead.",
- WikiLink(_("RecentEdits"))) ?></label>
+ WikiLink(__("RecentEdits"))) ?></label>
<br />
<?php if ($user->isAdmin()) { ?>
<?php echo $SEP?><?php echo $LOCKED_CB ?> <label for="edit-locked"><?php echo _("Locked")?></label>
@@ -54,7 +54,7 @@
<div class="wiki-edithelp">
<?php // FIXME: do we need this at all? If so, it could probably be moved to TextFormattingRules ?>
-<p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p>
+<p><?php echo fmt("See %s tips for editing.", WikiLink(__("Help")."/".__("GoodStyle"))) ?></p>
<<IncludePage page=_("Help/TextFormattingRules") section=_("Synopsis") quiet=1>>
</div>
<?php echo $HIDDEN_INPUTS?>
Modified: trunk/themes/blog/templates/actionbar.tmpl
===================================================================
--- trunk/themes/blog/templates/actionbar.tmpl 2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/blog/templates/actionbar.tmpl 2021-01-05 09:56:40 UTC (rev 10226)
@@ -3,16 +3,16 @@
<td>
<div class="actionbuttons">
<?php echo WikiLink(HOME_PAGE, "known",_("Home")) ?>
- <?php echo $SEP?><?php echo WikiLink(_("About")) ?>
- <?php echo $SEP?><?php echo WikiLink(_("BlogArchives"),'',_("Archives")) ?>
- <?php echo $SEP?><?php echo WikiLink(_("PhotoAlbum")) ?>
- <?php echo $SEP?><?php echo WikiLink(_("HowTo")) ?>
- <?php echo $SEP?><?php echo WikiLink(_("RecentChanges")) ?>
- <?php echo $SEP?><?php echo Button("PageInfo", _("Info")) ?>
+ <?php echo $SEP?><?php echo WikiLink(__("About")) ?>
+ <?php echo $SEP?><?php echo WikiLink(__("BlogArchives"), '', _("Archives")) ?>
+ <?php echo $SEP?><?php echo WikiLink(__("PhotoAlbum")) ?>
+ <?php echo $SEP?><?php echo WikiLink(__("HowTo")) ?>
+ <?php echo $SEP?><?php echo WikiLink(__("RecentChanges")) ?>
+ <?php echo $SEP?><?php echo Button(__("PageInfo"), _("Info")) ?>
<?php
if ($user->isAuthenticated()) {
if (mayAccessPage('edit', $page->getName()))
- $EditB = Button("edit",_("Edit"),false,array('id'=>'btn-edit'));
+ $EditB = Button("edit", _("Edit"), false, array('id'=>'btn-edit'));
else
$EditB = Button("viewsource", _("View Source"));
?>
Modified: trunk/themes/blog/templates/info.tmpl
===================================================================
--- trunk/themes/blog/templates/info.tmpl 2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/blog/templates/info.tmpl 2021-01-05 09:56:40 UTC (rev 10226)
@@ -1,6 +1,6 @@
<?php echo Template("default/info") ?>
<div class="actionbuttons">
- <?php echo $SEP?><?php echo Button("AuthorHistory", _("AuthorHistory")) ?>
+ <?php echo $SEP?><?php echo Button(__("AuthorHistory"), _("AuthorHistory")) ?>
<?php echo $SEP?><?php echo Button("Diff") ?>
<?php echo $SEP?><?php echo Button(array('action'=>'diff','previous' => 'minor'),_("Diff previous Revision"),$page->getName()) ?>
<?php echo $SEP?><?php echo Button(array('action'=>'diff','previous' => 'author'),_("Diff previous Author"),$page->getName()) ?>
Modified: trunk/themes/blog/templates/navbar.tmpl
===================================================================
--- trunk/themes/blog/templates/navbar.tmpl 2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/blog/templates/navbar.tmpl 2021-01-05 09:56:40 UTC (rev 10226)
@@ -7,13 +7,13 @@
<div class="box-data">
<ul>
<?php if (!empty($revision)) { ?>
-<li><?php echo WikiLink(_("BackLinks"), "button",_("BackLinks")) ?></li>
+<li><?php echo WikiLink(__("BackLinks"), "button",_("BackLinks")) ?></li>
<?php } ?>
<?php if (!empty($user) && $user->isAdmin()) { ?>
-<li><?php echo WikiLink(_("PhpWikiAdministration"), "button", _("Admin")) ?></li>
+<li><?php echo WikiLink(__("PhpWikiAdministration"), "button", _("Admin")) ?></li>
<?php } ?>
<?php if (!empty($user) && $user->isSignedIn()) { ?>
-<li><?php echo WikiLink(_("UserPreferences"), "","Preferences") ?></li>
+<li><?php echo WikiLink(__("UserPreferences"), "", _("Preferences")) ?></li>
<?php } ?>
</ul>
<?php echo Template("blog/signin") ?>
Modified: trunk/themes/blog/templates/sidebar.tmpl
===================================================================
--- trunk/themes/blog/templates/sidebar.tmpl 2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/blog/templates/sidebar.tmpl 2021-01-05 09:56:40 UTC (rev 10226)
@@ -9,7 +9,7 @@
}
?>
<div class="box">
-<div class="box-title"><?php echo WikiLink($UserCalPageTitle,'known',_("Calendar")) ?></div>
+<div class="box-title"><?php echo WikiLink($UserCalPageTitle, 'known', _("Calendar")) ?></div>
<div class="box-data">
<?php echo Template('calendar') ?>
</div></div>
Modified: trunk/themes/default/templates/actionbar.tmpl
===================================================================
--- trunk/themes/default/templates/actionbar.tmpl 2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/default/templates/actionbar.tmpl 2021-01-05 09:56:40 UTC (rev 10226)
@@ -20,16 +20,16 @@
<?php echo $SEP?><?php echo Button('rename') ?>
<?php }} ?>
<?php if ($revision and ($user->isAdmin() or mayAccessPage('remove', $page->getName()))) { ?>
- <?php echo $SEP?><?php echo Button('revert',_("Revert"), $revision->isCurrent() ? $page->GetRevisionBefore() : $revision) ?>
+ <?php echo $SEP?><?php echo Button('revert', _("Revert"), $revision->isCurrent() ? $page->GetRevisionBefore() : $revision) ?>
<?php echo $SEP?><?php echo Button('remove') ?>
<?php } ?>
- <?php echo $SEP?><?php echo Button("PageHistory", _("PageHistory")) ?>
+ <?php echo $SEP?><?php echo Button(__("PageHistory"), _("PageHistory")) ?>
<?php echo $SEP?><?php echo Button("diff") ?>
- <?php echo $SEP?><?php echo Button("PageInfo", _("PageInfo")) ?>
+ <?php echo $SEP?><?php echo Button(__("PageInfo"), _("Page Info")) ?>
<?php if ((DEBUG and $request->getArg('action') == 'browse') || $user->isAdmin()) { ?>
<?php // Buttons really only for debugging ?>
- <?php echo $SEP?><?php echo Button("DebugBackendInfo", _("DebugBackendInfo")) ?>
- <?php echo $SEP?><?php echo Button("PageDump", _("PageDump")) ?>
+ <?php echo $SEP?><?php echo Button(__("DebugBackendInfo"), _("DebugBackendInfo")) ?>
+ <?php echo $SEP?><?php echo Button(__("PageDump"), _("Page Dump")) ?>
<?php
if (DEBUG & _DEBUG_SQL and USECACHE) {
$PurgeCache = Button(array('nocache' => 'purge'),
@@ -41,7 +41,7 @@
<?php // End debugging buttons ?>
<?php } ?>
<?php if (defined('USE_EXTERNAL_HTML2PDF') and USE_EXTERNAL_HTML2PDF) { ?>
- <?php echo $SEP?><?php echo Button("pdf","Pdf",'wikiclear',array('id'=>'btn-pdf')) ?>
+ <?php echo $SEP?><?php echo Button("pdf", "Pdf", 'wikiclear', array('id'=>'btn-pdf')) ?>
<?php } ?>
</div>
</td>
Modified: trunk/themes/default/templates/blogform.tmpl
===================================================================
--- trunk/themes/default/templates/blogform.tmpl 2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/default/templates/blogform.tmpl 2021-01-05 09:56:40 UTC (rev 10226)
@@ -21,7 +21,7 @@
<hr />
<div class="wiki-edithelp">
- <p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p>
+ <p><?php echo fmt("See %s tips for editing.", WikiLink(__("Help")."/".__("GoodStyle"))) ?></p>
<<IncludePage page=_("Help/TextFormattingRules") section=_("Synopsis") quiet=1>>
</div>
<?php echo $HIDDEN_INPUTS?>
Modified: trunk/themes/default/templates/editpage.tmpl
===================================================================
--- trunk/themes/default/templates/editpage.tmpl 2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/default/templates/editpage.tmpl 2021-01-05 09:56:40 UTC (rev 10226)
@@ -74,6 +74,6 @@
<hr />
<div class="wiki-edithelp">
<?php // FIXME: do we need this at all? If so, it could probably be moved to TextFormattingRules ?>
-<p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p>
+<p><?php echo fmt("See %s tips for editing.", WikiLink(__("Help")."/".__("GoodStyle"))) ?></p>
<<IncludePage page=_("Help/TextFormattingRules") section=_("Synopsis") quiet=1>>
</div>
Modified: trunk/themes/default/templates/navbar.tmpl
===================================================================
--- trunk/themes/default/templates/navbar.tmpl 2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/default/templates/navbar.tmpl 2021-01-05 09:56:40 UTC (rev 10226)
@@ -7,21 +7,21 @@
<?php echo $SEP?><?php echo WikiLink(new WikiPagename('Talk:'.$page->getName(), $page->getName()),
'button', _("Discussion")) ?>
<?php } else { ?>
- <?php echo $SEP?><?php echo Button(array(),_("Article"),$page->getName()) ?>
+ <?php echo $SEP?><?php echo Button(array(),_("Article"), $page->getName()) ?>
<?php } ?>
<?php echo $SEP?>
<?php } ?>
-<?php echo WikiLink(_("RecentChanges"), "button") ?>
+<?php echo WikiLink(__("RecentChanges"), "button") ?>
<?php echo $SEP?><?php echo Template('search',
array('SEARCH_BEFORE' => HTML::button(_("FindPage"))))
?>
<?php if (!empty($revision)) { ?>
-<?php echo $SEP?><?php echo $WikiTheme->makeLinkButton($revision,_("LikePages"), _("LikePages")) ?>
-<?php echo $SEP?><?php echo $WikiTheme->makeLinkButton($revision,_("BackLinks"), _("BackLinks")) ?>
+<?php echo $SEP?><?php echo $WikiTheme->makeLinkButton($revision,_("LikePages"), __("LikePages")) ?>
+<?php echo $SEP?><?php echo $WikiTheme->makeLinkButton($revision,_("BackLinks"), __("BackLinks")) ?>
<?php } ?>
<?php if (!empty($user) && $user->isSignedIn()) { ?>
<?php echo $SEP?>
-<?php echo WikiLink(_("UserPreferences"), 'button', _("Preferences")) ?>
+<?php echo WikiLink(__("UserPreferences"), 'button', _("Preferences")) ?>
<?php } ?>
<?php if (!empty($user)) { ?>
<?php
@@ -37,7 +37,7 @@
<?php } ?>
<?php } ?>
<?php if (!empty($user) && $user->isAdmin()) { ?>
-<?php echo $SEP?><?php echo WikiLink(_("PhpWikiAdministration"), "button", _("Admin")) ?>
+<?php echo $SEP?><?php echo WikiLink(__("PhpWikiAdministration"), "button", _("Admin")) ?>
<?php } ?></div>
<?php if (DEBUG & 2) {
if (isset($links)) {
Modified: trunk/themes/fusionforge/templates/actionbar.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/actionbar.tmpl 2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/fusionforge/templates/actionbar.tmpl 2021-01-05 09:56:40 UTC (rev 10226)
@@ -67,7 +67,7 @@
<li><?php echo Button(__("PageInfo"), _("Page Info")) ?></li>
- <li><?php echo Button(array('action'=>__("BackLinks")), _("Back Links"),$page->getName()) ?></li>
+ <li><?php echo Button(array('action'=>__("BackLinks")), _("Back Links"), $page->getName()) ?></li>
<?php if (defined('USE_EXTERNAL_HTML2PDF') and USE_EXTERNAL_HTML2PDF) { ?>
<?php if ($curuserprefs->get('pdfMenuItem')) { ?>
Modified: trunk/themes/shamino_com/templates/actionbar.tmpl
===================================================================
--- trunk/themes/shamino_com/templates/actionbar.tmpl 2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/shamino_com/templates/actionbar.tmpl 2021-01-05 09:56:40 UTC (rev 10226)
@@ -2,7 +2,7 @@
<?php
if (empty($revision)) $revision = $page->getCurrentRevision(false);
?>
-<?php echo Button(array('action'=>'PageInfo'),_("PageInfo"),$page->getName()) ?>
+<?php echo Button(array('action'=>__('PageInfo')), _("Page Info"),$page->getName()) ?>
<?php echo $SEP?><?php echo Button("edit", $revision->isCurrent() ? _("Edit") : _("Edit Old Revision")) ?>
<?php if ($user->isAdmin() or mayAccessPage('change',$page->getName())) { ?>
<?php echo $SEP?><?php echo Button($page->get('locked') ? 'unlock' : 'lock') ?>
@@ -15,11 +15,11 @@
<?php echo $SEP?><?php echo Button('remove') ?>
<?php } ?>
<?php if (!empty($user) && $user->isAdmin()) { ?>
- <?php echo $SEP?><?php echo WikiLink(_("PhpWikiAdministration"), "","Admin") ?>
+ <?php echo $SEP?><?php echo WikiLink(__("PhpWikiAdministration"), "", _("Admin")) ?>
<?php // Buttons really only for debugging. See info for more ?>
- <?php echo $SEP?><?php echo Button(_("PageHistory")) ?>
+ <?php echo $SEP?><?php echo Button(__("PageHistory"), _("PageHistory")) ?>
<?php echo $SEP?><?php echo Button("diff") ?>
- <?php echo $SEP?><?php echo Button(_("PageDump")) ?>
+ <?php echo $SEP?><?php echo Button(__("PageDump"), _("Page Dump")) ?>
<?php // End debugging buttons ?>
<?php } ?>
</nav>
Modified: trunk/themes/shamino_com/templates/browse-footer.tmpl
===================================================================
--- trunk/themes/shamino_com/templates/browse-footer.tmpl 2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/shamino_com/templates/browse-footer.tmpl 2021-01-05 09:56:40 UTC (rev 10226)
@@ -5,5 +5,5 @@
<?php } ?>
<span class="editdate"><?php echo $WikiTheme->getOwnerMessage($page) ?> <?php echo $WikiTheme->getLastModifiedMessage($revision) ?> <?php echo $WikiTheme->getAuthorMessage($revision) ?></span>
<br />
-<a href="<?php echo PHPWIKI_BASE_URL ?>"><?php echo WIKI_NAME?></a> created with <a href="http://phpwiki.demo.free.fr">PhpWiki</a> © 1998-2007 | <?php echo WikiLink(_("TermsOfUse")) ?>
+<a href="<?php echo PHPWIKI_BASE_URL ?>"><?php echo WIKI_NAME?></a> created with <a href="http://phpwiki.demo.free.fr">PhpWiki</a> © 1998-2007 | <?php echo WikiLink(__("TermsOfUse")) ?>
</div>
Modified: trunk/themes/smaller/templates/actionbar.tmpl
===================================================================
--- trunk/themes/smaller/templates/actionbar.tmpl 2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/smaller/templates/actionbar.tmpl 2021-01-05 09:56:40 UTC (rev 10226)
@@ -26,12 +26,12 @@
<?php } ?>
<?php echo $SEP?>
<?php } ?>
- <?php echo Button(array('action'=>'PageInfo'),_("Info"), $page->getName()) ?>
+ <?php echo Button(array('action'=>__('PageInfo')), _("Info"), $page->getName()) ?>
<?php if (((defined('DEBUG') and DEBUG and $request->getArg('action') == 'browse')) || $user->isAdmin()) { ?>
<?php // Buttons really only for debugging ?>
- <?php echo $SEP?><?php echo Button(_("PageHistory")) ?>
+ <?php echo $SEP?><?php echo Button(__("PageHistory"), _("PageHistory")) ?>
<?php echo $SEP?><?php echo Button("diff") ?>
- <?php echo $SEP?><?php echo Button(_("PageDump")) ?>
+ <?php echo $SEP?><?php echo Button(__("PageDump"), _("Page Dump")) ?>
<?php // End debugging buttons ?>
<?php } ?>
<?php if (defined('USE_EXTERNAL_HTML2PDF') and USE_EXTERNAL_HTML2PDF) { ?>
Modified: trunk/themes/smaller/templates/info.tmpl
===================================================================
--- trunk/themes/smaller/templates/info.tmpl 2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/smaller/templates/info.tmpl 2021-01-05 09:56:40 UTC (rev 10226)
@@ -2,15 +2,15 @@
<div id="actionbuttons">
<?php echo Button("viewsource", _("View Source")) ?>
- <?php echo $SEP?><?php echo Button("PageHistory", _("PageHistory")) ?>
- <?php echo $SEP?><?php echo Button("AuthorHistory", _("AuthorHistory")) ?>
+ <?php echo $SEP?><?php echo Button(__("PageHistory"), _("PageHistory")) ?>
+ <?php echo $SEP?><?php echo Button(__("AuthorHistory"), _("AuthorHistory")) ?>
<?php echo $SEP?><?php echo Button("Diff") ?>
<?php echo $SEP?><?php echo Button(array('action'=>'diff','previous' => 'minor'),_("Diff previous Revision"),$page->getName()) ?>
<?php echo $SEP?><?php echo Button(array('action'=>'diff','previous' => 'author'),_("Diff previous Author"),$page->getName()) ?>
- <?php echo $SEP?><?php echo Button("PageDump", _("PageDump")) ?>
+ <?php echo $SEP?><?php echo Button(__("PageDump"), _("Page Dump")) ?>
<?php if ((defined('DEBUG') && DEBUG) || $user->isAdmin()) { ?>
<?php // Buttons really only for debugging ?>
- <?php echo $SEP?><?php echo Button("DebugBackendInfo", _("DebugBackendInfo")) ?>
+ <?php echo $SEP?><?php echo Button(__("DebugBackendInfo"), _("DebugBackendInfo")) ?>
<?php
$PurgeCache = Button(array('nocache' => 'purge'),
_("PurgeHtmlCache"), $page->getName());
Modified: trunk/themes/smaller/templates/navbar.tmpl
===================================================================
--- trunk/themes/smaller/templates/navbar.tmpl 2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/smaller/templates/navbar.tmpl 2021-01-05 09:56:40 UTC (rev 10226)
@@ -3,8 +3,8 @@
<form action="<?php echo WikiURL(_("TitleSearch"))?>"
method="get" accept-charset="UTF-8">
<div id="navbuttons">
- <?php echo WikiLink(_("RecentChanges"), "","News") ?>
- <?php echo $SEP?><?php echo WikiLink(_("FindPage"), "","Search:") ?>
+ <?php echo WikiLink(__("RecentChanges"), "", _("News")) ?>
+ <?php echo $SEP?><?php echo WikiLink(__("FindPage"), "", _("Search")._(":")) ?>
<input type="hidden" name="auto_redirect" value="1" />
<input type="text" name="s" size="12" maxlength="256"
title='<?php echo _("Quick Search")?>'
@@ -11,14 +11,14 @@
onmouseover="window.status='<?php echo _("Quick Search")?>'; return true;"
onmouseout="window.status=''; return true;" />
<?php if (!empty($revision)) { ?>
- <?php echo $SEP?><?php echo Button(array('action'=>_("LikePages")),_("LikePages"),$page->getName()) ?>
- <?php echo $SEP?><?php echo Button(array('action'=>_("BackLinks")), _("BackLinks"),$page->getName()) ?>
+ <?php echo $SEP?><?php echo Button(array('action'=>__("LikePages")), _("LikePages"), $page->getName()) ?>
+ <?php echo $SEP?><?php echo Button(array('action'=>__("BackLinks")), _("BackLinks"), $page->getName()) ?>
<?php } ?>
<?php if (!empty($user) && $user->isAdmin()) { ?>
- <?php echo $SEP?><?php echo WikiLink(_("PhpWikiAdministration"), "","Admin") ?>
+ <?php echo $SEP?><?php echo WikiLink(__("PhpWikiAdministration"), "", _("Admin")) ?>
<?php } ?>
<?php if (!empty($user) && $user->isSignedIn()) { ?>
- <?php echo $SEP?><?php echo WikiLink(_("UserPreferences"), "","Preferences") ?>
+ <?php echo $SEP?><?php echo WikiLink(__("UserPreferences"), "", _("Preferences")) ?>
<?php } ?>
</div>
</form>
Modified: trunk/themes/wikilens/templates/navbar.tmpl
===================================================================
--- trunk/themes/wikilens/templates/navbar.tmpl 2021-01-04 17:19:33 UTC (rev 10225)
+++ trunk/themes/wikilens/templates/navbar.tmpl 2021-01-05 09:56:40 UTC (rev 10226)
@@ -10,17 +10,17 @@
<?php echo $NSEP?><?php echo WikiLink(new WikiPagename('Talk:'.$page->getName(), $page->getName()),
'button', _("Discussion")) ?>
<?php } else { ?>
- <?php echo $NSEP?><?php echo Button(array(),_("Article"),$page->getName()) ?>
+ <?php echo $NSEP?><?php echo Button(array(), _("Article"), $page->getName()) ?>
<?php } ?>
<?php echo $NSEP?>
<?php } ?>
-<?php echo WikiLink(_("RecentChanges"), "button") ?>
+<?php echo WikiLink(__("RecentChanges"), "button") ?>
<?php echo $NSEP?><?php echo Template('search',
array('SEARCH_BEFORE' => HTML::button(_("FindPage"))))
?><?php if (!empty($revision)) { ?>
-<?php echo $NSEP?><?php echo $WikiTheme->makeLinkButton($revision,_("LikePages"),_("LikePages"))
-?><?php echo $NSEP?><?php echo $WikiTheme->makeLinkButton($revision,_("BackLinks"),_("BackLinks"))
-?><?php echo $NSEP?><?php echo WikiLink(_("UserPreferences"), 'button',_("Preferences")) ?><?php
+<?php echo $NSEP?><?php echo $WikiTheme->makeLinkButton($revision, _("LikePages"), __("LikePages"))
+?><?php echo $NSEP?><?php echo $WikiTheme->makeLinkButton($revision, _("BackLinks"), __("BackLinks"))
+?><?php echo $NSEP?><?php echo WikiLink(__("UserPreferences"), 'button', _("Preferences")) ?><?php
/* Today's calendar page for the user, if the Calender subpage is defined. */
$UserCalPageTitle = $user->getId() . '/' . _("Calendar");
$dbi = $request->getDbh();
@@ -29,7 +29,7 @@
//$UserCalPageTodayUrl = WikiURL($UserCalPageTodayTitle);
?><?php echo $NSEP?><?php echo WikiLink($UserCalPageTodayTitle, "button", _("Today")) ?>
<?php }} ?><?php if (!empty($user) && $user->isAdmin()) { ?>
-<?php echo $NSEP?><?php echo WikiLink(_("PhpWikiAdministration"), "button", _("Admin")) ?>
+<?php echo $NSEP?><?php echo WikiLink(__("PhpWikiAdministration"), "button", _("Admin")) ?>
<?php } ?>
<?php if (DEBUG & 2) {
if (isset($links)) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
