From: <var...@us...> - 2011-09-23 16:38:07
|
Revision: 8119 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8119&view=rev Author: vargenau Date: 2011-09-23 16:38:01 +0000 (Fri, 23 Sep 2011) Log Message: ----------- Translate ":" separately Modified Paths: -------------- trunk/themes/MonoBook/templates/info.tmpl trunk/themes/default/templates/info.tmpl Modified: trunk/themes/MonoBook/templates/info.tmpl =================================================================== --- trunk/themes/MonoBook/templates/info.tmpl 2011-09-23 16:08:09 UTC (rev 8118) +++ trunk/themes/MonoBook/templates/info.tmpl 2011-09-23 16:38:01 UTC (rev 8119) @@ -69,14 +69,14 @@ $LOCKED_CB->setAttr('onclick', $clickcheckb); } - $label['date'] = _("Last Modified").':'; - $label['author'] = _("Last Author").':'; - $label['summary'] = _("Last Summary").':'; + $label['date'] = _("Last Modified") . _(":"); + $label['author'] = _("Last Author") . _(":"); + $label['summary'] = _("Last Summary") . _(":"); } else { - $label['date'] = _("Saved on:"); - $label['author'] = _("Author").':'; - $label['summary'] = _("Summary").':'; + $label['date'] = _("Saved on:") . _(":"); + $label['author'] = _("Author") . _(":"); + $label['summary'] = _("Summary") . _(":"); } $tableSummary = fmt("Statistics about %s.", $page->getName()); @@ -99,7 +99,7 @@ <?php if (!$is_current) { ?> <tr> - <td align="right" class="pageinfo"><?php echo _("Supplanted on:")?></td> + <td align="right" class="pageinfo"><?php echo _("Supplanted on") . _(":") ?></td> <td><?php echo $WikiTheme->formatDateTime($revision->get('_supplanted')) ?></td> </tr> <?php } ?> @@ -116,20 +116,20 @@ <?php } ?></td> </tr> <tr> - <td align="right" class="pageinfo"><?php echo _("Page Version:")?></td> + <td align="right" class="pageinfo"><?php echo _("Page Version") . _(":") ?></td> <td><?php echo $version ?></td> </tr> <tr> - <td align="right" class="pageinfo"><?php echo _("Markup:")?></td> + <td align="right" class="pageinfo"><?php echo _("Markup") . _(":") ?></td> <td><?php echo $markupVersion ?></td> </tr> <tr> - <td align="right" class="pageinfo"><?php echo _("Size:")?></td> + <td align="right" class="pageinfo"><?php echo _("Size") . _(":") ?></td> <td><?php echo $wordcount ?>, <?php echo $size ?></td> </tr> <?php if ($is_current) { ?> <tr> - <td align="right" class="pageinfo"><?php echo _("Hits:") ?></td> + <td align="right" class="pageinfo"><?php echo _("Hits") . _(":") ?></td> <td><?php echo $hits ?></td> </tr> <?php } ?> @@ -174,7 +174,7 @@ <?php if (!empty($pagetype)) { $pagetype = implode(", ", $pagetype); ?> <tr> - <td align="right" class="pageinfo"><?php echo _("Page Type:")?></td> + <td align="right" class="pageinfo"><?php echo _("Page Type") . _(":") ?></td> <td align="left"><?php echo $pagetype?></td> </tr> <?php } ?> @@ -185,10 +185,10 @@ <?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("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 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()) { ?> <!-- Buttons really only for debugging --> <?php echo $SEP?><?php echo Button("DebugInfo", _("DebugInfo")) ?> <?php Modified: trunk/themes/default/templates/info.tmpl =================================================================== --- trunk/themes/default/templates/info.tmpl 2011-09-23 16:08:09 UTC (rev 8118) +++ trunk/themes/default/templates/info.tmpl 2011-09-23 16:38:01 UTC (rev 8119) @@ -54,14 +54,14 @@ $LOCKED_CB->setAttr('onclick', $clickcheckb); } - $label['date'] = _("Last Modified:"); - $label['author'] = _("Last Author:"); - $label['summary'] = _("Last Summary:"); + $label['date'] = _("Last Modified") . _(":"); + $label['author'] = _("Last Author") . _(":"); + $label['summary'] = _("Last Summary") . _(":"); } else { - $label['date'] = _("Saved on:"); - $label['author'] = _("Author:"); - $label['summary'] = _("Summary:"); + $label['date'] = _("Saved on") . _(":"); + $label['author'] = _("Author") . _(":"); + $label['summary'] = _("Summary") . _(":"); } $tableSummary = fmt("Statistics about %s.", $page->getName()); @@ -82,7 +82,7 @@ <?php if (!$is_current) { ?> <tr> - <td class="align-right pageinfo"><?php echo _("Supplanted on:")?></td> + <td class="align-right pageinfo"><?php echo _("Supplanted on") . _(":") ?></td> <td><?php echo $WikiTheme->formatDateTime($revision->get('_supplanted')) ?></td> </tr> <?php } ?> @@ -94,26 +94,26 @@ <tr> <td class="align-right pageinfo"><?php echo $label['author'] ?></td> <td><?php echo $authorLink ?> -<?php if (! ($author == $authorId)) { +<?php if (! ($author == $authorId)) { if ($dbi->isWikiPage($authorId)) $authorId = WikiLink($authorId); ?> <span class="pageinfo-authorid">(<?php echo $authorId ?>)</span> <?php } ?></td> </tr> <tr> - <td class="align-right pageinfo"><?php echo _("Page Version:")?></td> + <td class="align-right pageinfo"><?php echo _("Page Version") . _(":") ?></td> <td><?php echo $version ?></td> </tr> <tr> - <td class="align-right pageinfo"><?php echo _("Markup:")?></td> + <td class="align-right pageinfo"><?php echo _("Markup") . _(":") ?></td> <td><?php echo $markupVersion ?></td> </tr> <tr> - <td class="align-right pageinfo"><?php echo _("Size:")?></td> + <td class="align-right pageinfo"><?php echo _("Size") . _(":") ?></td> <td><?php echo $wordcount ?>, <?php echo $size ?></td> </tr> <?php if ($is_current) { ?> <tr> - <td class="align-right pageinfo"><?php echo _("Hits:") ?></td> + <td class="align-right pageinfo"><?php echo _("Hits") . _(":") ?></td> <td><?php echo $hits ?></td> </tr> <?php } ?> @@ -128,16 +128,16 @@ </tr> <?php if (ENABLE_EXTERNAL_PAGES) { ?> <tr> - <td class="align-right pageinfo"><?php echo _("Is External:") ?></td> + <td class="align-right pageinfo"><?php echo _("Is External") . _(":") ?></td> <td><?php echo $page->get('external') ? _("Yes") : _("No") ?></td> </tr> <?php } ?> <tr> - <td class="align-right pageinfo"><?php echo _("ACL type:") ?></td> + <td class="align-right pageinfo"><?php echo _("ACL type") . _(":") ?></td> <td><?php echo $type ?></td> </tr> <tr> - <td class="align-right top pageinfo"><?php echo _("ACL:") ?></td> + <td class="align-right top pageinfo"><?php echo _("ACL") . _(":") ?></td> <td><?php echo $perm->asAclLines() ?></td> </tr> <?php } ?> @@ -155,7 +155,7 @@ if ($page->get('pagetype') == 'wikiblog') { $pagetype []= _("Blog page"); } -if ($page->getName() == __("InterWikiMap")) { +if ($page->getName() == _("InterWikiMap")) { $pagetype []= _("InterWikiMap"); } if (isSubPage($page->getName())) { @@ -164,7 +164,7 @@ <?php if (!empty($pagetype)) { $pagetype = implode(", ", $pagetype); ?> <tr> - <td class="align-right pageinfo"><?php echo _("Page Type:")?></td> + <td class="align-right pageinfo"><?php echo _("Page Type") . _(":") ?></td> <td><?php echo $pagetype?></td> </tr> <?php } ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |