From 62a40f8859cb4af7f696732dfd80b79ae53a29a6 Mon Sep 17 00:00:00 2001 From: vargenau Date: Tue, 11 Dec 2012 17:40:38 +0000 Subject: [PATCH] Less messages git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@8655 96ab9672-09ca-45d6-a79d-3d69d39ca109 --- lib/diff.php | 3 +-- lib/loadsave.php | 2 +- lib/plugin/Diff.php | 2 +- lib/plugin/GraphViz.php | 2 +- lib/plugin/PageHistory.php | 3 +-- lib/plugin/PageInfo.php | 3 +-- lib/plugin/UnfoldSubpages.php | 3 +-- lib/plugin/WikiPoll.php | 2 +- lib/plugin/_WikiTranslation.php | 2 +- lib/upgrade.php | 2 +- themes/Wordpress/templates/browse.tmpl | 2 +- themes/default/templates/online.tmpl | 6 +++--- 12 files changed, 14 insertions(+), 18 deletions(-) diff --git a/lib/diff.php b/lib/diff.php index 5c6521403..ace2bb4db 100644 --- a/lib/diff.php +++ b/lib/diff.php @@ -248,8 +248,7 @@ function showDiff(&$request) $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 diff --git a/lib/loadsave.php b/lib/loadsave.php index 288a6b142..bab5f8e04 100644 --- a/lib/loadsave.php +++ b/lib/loadsave.php @@ -968,7 +968,7 @@ function SavePage(&$request, &$pageinfo, $source, $filename) $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) diff --git a/lib/plugin/Diff.php b/lib/plugin/Diff.php index 8c67210eb..78c19f2bf 100644 --- a/lib/plugin/Diff.php +++ b/lib/plugin/Diff.php @@ -97,7 +97,7 @@ class WikiPlugin_Diff $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 } diff --git a/lib/plugin/GraphViz.php b/lib/plugin/GraphViz.php index 9957cbdf8..27fc8ca53 100644 --- a/lib/plugin/GraphViz.php +++ b/lib/plugin/GraphViz.php @@ -215,7 +215,7 @@ class WikiPlugin_GraphViz 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"; // } diff --git a/lib/plugin/PageHistory.php b/lib/plugin/PageHistory.php index 465ba853f..dae7d25ac 100644 --- a/lib/plugin/PageHistory.php +++ b/lib/plugin/PageHistory.php @@ -344,8 +344,7 @@ class WikiPlugin_PageHistory $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. diff --git a/lib/plugin/PageInfo.php b/lib/plugin/PageInfo.php index a9bb84584..847b72a97 100644 --- a/lib/plugin/PageInfo.php +++ b/lib/plugin/PageInfo.php @@ -55,8 +55,7 @@ class WikiPlugin_PageInfo $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))) diff --git a/lib/plugin/UnfoldSubpages.php b/lib/plugin/UnfoldSubpages.php index 73bd1f223..02c3c0466 100644 --- a/lib/plugin/UnfoldSubpages.php +++ b/lib/plugin/UnfoldSubpages.php @@ -166,8 +166,7 @@ class WikiPlugin_UnfoldSubpages 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'), diff --git a/lib/plugin/WikiPoll.php b/lib/plugin/WikiPoll.php index 876fa0483..5ea3a5278 100644 --- a/lib/plugin/WikiPoll.php +++ b/lib/plugin/WikiPoll.php @@ -109,7 +109,7 @@ class WikiPlugin_WikiPoll 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); } diff --git a/lib/plugin/_WikiTranslation.php b/lib/plugin/_WikiTranslation.php index 041b226c3..5f71b34c8 100644 --- a/lib/plugin/_WikiTranslation.php +++ b/lib/plugin/_WikiTranslation.php @@ -301,7 +301,7 @@ class WikiPlugin__WikiTranslation WikiURL($pagename, false, true), $to_lang)); } else { - return $this->error(fmt("%s is empty", $pagename)); + return $this->error(fmt("%s is empty.", $pagename)); } } diff --git a/lib/upgrade.php b/lib/upgrade.php index a8334e8e9..5e7d944c8 100644 --- a/lib/upgrade.php +++ b/lib/upgrade.php @@ -962,7 +962,7 @@ CREATE TABLE $log_tbl ( 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"); diff --git a/themes/Wordpress/templates/browse.tmpl b/themes/Wordpress/templates/browse.tmpl index de751fda4..537355ce3 100644 --- a/themes/Wordpress/templates/browse.tmpl +++ b/themes/Wordpress/templates/browse.tmpl @@ -3,7 +3,7 @@ isCurrent()) { ?>

- .

+ .

diff --git a/themes/default/templates/online.tmpl b/themes/default/templates/online.tmpl index e13200df8..e68d61108 100644 --- a/themes/default/templates/online.tmpl +++ b/themes/default/templates/online.tmpl @@ -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 @@ if ($MAX_ONLINE_TIME and $MAX_ONLINE_NUM) "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")); } ?> @@ -54,7 +54,7 @@ if ($MAX_ONLINE_TIME and $MAX_ONLINE_NUM) "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")); ?>
-- 2.45.0