Menu
▾
▴
[phpwiki-checkins] SF.net SVN: phpwiki:[8465] trunk
|
From: <var...@us...> - 2012-11-14 18:09:22
|
Revision: 8465
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8465&view=rev
Author: vargenau
Date: 2012-11-14 18:09:15 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
Use __ for translation
Modified Paths:
--------------
trunk/lib/PageType.php
trunk/lib/display.php
trunk/lib/loadsave.php
trunk/lib/main.php
trunk/lib/plugin/InterWikiSearch.php
trunk/lib/plugin/WantedPages.php
trunk/lib/plugin/WantedPagesOld.php
trunk/themes/fusionforge/templates/actionbar.tmpl
trunk/themes/fusionforge/templates/blogform.tmpl
trunk/themes/fusionforge/templates/navbar.tmpl
Modified: trunk/lib/PageType.php
===================================================================
--- trunk/lib/PageType.php 2012-11-14 17:52:31 UTC (rev 8464)
+++ trunk/lib/PageType.php 2012-11-14 18:09:15 UTC (rev 8465)
@@ -160,7 +160,7 @@
{
if (!$pagetext) {
$dbi = $GLOBALS['request']->getDbh();
- $page = $dbi->getPage(_("InterWikiMap"));
+ $page = $dbi->getPage(__("InterWikiMap"));
if ($page->get('locked')) {
$current = $page->getCurrentRevision();
$pagetext = $current->getPackedContent();
Modified: trunk/lib/display.php
===================================================================
--- trunk/lib/display.php 2012-11-14 17:52:31 UTC (rev 8464)
+++ trunk/lib/display.php 2012-11-14 18:09:15 UTC (rev 8465)
@@ -276,14 +276,14 @@
$first_pages .= $p . SUBPAGE_SEPARATOR;
}
$backlink = HTML::a(array('href' => WikiURL($pagename,
- array('action' => _("BackLinks"))),
+ array('action' => __("BackLinks"))),
'class' => 'backlinks'),
$WikiTheme->maybeSplitWikiWord($last_page));
$backlink->addTooltip(sprintf(_("BackLinks for %s"), $pagename));
$pageheader->pushContent($backlink);
} else {
$pageheader = HTML::a(array('href' => WikiURL($pagename,
- array('action' => _("BackLinks"))),
+ array('action' => __("BackLinks"))),
'class' => 'backlinks'),
$WikiTheme->maybeSplitWikiWord($pagename));
$pageheader->addTooltip(sprintf(_("BackLinks for %s"), $pagename));
Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php 2012-11-14 17:52:31 UTC (rev 8464)
+++ trunk/lib/loadsave.php 2012-11-14 18:09:15 UTC (rev 8465)
@@ -918,7 +918,7 @@
$pagename = $pagename_check->getName();
$content = $pageinfo['content'];
- if ($pagename == _("InterWikiMap"))
+ if ($pagename == __("InterWikiMap"))
$content = _tryinsertInterWikiMap($content);
$dbi =& $request->_dbi;
@@ -1554,7 +1554,7 @@
}
}
- $pagename = _("InterWikiMap");
+ $pagename = __("InterWikiMap");
$map = $dbi->getPage($pagename);
$map->set('locked', true);
PrintXML(HTML::p(HTML::em(WikiLink($pagename)), HTML::strong(" locked")));
Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php 2012-11-14 17:52:31 UTC (rev 8464)
+++ trunk/lib/main.php 2012-11-14 18:09:15 UTC (rev 8465)
@@ -1035,6 +1035,9 @@
static $cache;
if (!$action) return false;
+ if (isActionPage($action))
+ return $cache[$action] = $action;
+
// check for translated version, as per users preferred language
// (or system default in case it is not en)
$translation = gettext($action);
@@ -1095,7 +1098,7 @@
function adminActionSubpage($subpage)
{
- $page = _("PhpWikiAdministration") . "/" . $subpage;
+ $page = __("PhpWikiAdministration") . "/" . $subpage;
$action = $this->findActionPage($page);
if ($action) {
if (!$this->getArg('s'))
@@ -1117,27 +1120,27 @@
function action_chown()
{
- $this->adminActionSubpage(_("Chown"));
+ $this->adminActionSubpage(__("Chown"));
}
function action_setacl()
{
- $this->adminActionSubpage(_("SetAcl"));
+ $this->adminActionSubpage(__("SetAcl"));
}
function action_setaclsimple()
{
- $this->adminActionSubpage(_("SetAclSimple"));
+ $this->adminActionSubpage(__("SetAclSimple"));
}
function action_deleteacl()
{
- $this->adminActionSubpage(_("DeleteAcl"));
+ $this->adminActionSubpage(__("DeleteAcl"));
}
function action_rename()
{
- $this->adminActionSubpage(_("Rename"));
+ $this->adminActionSubpage(__("Rename"));
}
function action_dump()
Modified: trunk/lib/plugin/InterWikiSearch.php
===================================================================
--- trunk/lib/plugin/InterWikiSearch.php 2012-11-14 17:52:31 UTC (rev 8464)
+++ trunk/lib/plugin/InterWikiSearch.php 2012-11-14 18:09:15 UTC (rev 8465)
@@ -53,11 +53,11 @@
return $this->disabled("Sorry, this plugin is currently out of order.");
$page = $dbi->getPage($request->getArg('pagename'));
- return new TransformedText($page, _('InterWikiMap'), array('markup' => 2),
+ return new TransformedText($page, __('InterWikiMap'), array('markup' => 2),
'searchableInterWikiMap');
/*
return new PageType($pagerevisionhandle,
- $pagename = _('InterWikiMap'),
+ $pagename = __('InterWikiMap'),
$markup = 2,
$overridePageType = 'PageType_searchableInterWikiMap');
*/
Modified: trunk/lib/plugin/WantedPages.php
===================================================================
--- trunk/lib/plugin/WantedPages.php 2012-11-14 17:52:31 UTC (rev 8464)
+++ trunk/lib/plugin/WantedPages.php 2012-11-14 18:09:15 UTC (rev 8465)
@@ -53,7 +53,7 @@
array('page' => '[pagename]', // just for a single page.
'withlinks' => 0,
'noheader' => false,
- 'exclude_from' => _("PgsrcTranslation") . ',' . _("InterWikiMap"),
+ 'exclude_from' => __("PgsrcTranslation") . ',' . __("InterWikiMap"),
'limit' => '100',
'paging' => 'auto'));
}
@@ -143,8 +143,6 @@
}
}
-
-
// which links to the missing page
class _PageList_Column_WantedPages_wanted extends _PageList_Column
{
Modified: trunk/lib/plugin/WantedPagesOld.php
===================================================================
--- trunk/lib/plugin/WantedPagesOld.php 2012-11-14 17:52:31 UTC (rev 8464)
+++ trunk/lib/plugin/WantedPagesOld.php 2012-11-14 18:09:15 UTC (rev 8465)
@@ -74,7 +74,7 @@
$allpages_iter = $dbi->getAllPages($include_empty, $sortby, $limit);
while ($page_handle = $allpages_iter->next()) {
$name = $page_handle->getName();
- if ($name == _("InterWikiMap")) continue;
+ if ($name == __("InterWikiMap")) continue;
if (!in_array($name, $exclude))
$this->_iterateLinks($page_handle, $dbi);
}
@@ -215,8 +215,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/themes/fusionforge/templates/actionbar.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/actionbar.tmpl 2012-11-14 17:52:31 UTC (rev 8464)
+++ trunk/themes/fusionforge/templates/actionbar.tmpl 2012-11-14 18:09:15 UTC (rev 8465)
@@ -58,7 +58,7 @@
<?php if ($dbh->isWikiPage($page->getName())) { ?>
- <li><?php echo Button(_("PageHistory"), _("History")) ?></li>
+ <li><?php echo Button(__("PageHistory"), _("History")) ?></li>
<?php if ($curuserprefs->get('diffMenuItem')) { ?>
<li><?php echo Button("diff", _("Last Difference")) ?> </li>
@@ -68,9 +68,9 @@
<li><?php echo Button('revert',_("Revert"), $revision->isCurrent() ? $page->GetRevisionBefore() : $revision) ?></li>
<?php } ?>
- <li><?php echo Button(_("PageInfo"), _("Page Info")) ?></li>
+ <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')) { ?>
@@ -112,7 +112,7 @@
</ul>
<ul>
- <li><?php echo Button(_("WatchPage"), _("Watch Page")) ?></li>
+ <li><?php echo Button(__("WatchPage"), _("Watch Page")) ?></li>
</ul>
</div>
</menu>
Modified: trunk/themes/fusionforge/templates/blogform.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/blogform.tmpl 2012-11-14 17:52:31 UTC (rev 8464)
+++ trunk/themes/fusionforge/templates/blogform.tmpl 2012-11-14 18:09:15 UTC (rev 8465)
@@ -18,7 +18,7 @@
<hr noshade="noshade" />
<div id="newMarkup" class="wiki-edithelp">
- <?plugin IncludePage page=_("TextFormattingRules") section=_("Synopsis") quiet=1?>
+ <?plugin IncludePage page="TextFormattingRules" section="Synopsis" quiet=1?>
</div>
<?php echo $HIDDEN_INPUTS?>
</form>
Modified: trunk/themes/fusionforge/templates/navbar.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/navbar.tmpl 2012-11-14 17:52:31 UTC (rev 8464)
+++ trunk/themes/fusionforge/templates/navbar.tmpl 2012-11-14 18:09:15 UTC (rev 8465)
@@ -4,25 +4,25 @@
$username = $user->UserName();
?>
- <li class="submenu"><?php echo WikiLink(_("HomePage"), "", _("Home Page")) ?></li>
- <li class="submenu"><?php echo WikiLink(_("RecentChanges"), "", _("Recent Changes")) ?></li>
- <li class="submenu"><?php echo WikiLink(_("SpecialPages"), "", _("Special Pages")) ?></li>
- <li class="submenu"><?php echo WikiLink(_("FindPage"), "", _("Search")) ?></li>
+ <li class="submenu"><?php echo WikiLink(__("HomePage"), "", _("Home Page")) ?></li>
+ <li class="submenu"><?php echo WikiLink(__("RecentChanges"), "", _("Recent Changes")) ?></li>
+ <li class="submenu"><?php echo WikiLink(__("SpecialPages"), "", _("Special Pages")) ?></li>
+ <li class="submenu"><?php echo WikiLink(__("FindPage"), "", _("Search")) ?></li>
<?php if ($curuserprefs->get('randomPageMenuItem')) { ?>
- <li class="submenu"><?php echo WikiLink(_("RandomPage"), "", _("Random Page")) ?></li>
+ <li class="submenu"><?php echo WikiLink(__("RandomPage"), "", _("Random Page")) ?></li>
<?php } ?>
<?php if ($curuserprefs->get('likePagesMenuItem')) { ?>
- <li class="submenu"><?php echo Button(array('action'=>_("LikePages")), _("Like Pages"),$page->getName()) ?></li>
+ <li class="submenu"><?php echo Button(array('action'=>__("LikePages")), _("Like Pages"),$page->getName()) ?></li>
<?php } ?>
<?php if (!empty($user) && $user->isSignedIn()) { ?>
- <li class="submenu"><?php echo WikiLink(_("UpLoad"), "", _("Upload File")) ?></li>
+ <li class="submenu"><?php echo WikiLink(__("UpLoad"), "", _("Upload File")) ?></li>
<?php } ?>
<?php if (!empty($user) && $user->isAdmin()) { ?>
- <li class="submenu"><?php echo WikiLink(_("PhpWikiAdministration"), "", _("Wiki Admin")) ?></li>
+ <li class="submenu"><?php echo WikiLink(__("PhpWikiAdministration"), "", _("Wiki Admin")) ?></li>
<?php } ?>
<?php if (!empty($user) && $user->isSignedIn()) { ?>
<?php if ($dbh->isWikiPage($username)) { ?>
<li class="submenu"><?php echo WikiLink($username, "", _("My User Page")) ?></li>
<?php } ?>
- <li class="submenu"><?php echo WikiLink(_("UserPreferences"), "", _("User Preferences")) ?></li>
+ <li class="submenu"><?php echo WikiLink(__("UserPreferences"), "", _("User Preferences")) ?></li>
<?php } ?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
