Menu
▾
▴
[phpwiki-checkins] SF.net SVN: phpwiki:[8655] trunk
|
From: <var...@us...> - 2012-12-11 17:40:49
|
Revision: 8655
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8655&view=rev
Author: vargenau
Date: 2012-12-11 17:40:38 +0000 (Tue, 11 Dec 2012)
Log Message:
-----------
Less messages
Modified Paths:
--------------
trunk/lib/diff.php
trunk/lib/loadsave.php
trunk/lib/plugin/Diff.php
trunk/lib/plugin/GraphViz.php
trunk/lib/plugin/PageHistory.php
trunk/lib/plugin/PageInfo.php
trunk/lib/plugin/UnfoldSubpages.php
trunk/lib/plugin/WikiPoll.php
trunk/lib/plugin/_WikiTranslation.php
trunk/lib/upgrade.php
trunk/themes/Wordpress/templates/browse.tmpl
trunk/themes/default/templates/online.tmpl
Modified: trunk/lib/diff.php
===================================================================
--- trunk/lib/diff.php 2012-12-11 17:08:39 UTC (rev 8654)
+++ trunk/lib/diff.php 2012-12-11 17:40:38 UTC (rev 8655)
@@ -248,8 +248,7 @@
$current = $page->getCurrentRevision(false);
if ($current->getVersion() < 1) {
$html = HTML::div(array('class' => 'wikitext', 'id' => 'difftext'),
- HTML::p(fmt("I'm sorry, there is no such page as %s.",
- WikiLink($pagename, 'unknown'))));
+ HTML::p(fmt("Page “%s” does not exist.", WikiLink($pagename, 'unknown'))));
require_once 'lib/Template.php';
GeneratePage($html, sprintf(_("Diff: %s"), $pagename), false);
return; //early return
Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php 2012-12-11 17:08:39 UTC (rev 8654)
+++ trunk/lib/loadsave.php 2012-12-11 17:40:38 UTC (rev 8655)
@@ -968,7 +968,7 @@
$mesg = HTML::p();
if ($source)
- $mesg->pushContent(' ', fmt("from %s", $source));
+ $mesg->pushContent(' ', fmt("from “%s”", $source));
if (!$current) {
//FIXME: This should not happen! (empty vdata, corrupt cache or db)
Modified: trunk/lib/plugin/Diff.php
===================================================================
--- trunk/lib/plugin/Diff.php 2012-12-11 17:08:39 UTC (rev 8654)
+++ trunk/lib/plugin/Diff.php 2012-12-11 17:40:38 UTC (rev 8655)
@@ -97,7 +97,7 @@
$page = $request->getPage($pagename);
$current = $page->getCurrentRevision();
if ($current->getVersion() < 1) {
- $html = HTML(HTML::p(fmt("I'm sorry, there is no such page as %s.",
+ $html = HTML(HTML::p(fmt("Page “%s” does not exist.",
WikiLink($pagename, 'unknown'))));
return $html; //early return
}
Modified: trunk/lib/plugin/GraphViz.php
===================================================================
--- trunk/lib/plugin/GraphViz.php 2012-12-11 17:08:39 UTC (rev 8654)
+++ trunk/lib/plugin/GraphViz.php 2012-12-11 17:40:38 UTC (rev 8655)
@@ -215,7 +215,7 @@
if (empty($this->source)) {
// create digraph from pages
if (empty($argarray['pages'])) {
- trigger_error(sprintf(_("%s is empty"), 'GraphViz argument source'), E_USER_WARNING);
+ trigger_error(sprintf(_("%s is empty."), 'GraphViz argument source'), E_USER_WARNING);
return '';
}
$source = "digraph GraphViz {\n"; // }
Modified: trunk/lib/plugin/PageHistory.php
===================================================================
--- trunk/lib/plugin/PageHistory.php 2012-12-11 17:08:39 UTC (rev 8654)
+++ trunk/lib/plugin/PageHistory.php 2012-12-11 17:40:38 UTC (rev 8655)
@@ -344,8 +344,7 @@
$page = $dbi->getPage($pagename);
$current = $page->getCurrentRevision();
if ($current->getVersion() < 1) {
- return HTML(HTML::p(fmt("I'm sorry, there is no such page as %s.",
- WikiLink($pagename, 'unknown'))),
+ return HTML(HTML::p(fmt("Page “%s” does not exist.", WikiLink($pagename, 'unknown'))),
$this->makeForm("", $request));
}
// Hack alert: format() is a NORETURN for rss formatters.
Modified: trunk/lib/plugin/PageInfo.php
===================================================================
--- trunk/lib/plugin/PageInfo.php 2012-12-11 17:08:39 UTC (rev 8654)
+++ trunk/lib/plugin/PageInfo.php 2012-12-11 17:40:38 UTC (rev 8655)
@@ -55,8 +55,7 @@
$current = $page->getCurrentRevision();
if ($current->getVersion() < 1)
- return fmt("I'm sorry, there is no such page as %s.",
- WikiLink($pagename, 'unknown'));
+ return fmt("Page “%s” does not exist.", WikiLink($pagename, 'unknown'));
if (!empty($version)) {
if (!($revision = $page->getRevision($version)))
Modified: trunk/lib/plugin/UnfoldSubpages.php
===================================================================
--- trunk/lib/plugin/UnfoldSubpages.php 2012-12-11 17:08:39 UTC (rev 8654)
+++ trunk/lib/plugin/UnfoldSubpages.php 2012-12-11 17:40:38 UTC (rev 8655)
@@ -166,8 +166,7 @@
if (!$smalltitle) {
$content->pushContent(HTML::p(array('class' => $quiet ?
'' : 'transclusion-title'),
- fmt("Included from %s:",
- WikiLink($cpagename))));
+ fmt("Included from %s", WikiLink($cpagename))));
}
$content->pushContent(HTML(HTML::div(array('class' => $quiet ?
'' : 'transclusion'),
Modified: trunk/lib/plugin/WikiPoll.php
===================================================================
--- trunk/lib/plugin/WikiPoll.php 2012-12-11 17:08:39 UTC (rev 8654)
+++ trunk/lib/plugin/WikiPoll.php 2012-12-11 17:40:38 UTC (rev 8655)
@@ -109,7 +109,7 @@
foreach (array_merge($argstr_args, $argstr_defaults) as $arg => $val) {
if (!preg_match("/^(answer_|question_)/", $arg))
- trigger_error(sprintf(_("argument “%s” not declared by plugin"),
+ trigger_error(sprintf(_("Argument “%s” not declared by plugin."),
$arg), E_USER_NOTICE);
}
Modified: trunk/lib/plugin/_WikiTranslation.php
===================================================================
--- trunk/lib/plugin/_WikiTranslation.php 2012-12-11 17:08:39 UTC (rev 8654)
+++ trunk/lib/plugin/_WikiTranslation.php 2012-12-11 17:40:38 UTC (rev 8655)
@@ -301,7 +301,7 @@
WikiURL($pagename, false, true),
$to_lang));
} else {
- return $this->error(fmt("%s is empty", $pagename));
+ return $this->error(fmt("%s is empty.", $pagename));
}
}
Modified: trunk/lib/upgrade.php
===================================================================
--- trunk/lib/upgrade.php 2012-12-11 17:08:39 UTC (rev 8654)
+++ trunk/lib/upgrade.php 2012-12-11 17:40:38 UTC (rev 8655)
@@ -962,7 +962,7 @@
if (!file_exists($filename))
$filename = FindFile($filename);
if (!file_exists($filename))
- return array(false, sprintf(_("file %s not found"), $o_filename));
+ return array(false, sprintf(_("File “%s” not found."), $o_filename));
$found = false;
if (is_writable($filename)) {
$in = fopen($filename, "rb");
Modified: trunk/themes/Wordpress/templates/browse.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/browse.tmpl 2012-12-11 17:08:39 UTC (rev 8654)
+++ trunk/themes/Wordpress/templates/browse.tmpl 2012-12-11 17:40:38 UTC (rev 8655)
@@ -3,7 +3,7 @@
<?php if ($revision and !$revision->isCurrent()) { ?>
<p><strong><?php echo _("Note:")?></strong>
<?php echo _("You are viewing an old revision of this page.")?>
- <?php echo WikiLink($page, 'existing', _("View the current version"))?>.</p>
+ <?php echo WikiLink($page, 'existing', _("View the current version."))?>.</p>
<hr class="ignore" />
<?php } ?>
Modified: trunk/themes/default/templates/online.tmpl
===================================================================
--- trunk/themes/default/templates/online.tmpl 2012-12-11 17:08:39 UTC (rev 8654)
+++ trunk/themes/default/templates/online.tmpl 2012-12-11 17:40:38 UTC (rev 8655)
@@ -3,7 +3,7 @@
// We have two modes: 1. a simple "summary" block, and
// 2. "detail" with a table of online users, date and current actions
-$header = _("Who Is Online");
+$header = _("Who is Online");
if ($MAX_ONLINE_TIME and $MAX_ONLINE_NUM)
$MAX_ONLINE_TIME = $WikiTheme->formatDateTime($MAX_ONLINE_TIME);
?>
@@ -11,7 +11,7 @@
<?php if ($mode == 'summary') {
if ($allow_detail) {
$url = WikiUrl($pagename,array("mode"=>"detail"));
- $header = HTML::a(array('href'=>$url,'title'=>_("Switch to detailed list")),_("Who Is Online"));
+ $header = HTML::a(array('href'=>$url,'title'=>_("Switch to detailed list")),_("Who is Online"));
}
?>
<table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline">
@@ -54,7 +54,7 @@
<?php if ($mode == 'detail') {
$url = WikiUrl($pagename,array("mode"=>"summary"));
- $header = HTML::a(array('href'=>$url,'title'=>_("Switch to summary")),_("Who Is Online"));
+ $header = HTML::a(array('href'=>$url,'title'=>_("Switch to summary")),_("Who is Online"));
?>
<table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline">
<tr><td class="cat" colspan="3"><?php echo $header ?></td></tr>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
