From: <var...@us...> - 2012-12-04 12:49:54
|
Revision: 8595 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8595&view=rev Author: vargenau Date: 2012-12-04 12:49:42 +0000 (Tue, 04 Dec 2012) Log Message: ----------- Use smart quotes Modified Paths: -------------- trunk/lib/plugin/AddComment.php trunk/lib/plugin/Chart.php trunk/lib/plugin/CreateBib.php trunk/lib/plugin/CreatePage.php trunk/lib/plugin/CreateToc.php trunk/lib/plugin/FileInfo.php trunk/lib/plugin/FullTextSearch.php trunk/lib/plugin/FuzzyPages.php trunk/lib/plugin/GoogleMaps.php trunk/lib/plugin/GraphViz.php trunk/lib/plugin/IncludePage.php trunk/lib/plugin/LikePages.php trunk/lib/plugin/ModeratedPage.php trunk/lib/plugin/PageGroup.php trunk/lib/plugin/PhotoAlbum.php trunk/lib/plugin/PhpHighlight.php trunk/lib/plugin/PhpWeather.php trunk/lib/plugin/Ploticus.php trunk/lib/plugin/RecentChanges.php trunk/lib/plugin/RedirectTo.php trunk/lib/plugin/SpellCheck.php trunk/lib/plugin/SyncWiki.php trunk/lib/plugin/SyntaxHighlighter.php trunk/lib/plugin/SystemInfo.php trunk/lib/plugin/Template.php trunk/lib/plugin/TitleSearch.php trunk/lib/plugin/TranslateText.php trunk/lib/plugin/UpLoad.php trunk/lib/plugin/WikiAdminChmod.php trunk/lib/plugin/WikiAdminChown.php trunk/lib/plugin/WikiAdminDeleteAcl.php trunk/lib/plugin/WikiAdminMarkup.php trunk/lib/plugin/WikiAdminPurge.php trunk/lib/plugin/WikiAdminRemove.php trunk/lib/plugin/WikiAdminRename.php trunk/lib/plugin/WikiAdminSearchReplace.php trunk/lib/plugin/WikiAdminSelect.php trunk/lib/plugin/WikiAdminSetAcl.php trunk/lib/plugin/WikiAdminSetExternal.php trunk/lib/plugin/WikiBlog.php trunk/lib/plugin/WikiFormRich.php trunk/lib/plugin/WikiForum.php trunk/lib/plugin/WikiPoll.php trunk/lib/plugin/_AuthInfo.php trunk/lib/plugin/_BackendInfo.php trunk/lib/plugin/_Retransform.php trunk/lib/plugin/text2png.php Modified: trunk/lib/plugin/AddComment.php =================================================================== --- trunk/lib/plugin/AddComment.php 2012-12-03 17:42:48 UTC (rev 8594) +++ trunk/lib/plugin/AddComment.php 2012-12-04 12:49:42 UTC (rev 8595) @@ -74,7 +74,7 @@ { $args = $this->getArgs($argstr, $request); if (!$args['pagename']) { - return $this->error(sprintf(_("A required argument '%s' is missing."), 'pagename')); + return $this->error(sprintf(_("A required argument “%s” is missing."), 'pagename')); } // Get our form args. @@ -129,7 +129,7 @@ } break; default: - return $this->error(sprintf("Bad mode ('%s')", $show)); + return $this->error(sprintf("Bad mode (“%s”)", $show)); } } $html->pushContent($div); Modified: trunk/lib/plugin/Chart.php =================================================================== --- trunk/lib/plugin/Chart.php 2012-12-03 17:42:48 UTC (rev 8594) +++ trunk/lib/plugin/Chart.php 2012-12-04 12:49:42 UTC (rev 8595) @@ -80,7 +80,7 @@ global $WikiTheme; $args = $this->getArgs($argstr, $request); if (!$args['data']) { - return $this->error(sprintf(_("A required argument '%s' is missing."), 'data')); + return $this->error(sprintf(_("A required argument “%s” is missing."), 'data')); } extract($args); Modified: trunk/lib/plugin/CreateBib.php =================================================================== --- trunk/lib/plugin/CreateBib.php 2012-12-03 17:42:48 UTC (rev 8594) +++ trunk/lib/plugin/CreateBib.php 2012-12-04 12:49:42 UTC (rev 8595) @@ -110,7 +110,7 @@ $pagename = $page->name; } if (!$pagename) { - return $this->error(sprintf(_("A required argument '%s' is missing."), 'pagename')); + return $this->error(sprintf(_("A required argument “%s” is missing."), 'pagename')); } // Get the links page contents Modified: trunk/lib/plugin/CreatePage.php =================================================================== --- trunk/lib/plugin/CreatePage.php 2012-12-03 17:42:48 UTC (rev 8594) +++ trunk/lib/plugin/CreatePage.php 2012-12-04 12:49:42 UTC (rev 8595) @@ -73,9 +73,9 @@ if ($verify) { $head = _("CreatePage failed"); if ($dbi->isWikiPage($verify)) { - $msg = _("Do you really want to create the page '%s'?"); + $msg = _("Do you really want to create the page “%s”?"); } else { - $msg = _("Do you really want to create the page '%s'?"); + $msg = _("Do you really want to create the page “%s”?"); } if (isSubPage($s)) { $main = subPageSlice(0); Modified: trunk/lib/plugin/CreateToc.php =================================================================== --- trunk/lib/plugin/CreateToc.php 2012-12-03 17:42:48 UTC (rev 8594) +++ trunk/lib/plugin/CreateToc.php 2012-12-04 12:49:42 UTC (rev 8595) @@ -396,7 +396,7 @@ $pagename = $page->name; } if (!$pagename) { - return $this->error(sprintf(_("A required argument '%s' is missing."), 'pagename')); + return $this->error(sprintf(_("A required argument “%s” is missing."), 'pagename')); } if (($notoc) or ($liststyle == 'ol')) { $with_counter = 1; @@ -410,7 +410,7 @@ // Check if page exists. if (!($dbi->isWikiPage($pagename))) { - return $this->error(sprintf(_("Page '%s' does not exist."), $pagename)); + return $this->error(sprintf(_("Page “%s” does not exist."), $pagename)); } // Check if user is allowed to get the page. Modified: trunk/lib/plugin/FileInfo.php =================================================================== --- trunk/lib/plugin/FileInfo.php 2012-12-03 17:42:48 UTC (rev 8594) +++ trunk/lib/plugin/FileInfo.php 2012-12-04 12:49:42 UTC (rev 8595) @@ -62,10 +62,10 @@ $args = $this->getArgs($argstr, $request); extract($args); if (!$file) { - return $this->error(sprintf(_("A required argument '%s' is missing."), 'file')); + return $this->error(sprintf(_("A required argument “%s” is missing."), 'file')); } if (!$display) { - return $this->error(sprintf(_("A required argument '%s' is missing."), 'display')); + return $this->error(sprintf(_("A required argument “%s” is missing."), 'display')); } if (string_starts_with($file, "Upload:")) { $file = preg_replace("/^Upload:(.*)$/", getUploadFilePath() . "\\1", $file); @@ -79,7 +79,7 @@ if ($quiet) { return HTML::raw(''); } else { - return $this->error(sprintf(_("File '%s' not found."), $file)); + return $this->error(sprintf(_("File “%s” not found."), $file)); } } // sanify $file name Modified: trunk/lib/plugin/FullTextSearch.php =================================================================== --- trunk/lib/plugin/FullTextSearch.php 2012-12-03 17:42:48 UTC (rev 8594) +++ trunk/lib/plugin/FullTextSearch.php 2012-12-04 12:49:42 UTC (rev 8595) @@ -119,7 +119,7 @@ $list->pushContent(HTML::dd(_("<no matches>"))); if (!empty($pages->stoplisted)) - $list = HTML(HTML::p(fmt(_("Ignored stoplist words '%s'"), + $list = HTML(HTML::p(fmt(_("Ignored stoplist words “%s”"), join(', ', $pages->stoplisted))), $list); if ($noheader) Modified: trunk/lib/plugin/FuzzyPages.php =================================================================== --- trunk/lib/plugin/FuzzyPages.php 2012-12-03 17:42:48 UTC (rev 8594) +++ trunk/lib/plugin/FuzzyPages.php 2012-12-04 12:49:42 UTC (rev 8595) @@ -102,7 +102,7 @@ $link = WikiLink($this->_searchterm, 'auto'); else $link = $this->_searchterm; - $caption = fmt("These page titles match fuzzy with '%s'", $link); + $caption = fmt("These page titles match fuzzy with “%s”", $link); $table->pushContent(HTML::caption($caption)); } @@ -144,7 +144,7 @@ { if (empty($list)) { - return HTML::p(fmt("No fuzzy matches with '%s'", $this->_searchterm)); + return HTML::p(fmt("No fuzzy matches with “%s”", $this->_searchterm)); } $table = HTML::table(array('class' => 'pagelist')); $this->addTableCaption($table, $dbi); Modified: trunk/lib/plugin/GoogleMaps.php =================================================================== --- trunk/lib/plugin/GoogleMaps.php 2012-12-03 17:42:48 UTC (rev 8594) +++ trunk/lib/plugin/GoogleMaps.php 2012-12-04 12:49:42 UTC (rev 8595) @@ -90,10 +90,10 @@ extract($args); if ($Longitude === '') { - return $this->error(sprintf(_("A required argument '%s' is missing."), 'Longitude')); + return $this->error(sprintf(_("A required argument “%s” is missing."), 'Longitude')); } if ($Latitude === '') { - return $this->error(sprintf(_("A required argument '%s' is missing."), 'Latitude')); + return $this->error(sprintf(_("A required argument “%s” is missing."), 'Latitude')); } $maps = JavaScript('', array('src' => "http://maps.google.com/maps?file=api&v=1&key=" . GOOGLE_LICENSE_KEY)); Modified: trunk/lib/plugin/GraphViz.php =================================================================== --- trunk/lib/plugin/GraphViz.php 2012-12-03 17:42:48 UTC (rev 8594) +++ trunk/lib/plugin/GraphViz.php 2012-12-04 12:49:42 UTC (rev 8595) @@ -289,7 +289,7 @@ $cmdline = "$dotbin $args"; $code = $this->execute($cmdline, $outfile); if (!$code) - $this->complain(sprintf(_("Couldn't start commandline '%s'"), $cmdline)); + $this->complain(sprintf(_("Couldn't start commandline “%s”"), $cmdline)); } else { $args = "-T$gif -o $outfile"; $cmdline = "$dotbin $args"; @@ -297,11 +297,11 @@ //if (!isWindows()) $cmdline .= " 2>&1"; $code = $this->filterThroughCmd($source, $cmdline); if ($code) - $this->complain(sprintf(_("Couldn't start commandline '%s'"), $cmdline)); + $this->complain(sprintf(_("Couldn't start commandline “%s”"), $cmdline)); sleep(0.1); } if (!file_exists($outfile)) { - $this->complain(sprintf(_("%s error: outputfile '%s' not created"), + $this->complain(sprintf(_("%s error: outputfile “%s” not created"), "GraphViz", $outfile)); $this->complain("\ncmd-line: $cmdline"); return false; Modified: trunk/lib/plugin/IncludePage.php =================================================================== --- trunk/lib/plugin/IncludePage.php 2012-12-03 17:42:48 UTC (rev 8594) +++ trunk/lib/plugin/IncludePage.php 2012-12-04 12:49:42 UTC (rev 8595) @@ -87,7 +87,7 @@ $page = $page->name; } if (!$page) { - return $this->error(sprintf(_("A required argument '%s' is missing."), 'page')); + return $this->error(sprintf(_("A required argument “%s” is missing."), 'page')); } // A page can include itself once (this is needed, e.g., when editing @@ -100,7 +100,7 @@ // Check if page exists if (!($dbi->isWikiPage($page))) { - return $this->error(sprintf(_("Page '%s' does not exist"), $page)); + return $this->error(sprintf(_("Page “%s” does not exist"), $page)); } // Check if user is allowed to get the Page. Modified: trunk/lib/plugin/LikePages.php =================================================================== --- trunk/lib/plugin/LikePages.php 2012-12-03 17:42:48 UTC (rev 8594) +++ trunk/lib/plugin/LikePages.php 2012-12-04 12:49:42 UTC (rev 8595) @@ -33,7 +33,7 @@ function getDescription() { - return sprintf(_("List page names which share an initial or final title word with '%s'."), + return sprintf(_("List page names which share an initial or final title word with “%s”."), '[pagename]'); } @@ -63,9 +63,9 @@ if ($prefix) { $suffix = false; - $descrip = fmt("Page names with prefix '%s'", $prefix); + $descrip = fmt("Page names with prefix “%s”", $prefix); } elseif ($suffix) { - $descrip = fmt("Page names with suffix '%s'", $suffix); + $descrip = fmt("Page names with suffix “%s”", $suffix); } elseif ($page) { $words = preg_split('/[\s:-;.,]+/', SplitPagename($page)); @@ -74,7 +74,7 @@ $prefix = reset($words); $suffix = end($words); - $descrip = fmt("These pages share an initial or final title word with '%s'", + $descrip = fmt("These pages share an initial or final title word with “%s”", WikiLink($page, 'auto')); } Modified: trunk/lib/plugin/ModeratedPage.php =================================================================== --- trunk/lib/plugin/ModeratedPage.php 2012-12-03 17:42:48 UTC (rev 8594) +++ trunk/lib/plugin/ModeratedPage.php 2012-12-04 12:49:42 UTC (rev 8595) @@ -66,7 +66,7 @@ // Handle moderation request from URLs sent by e-mail if (!empty($args['id']) and !empty($args['pass'])) { if (!$args['page']) { - return $this->error(sprintf(_("A required argument '%s' is missing."), 'page')); + return $this->error(sprintf(_("A required argument “%s” is missing."), 'page')); } $page = $dbi->getPage($args['page']); if ($moderated = $page->get("moderated")) { @@ -159,12 +159,12 @@ } $page->set('moderation', array('status' => $status)); return $this->notice( - fmt("ModeratedPage status update:\n Moderators: '%s'\n require_access: '%s'", + fmt("ModeratedPage status update:\n Moderators: “%s”\n require_access: “%s”", join(',', $status['moderators']), $status['require_access'])); } else { $page->set('moderation', false); return $this->notice(HTML($status, - fmt("'%s' is no ModeratedPage anymore.", $page->getName()))); + fmt("“%s” is no ModeratedPage anymore.", $page->getName()))); } } @@ -184,7 +184,7 @@ } $page->set('moderation', array('status' => $status)); return $this->notice( - fmt("ModeratedPage status update: '%s' is now a ModeratedPage.\n Moderators: '%s'\n require_access: '%s'", + fmt("ModeratedPage status update: “%s” is now a ModeratedPage.\n Moderators: “%s”\n require_access: “%s”", $page->getName(), join(',', $status['moderators']), $status['require_access'])); } else { // error return $status; Modified: trunk/lib/plugin/PageGroup.php =================================================================== --- trunk/lib/plugin/PageGroup.php 2012-12-03 17:42:48 UTC (rev 8594) +++ trunk/lib/plugin/PageGroup.php 2012-12-04 12:49:42 UTC (rev 8595) @@ -98,7 +98,7 @@ $args = $this->getArgs($argstr, $request); extract($args); if (empty($parent)) { - return $this->error(sprintf(_("A required argument '%s' is missing."), 'parent')); + return $this->error(sprintf(_("A required argument “%s” is missing."), 'parent')); } $directions = array('next' => _("Next"), 'previous' => _("Previous"), Modified: trunk/lib/plugin/PhotoAlbum.php =================================================================== --- trunk/lib/plugin/PhotoAlbum.php 2012-12-03 17:42:48 UTC (rev 8594) +++ trunk/lib/plugin/PhotoAlbum.php 2012-12-04 12:49:42 UTC (rev 8595) @@ -621,7 +621,7 @@ return; } if (!file_exists($src)) - return $this->error(fmt("Unable to find src='%s'", $src)); + return $this->error(fmt("Unable to find src=“%s”", $src)); $photos[] = array("src" => $src, "name" => "../" . $src, "name_tile" => $src, @@ -633,7 +633,7 @@ if ($web_location == 0) { $fp = @fopen($src, "r"); if (!$fp) { - return $this->error(fmt("Unable to read src='%s'", $src)); + return $this->error(fmt("Unable to read src=“%s”", $src)); } while ($data = fgetcsv($fp, 1024, ';')) { if (count($data) == 0 || empty($data[0]) Modified: trunk/lib/plugin/PhpHighlight.php =================================================================== --- trunk/lib/plugin/PhpHighlight.php 2012-12-03 17:42:48 UTC (rev 8594) +++ trunk/lib/plugin/PhpHighlight.php 2012-12-04 12:49:42 UTC (rev 8595) @@ -139,14 +139,14 @@ static $MAXLEN = 7; foreach (array($string, $comment, $keyword, $bg, $default, $html) as $color) { $length = strlen($color); - //trigger_error(sprintf(_("DEBUG: color '%s' is length %d."), $color, $length), E_USER_NOTICE); + //trigger_error(sprintf(_("DEBUG: color “%s” is length %d."), $color, $length), E_USER_NOTICE); if (($length == 7 || $length == 4) && substr($color, 0, 1) == "#" && "#" == preg_replace("/[a-fA-F0-9]/", "", $color) ) { - //trigger_error(sprintf(_("DEBUG: color '%s' appears to be hex."), $color), E_USER_NOTICE); + //trigger_error(sprintf(_("DEBUG: color “%s” appears to be hex."), $color), E_USER_NOTICE); // stop checking, ok to go } elseif (($length < $MAXLEN + 1) && in_array($color, $html4colors)) { - //trigger_error(sprintf(_("DEBUG color '%s' appears to be an HTML 4 color."), $color), E_USER_NOTICE); + //trigger_error(sprintf(_("DEBUG color “%s” appears to be an HTML 4 color."), $color), E_USER_NOTICE); // stop checking, ok to go } else { trigger_error(sprintf(_("Invalid color: %s"), Modified: trunk/lib/plugin/PhpWeather.php =================================================================== --- trunk/lib/plugin/PhpWeather.php 2012-12-03 17:42:48 UTC (rev 8594) +++ trunk/lib/plugin/PhpWeather.php 2012-12-04 12:49:42 UTC (rev 8595) @@ -100,7 +100,7 @@ if (!$w->get_country_code()) { /* The country code couldn't be resolved, so we * shouldn't use the ICAO: */ - trigger_error(sprintf(_("The ICAO '%s' wasn't recognized."), + trigger_error(sprintf(_("The ICAO “%s” wasn't recognized."), $icao), E_USER_NOTICE); $icao = ''; } @@ -111,7 +111,7 @@ /* We check and correct the language if necessary: */ //if (!in_array($language, array_keys($w->get_languages('text')))) { if (!in_array($language, array_keys(get_languages('text')))) { - trigger_error(sprintf(_("%s does not know about the language '%s', using 'en' instead."), + trigger_error(sprintf(_("%s does not know about the language “%s”, using 'en' instead."), $this->getName(), $language), E_USER_NOTICE); $language = 'en'; Modified: trunk/lib/plugin/Ploticus.php =================================================================== --- trunk/lib/plugin/Ploticus.php 2012-12-03 17:42:48 UTC (rev 8594) +++ trunk/lib/plugin/Ploticus.php 2012-12-04 12:49:42 UTC (rev 8595) @@ -259,9 +259,9 @@ sleep(1); } //if (empty($code)) - // return $this->error(fmt("Couldn't start commandline '%s'", $commandLine)); + // return $this->error(fmt("Couldn't start commandline “%s”", $commandLine)); if (!file_exists($tempfile . ".$gif")) { - $this->_errortext .= sprintf(_("%s error: outputfile '%s' not created"), + $this->_errortext .= sprintf(_("%s error: outputfile “%s” not created"), "Ploticus", "$tempfile.$gif"); if (isWindows()) $this->_errortext .= ("\ncmd-line: " . PLOTICUS_EXE . " $tempfile.plo $args"); Modified: trunk/lib/plugin/RecentChanges.php =================================================================== --- trunk/lib/plugin/RecentChanges.php 2012-12-03 17:42:48 UTC (rev 8594) +++ trunk/lib/plugin/RecentChanges.php 2012-12-04 12:49:42 UTC (rev 8595) @@ -346,7 +346,7 @@ $edits .= sprintf(_(" for all pages linking to %s"), $category); } if (!empty($pagematch)) { - $edits .= sprintf(_(" for all pages matching '%s'"), $pagematch); + $edits .= sprintf(_(" for all pages matching “%s”"), $pagematch); } if ($timespan = $days > 0) { if (intval($days) != $days) Modified: trunk/lib/plugin/RedirectTo.php =================================================================== --- trunk/lib/plugin/RedirectTo.php 2012-12-03 17:42:48 UTC (rev 8594) +++ trunk/lib/plugin/RedirectTo.php 2012-12-04 12:49:42 UTC (rev 8595) @@ -84,7 +84,7 @@ } if ($page == $request->getArg('pagename')) { - return $this->error(fmt("Recursive redirect to self: '%s'", $url)); + return $this->error(fmt("Recursive redirect to self: “%s”", $url)); } if ($request->getArg('action') != 'browse') { Modified: trunk/lib/plugin/SpellCheck.php =================================================================== --- trunk/lib/plugin/SpellCheck.php 2012-12-03 17:42:48 UTC (rev 8594) +++ trunk/lib/plugin/SpellCheck.php 2012-12-04 12:49:42 UTC (rev 8595) @@ -146,7 +146,7 @@ $cache = new WikiPluginCached; $code = $cache->filterThroughCmd($source, $commandLine); if (empty($code)) - return $this->error(fmt("Couldn't start commandline '%s'", $commandLine)); + return $this->error(fmt("Couldn't start commandline “%s”", $commandLine)); $sugg = array(); foreach (preg_split("/\n/", $code) as $line) { if (preg_match("/^& (\w+) \d+ \d+: (.+)$/", $line, $m)) { Modified: trunk/lib/plugin/SyncWiki.php =================================================================== --- trunk/lib/plugin/SyncWiki.php 2012-12-03 17:42:48 UTC (rev 8594) +++ trunk/lib/plugin/SyncWiki.php 2012-12-04 12:49:42 UTC (rev 8595) @@ -71,7 +71,7 @@ $args['action'] = 'syncwiki'; extract($args); if (empty($args['url'])) { - return $this->error(fmt("A required argument '%s' is missing.", "url")); + return $this->error(fmt("A required argument “%s” is missing.", "url")); } if ($request->getArg('action') != 'browse') { return $this->disabled(_("Plugin not run: not in browse mode")); Modified: trunk/lib/plugin/SyntaxHighlighter.php =================================================================== --- trunk/lib/plugin/SyntaxHighlighter.php 2012-12-03 17:42:48 UTC (rev 8594) +++ trunk/lib/plugin/SyntaxHighlighter.php 2012-12-04 12:49:42 UTC (rev 8595) @@ -113,7 +113,7 @@ extract($this->getArgs($argstr, $request)); $source =& $this->source; if (empty($syntax)) { - return $this->error(sprintf(_("A required argument '%s' is missing."), 'syntax')); + return $this->error(sprintf(_("A required argument “%s” is missing."), 'syntax')); } if (empty($source)) { return HTML::div(array('class' => "error"), @@ -143,7 +143,7 @@ $commandLine = HIGHLIGHT_EXE . "$args -q -X -f -S $syntax"; $code = $this->newFilterThroughCmd($source, $commandLine); if (empty($code)) { - return $this->error(fmt("Couldn't start commandline '%s'", $commandLine)); + return $this->error(fmt("Couldn't start commandline “%s”", $commandLine)); } $pre = HTML::pre(HTML::raw($code)); $html->pushContent($pre); Modified: trunk/lib/plugin/SystemInfo.php =================================================================== --- trunk/lib/plugin/SystemInfo.php 2012-12-03 17:42:48 UTC (rev 8594) +++ trunk/lib/plugin/SystemInfo.php 2012-12-04 12:49:42 UTC (rev 8595) @@ -470,7 +470,7 @@ . implode(', ', $available_languages) . ". " . _("Current language") . _(": ") . $GLOBALS['LANG'] . ((DEFAULT_LANGUAGE != $GLOBALS['LANG']) - ? ". " . sprintf(_("Default language: '%s'"), DEFAULT_LANGUAGE) + ? ". " . sprintf(_("Default language: “%s”"), DEFAULT_LANGUAGE) : ''); } @@ -483,7 +483,7 @@ . implode(', ', $available_themes) . ". " . _("Current theme") . _(": ") . $WikiTheme->_name . ((THEME != $WikiTheme->_name) - ? ". " . sprintf(_("Default theme: '%s'"), THEME) + ? ". " . sprintf(_("Default theme: “%s”"), THEME) : ''); } @@ -496,7 +496,7 @@ !in_array($arg, array('ADMIN_PASSWD', 'DATABASE_DSN', 'DBAUTH_AUTH_DSN')) ) return constant($arg); else - return $this->error(sprintf(_("unknown argument '%s' to SystemInfo"), $arg)); + return $this->error(sprintf(_("unknown argument “%s” to SystemInfo"), $arg)); } function run($dbi, $argstr, &$request, $basepage) @@ -507,7 +507,7 @@ $args['seperator'] = ' '; $availableargs = // name => callback + 0 args array('appname' => create_function('', "return 'PhpWiki';"), - 'version' => create_function('', "return sprintf('%s', PHPWIKI_VERSION);"), + 'version' => create_function('', "return sprintf(“%s”, PHPWIKI_VERSION);"), 'LANG' => create_function('', 'return $GLOBALS["LANG"];'), 'LC_ALL' => create_function('', 'return setlocale(LC_ALL, 0);'), 'current_language' => create_function('', 'return $GLOBALS["LANG"];'), Modified: trunk/lib/plugin/Template.php =================================================================== --- trunk/lib/plugin/Template.php 2012-12-03 17:42:48 UTC (rev 8594) +++ trunk/lib/plugin/Template.php 2012-12-04 12:49:42 UTC (rev 8595) @@ -112,7 +112,7 @@ $page = $page->name; } if (!$page) { - return $this->error(sprintf(_("A required argument '%s' is missing."), 'page')); + return $this->error(sprintf(_("A required argument “%s” is missing."), 'page')); } // If "Template:$page" exists, use it @@ -133,7 +133,7 @@ // Check if page exists if (!($dbi->isWikiPage($page))) { - return $this->error(sprintf(_("Page '%s' does not exist."), $page)); + return $this->error(sprintf(_("Page “%s” does not exist."), $page)); } // Check if user is allowed to get the Page. Modified: trunk/lib/plugin/TitleSearch.php =================================================================== --- trunk/lib/plugin/TitleSearch.php 2012-12-03 17:42:48 UTC (rev 8594) +++ trunk/lib/plugin/TitleSearch.php 2012-12-04 12:49:42 UTC (rev 8595) @@ -94,9 +94,9 @@ $s = WikiLink($args['s'], 'auto'); } if ($total) { - $pagelist->setCaption(fmt("Title search results for '%s' (%d total)", $s, $total)); + $pagelist->setCaption(fmt("Title search results for “%s” (%d total)", $s, $total)); } else { - $pagelist->setCaption(fmt("Title search results for '%s'", $s)); + $pagelist->setCaption(fmt("Title search results for “%s”", $s)); } } Modified: trunk/lib/plugin/TranslateText.php =================================================================== --- trunk/lib/plugin/TranslateText.php 2012-12-03 17:42:48 UTC (rev 8594) +++ trunk/lib/plugin/TranslateText.php 2012-12-04 12:49:42 UTC (rev 8595) @@ -92,7 +92,7 @@ 'author' => $user->getId()); } $text .= $user->getId() . " " . Iso8601DateTime() . "\n" . - "* " . sprintf(_("Translate '%s' to '%s' in *%s*"), + "* " . sprintf(_("Translate “%s” to “%s” in *%s*"), $pagename, $trans, $lang); $text .= "\n <verbatim>locale/po/$lang.po:\n msgid \"" . $pagename . "\"\n msgstr \"" . $trans . "\"\n </verbatim>"; $meta['summary'] = sprintf(_("Translate %s to %s in %s"), Modified: trunk/lib/plugin/UpLoad.php =================================================================== --- trunk/lib/plugin/UpLoad.php 2012-12-03 17:42:48 UTC (rev 8594) +++ trunk/lib/plugin/UpLoad.php 2012-12-04 12:49:42 UTC (rev 8595) @@ -213,7 +213,7 @@ $u_userfile = preg_replace("/ /", "%20", $u_userfile); $userfile_tmpname = $userfile->getTmpName(); $err_header = HTML::div(array('class' => 'error'), - HTML::p(fmt("ERROR uploading '%s'", $userfile_name))); + HTML::p(fmt("ERROR uploading “%s”", $userfile_name))); if (preg_match("/(\." . join("|\.", $this->disallowed_extensions) . ")(\.|\$)/i", $userfile_name) ) { Modified: trunk/lib/plugin/WikiAdminChmod.php =================================================================== --- trunk/lib/plugin/WikiAdminChmod.php 2012-12-03 17:42:48 UTC (rev 8594) +++ trunk/lib/plugin/WikiAdminChmod.php 2012-12-04 12:49:42 UTC (rev 8595) @@ -74,10 +74,10 @@ if ($perm = new PagePermission($acl)) { foreach ($pages as $name) { if ($perm->store($dbi->getPage($name))) { - $ul->pushContent(HTML::li(fmt("chmod page '%s' to '%s'.", $name, $permstring))); + $ul->pushContent(HTML::li(fmt("chmod page “%s” to “%s”.", $name, $permstring))); $count++; } else { - $ul->pushContent(HTML::li(fmt("Couldn't chmod page '%s' to '%s'.", $name, $permstring))); + $ul->pushContent(HTML::li(fmt("Couldn't chmod page “%s” to “%s”.", $name, $permstring))); } } } else { Modified: trunk/lib/plugin/WikiAdminChown.php =================================================================== --- trunk/lib/plugin/WikiAdminChown.php 2012-12-03 17:42:48 UTC (rev 8594) +++ trunk/lib/plugin/WikiAdminChown.php 2012-12-04 12:49:42 UTC (rev 8595) @@ -66,7 +66,7 @@ $newowner != $owner ) { if (!mayAccessPage('change', $name)) { - $ul->pushContent(HTML::li(fmt("Access denied to change page '%s'.", + $ul->pushContent(HTML::li(fmt("Access denied to change page “%s”.", WikiLink($name)))); } else { $version = $current->getVersion(); @@ -79,11 +79,11 @@ $page->set('owner', $newowner); $page->save($text, $version + 1, $meta); if ($page->get('owner') === $newowner) { - $ul->pushContent(HTML::li(fmt("Change owner of page '%s' to '%s'.", + $ul->pushContent(HTML::li(fmt("Change owner of page “%s” to “%s”.", WikiLink($name), WikiLink($newowner)))); $count++; } else { - $ul->pushContent(HTML::li(fmt("Could not change owner of page '%s' to '%s'.", + $ul->pushContent(HTML::li(fmt("Could not change owner of page “%s” to “%s”.", WikiLink($name), $newowner))); } } Modified: trunk/lib/plugin/WikiAdminDeleteAcl.php =================================================================== --- trunk/lib/plugin/WikiAdminDeleteAcl.php 2012-12-03 17:42:48 UTC (rev 8594) +++ trunk/lib/plugin/WikiAdminDeleteAcl.php 2012-12-04 12:49:42 UTC (rev 8595) @@ -58,12 +58,12 @@ $oldperm = getPagePermissions($page); setPagePermissions($page, $perm); $result->setAttr('class', 'feedback'); - $result->pushContent(HTML::p(fmt("ACL deleted for page '%s'", $pagename))); + $result->pushContent(HTML::p(fmt("ACL deleted for page “%s”", $pagename))); $current = $page->getCurrentRevision(); $version = $current->getVersion(); $meta = $current->_data; $text = $current->getPackedContent(); - $meta['summary'] = sprintf(_("ACL deleted for page '%s'"), $pagename); + $meta['summary'] = sprintf(_("ACL deleted for page “%s”"), $pagename); $meta['is_minor_edit'] = 1; $meta['author'] = $request->_user->UserName(); unset($meta['mtime']); // force new date Modified: trunk/lib/plugin/WikiAdminMarkup.php =================================================================== --- trunk/lib/plugin/WikiAdminMarkup.php 2012-12-03 17:42:48 UTC (rev 8594) +++ trunk/lib/plugin/WikiAdminMarkup.php 2012-12-04 12:49:42 UTC (rev 8595) @@ -66,7 +66,7 @@ if (!$markup or $newmarkup != $markup) { if (!mayAccessPage('change', $name)) { $result->setAttr('class', 'error'); - $result->pushContent(HTML::p(fmt("Access denied to change page '%s'.", + $result->pushContent(HTML::p(fmt("Access denied to change page “%s”.", WikiLink($name)))); } else { $version = $current->getVersion(); @@ -81,11 +81,11 @@ $page->save($text, $version + 1, $meta); $current = $page->getCurrentRevision(); if ($current->get('markup') === $newmarkup) { - $ul->pushContent(HTML::li(fmt("change page '%s' to markup type '%s'.", + $ul->pushContent(HTML::li(fmt("change page “%s” to markup type “%s”.", WikiLink($name), $newmarkup))); $count++; } else { - $ul->pushContent(HTML::li(fmt("Couldn't change page '%s' to markup type '%s'.", + $ul->pushContent(HTML::li(fmt("Couldn't change page “%s” to markup type “%s”.", WikiLink($name), $newmarkup))); } } Modified: trunk/lib/plugin/WikiAdminPurge.php =================================================================== --- trunk/lib/plugin/WikiAdminPurge.php 2012-12-03 17:42:48 UTC (rev 8594) +++ trunk/lib/plugin/WikiAdminPurge.php 2012-12-04 12:49:42 UTC (rev 8595) @@ -69,10 +69,10 @@ $name = str_replace(array('%5B', '%5D'), array('[', ']'), $name); if (mayAccessPage('purge', $name)) { $dbi->purgePage($name); - $ul->pushContent(HTML::li(fmt("Purged page '%s' successfully.", $name))); + $ul->pushContent(HTML::li(fmt("Purged page “%s” successfully.", $name))); $count++; } else { - $ul->pushContent(HTML::li(fmt("Didn't purge page '%s'. Access denied.", $name))); + $ul->pushContent(HTML::li(fmt("Didn't purge page “%s”. Access denied.", $name))); } } if ($count) { Modified: trunk/lib/plugin/WikiAdminRemove.php =================================================================== --- trunk/lib/plugin/WikiAdminRemove.php 2012-12-03 17:42:48 UTC (rev 8594) +++ trunk/lib/plugin/WikiAdminRemove.php 2012-12-04 12:49:42 UTC (rev 8595) @@ -113,10 +113,10 @@ $name = str_replace(array('%5B', '%5D'), array('[', ']'), $name); if (mayAccessPage('remove', $name)) { $dbi->deletePage($name); - $ul->pushContent(HTML::li(fmt("Removed page '%s' successfully.", $name))); + $ul->pushContent(HTML::li(fmt("Removed page “%s” successfully.", $name))); $count++; } else { - $ul->pushContent(HTML::li(fmt("Didn't remove page '%s'. Access denied.", $name))); + $ul->pushContent(HTML::li(fmt("Didn't remove page “%s”. Access denied.", $name))); } } if ($count) { Modified: trunk/lib/plugin/WikiAdminRename.php =================================================================== --- trunk/lib/plugin/WikiAdminRename.php 2012-12-03 17:42:48 UTC (rev 8594) +++ trunk/lib/plugin/WikiAdminRename.php 2012-12-04 12:49:42 UTC (rev 8595) @@ -83,9 +83,9 @@ if (strlen($newname) > MAX_PAGENAME_LENGTH) $ul->pushContent(HTML::li(_("Cannot rename. New page name too long."))); elseif ($dbi->isWikiPage($newname)) - $ul->pushContent(HTML::li(fmt("Page '%s' already exists. Ignored.", + $ul->pushContent(HTML::li(fmt("Page “%s” already exists. Ignored.", WikiLink($newname)))); elseif (!mayAccessPage('edit', $name)) - $ul->pushContent(HTML::li(fmt("Access denied to rename page '%s'.", + $ul->pushContent(HTML::li(fmt("Access denied to rename page “%s”.", WikiLink($name)))); elseif ($dbi->renamePage($name, $newname, $updatelinks)) { /* not yet implemented for all backends */ $page = $dbi->getPage($newname); @@ -93,7 +93,7 @@ $version = $current->getVersion(); $meta = $current->_data; $text = $current->getPackedContent(); - $meta['summary'] = sprintf(_("Renamed page from '%s' to '%s'."), $name, $newname); + $meta['summary'] = sprintf(_("Renamed page from “%s” to “%s”."), $name, $newname); $meta['is_minor_edit'] = 1; $meta['author'] = $request->_user->UserName(); unset($meta['mtime']); // force new date @@ -102,21 +102,21 @@ $page = $dbi->getPage($name); $text = "<<RedirectTo page=\"" . $newname . "\">>"; $meta['summary'] = - sprintf(_("Renaming created redirect page from '%s' to '%s'"), + sprintf(_("Renaming created redirect page from “%s” to “%s”"), $name, $newname); $meta['is_minor_edit'] = 0; $meta['author'] = $request->_user->UserName(); $page->save($text, 1, $meta); } - $ul->pushContent(HTML::li(fmt("Renamed page from '%s' to '%s'.", + $ul->pushContent(HTML::li(fmt("Renamed page from “%s” to “%s”.", $name, WikiLink($newname)))); $count++; } else { - $ul->pushContent(HTML::li(fmt("Couldn't rename page '%s' to '%s'.", + $ul->pushContent(HTML::li(fmt("Couldn't rename page “%s” to “%s”.", $name, $newname))); } } else { - $ul->pushContent(HTML::li(fmt("Couldn't rename page '%s' to '%s'.", + $ul->pushContent(HTML::li(fmt("Couldn't rename page “%s” to “%s”.", $name, $newname))); } } Modified: trunk/lib/plugin/WikiAdminSearchReplace.php =================================================================== --- trunk/lib/plugin/WikiAdminSearchReplace.php 2012-12-03 17:42:48 UTC (rev 8594) +++ trunk/lib/plugin/WikiAdminSearchReplace.php 2012-12-04 12:49:42 UTC (rev 8595) @@ -76,7 +76,7 @@ } if ($text != $newtext) { $meta = $current->_data; - $meta['summary'] = sprintf(_("Replace '%s' by '%s'"), $from, $to); + $meta['summary'] = sprintf(_("Replace “%s” by “%s”"), $from, $to); $meta['is_minor_edit'] = 0; $meta['author'] = $request->_user->UserName(); unset($meta['mtime']); // force new date @@ -97,9 +97,9 @@ $regex = !empty($post_args['regex']); foreach ($pages as $pagename) { if (!mayAccessPage('edit', $pagename)) { - $ul->pushContent(HTML::li(fmt("Access denied to change page '%s'.", $pagename))); + $ul->pushContent(HTML::li(fmt("Access denied to change page “%s”.", $pagename))); } elseif ($this->replaceHelper($dbi, $request, $pagename, $from, $to, $case_exact, $regex)) { - $ul->pushContent(HTML::li(fmt("Replaced '%s' with '%s' in page '%s'.", + $ul->pushContent(HTML::li(fmt("Replaced “%s” with “%s” in page “%s”.", $from, $to, WikiLink($pagename)))); $count++; } Modified: trunk/lib/plugin/WikiAdminSelect.php =================================================================== --- trunk/lib/plugin/WikiAdminSelect.php 2012-12-03 17:42:48 UTC (rev 8594) +++ trunk/lib/plugin/WikiAdminSelect.php 2012-12-04 12:49:42 UTC (rev 8595) @@ -205,7 +205,7 @@ // if the plugin requires more args than the pagename, // then this plugin will not return. (Rename, SearchReplace, ...) $action_result = $plugin->run($dbi, $plugin_args, $request, $basepage); - $ul->pushContent(HTML::li(fmt("Selected page '%s' passed to '%s'.", + $ul->pushContent(HTML::li(fmt("Selected page “%s” passed to “%s”.", $name, $select))); $ul->pushContent(HTML::ul(HTML::li($action_result))); } Modified: trunk/lib/plugin/WikiAdminSetAcl.php =================================================================== --- trunk/lib/plugin/WikiAdminSetAcl.php 2012-12-03 17:42:48 UTC (rev 8594) +++ trunk/lib/plugin/WikiAdminSetAcl.php 2012-12-04 12:49:42 UTC (rev 8595) @@ -93,15 +93,15 @@ $oldperm->sanify(); if ($oldperm and $perm->equal($oldperm->perm)) { $result->setAttr('class', 'error'); - $result->pushContent(HTML::p(fmt("ACL not changed for page '%s'.", $pagename))); + $result->pushContent(HTML::p(fmt("ACL not changed for page “%s”.", $pagename))); } elseif (mayAccessPage('change', $pagename)) { setPagePermissions($page, $perm); $result->setAttr('class', 'feedback'); - $result->pushContent(HTML::p(fmt("ACL changed for page '%s'", + $result->pushContent(HTML::p(fmt("ACL changed for page “%s”", $pagename))); - $result->pushContent(HTML::p(fmt("from '%s'", + $result->pushContent(HTML::p(fmt("from “%s”", $oldperm ? $oldperm->asAclLines() : "None"))); - $result->pushContent(HTML::p(fmt("to '%s'.", + $result->pushContent(HTML::p(fmt("to “%s”.", $perm->asAclLines()))); // Create new revision so that ACL change appears in history. @@ -109,7 +109,7 @@ $version = $current->getVersion(); $meta = $current->_data; $text = $current->getPackedContent(); - $meta['summary'] = sprintf(_("ACL changed for page '%s' from '%s' to '%s'."), + $meta['summary'] = sprintf(_("ACL changed for page “%s” from “%s” to “%s”."), $pagename, $oldperm ? $oldperm->asAclLines() : "None", $perm->asAclLines()); @@ -121,7 +121,7 @@ $count++; } else { $result->setAttr('class', 'error'); - $result->pushContent(HTML::p(fmt("Access denied to change page '%s'.", $pagename))); + $result->pushContent(HTML::p(fmt("Access denied to change page “%s”.", $pagename))); } } } else { Modified: trunk/lib/plugin/WikiAdminSetExternal.php =================================================================== --- trunk/lib/plugin/WikiAdminSetExternal.php 2012-12-03 17:42:48 UTC (rev 8594) +++ trunk/lib/plugin/WikiAdminSetExternal.php 2012-12-04 12:49:42 UTC (rev 8595) @@ -67,12 +67,12 @@ if (!$external) { if (!mayAccessPage('change', $name)) { $result->setAttr('class', 'error'); - $result->pushContent(HTML::p(fmt("Access denied to change page '%s'.", + $result->pushContent(HTML::p(fmt("Access denied to change page “%s”.", WikiLink($name)))); } else { $version = $current->getVersion(); $page->set('external', (bool)1); - $ul->pushContent(HTML::li(fmt("change page '%s' to external.", WikiLink($name)))); + $ul->pushContent(HTML::li(fmt("change page “%s” to external.", WikiLink($name)))); $count++; } } Modified: trunk/lib/plugin/WikiBlog.php =================================================================== --- trunk/lib/plugin/WikiBlog.php 2012-12-03 17:42:48 UTC (rev 8594) +++ trunk/lib/plugin/WikiBlog.php 2012-12-04 12:49:42 UTC (rev 8595) @@ -154,7 +154,7 @@ $html->pushContent($this->showForm($request, $args)); break; default: - return $this->error(sprintf("Bad mode ('%s')", $show)); + return $this->error(sprintf("Bad mode (“%s”)", $show)); } } return $html; Modified: trunk/lib/plugin/WikiFormRich.php =================================================================== --- trunk/lib/plugin/WikiFormRich.php 2012-12-03 17:42:48 UTC (rev 8594) +++ trunk/lib/plugin/WikiFormRich.php 2012-12-04 12:49:42 UTC (rev 8595) @@ -176,7 +176,7 @@ { extract($this->getArgs($argstr, $request)); if (empty($action)) { - return $this->error(fmt("A required argument '%s' is missing.", "action")); + return $this->error(fmt("A required argument “%s” is missing.", "action")); } $form = HTML::form(array('action' => $request->getPostURL(), @@ -193,7 +193,7 @@ $text = ''; if ($inputtype != 'submit') { if (empty($input['name'])) - return $this->error(fmt("A required argument '%s' is missing.", + return $this->error(fmt("A required argument “%s” is missing.", $inputtype . "[][name]")); if (!isset($input['text'])) $input['text'] = gettext($input['name']); $text = $input['text']; Modified: trunk/lib/plugin/WikiForum.php =================================================================== --- trunk/lib/plugin/WikiForum.php 2012-12-03 17:42:48 UTC (rev 8594) +++ trunk/lib/plugin/WikiForum.php 2012-12-04 12:49:42 UTC (rev 8595) @@ -72,7 +72,7 @@ { $args = $this->getArgs($argstr, $request); if (!$args['pagename']) { - return $this->error(sprintf(_("A required argument '%s' is missing."), 'pagename')); + return $this->error(sprintf(_("A required argument “%s” is missing."), 'pagename')); } // Get our form args. @@ -102,7 +102,7 @@ $html->pushContent($this->showForm($request, $args, 'forumadd')); break; default: - return $this->error(sprintf("Bad mode ('%s')", $show)); + return $this->error(sprintf("Bad mode (“%s”)", $show)); } } // FIXME: on empty showTopics() and mode!=add and mode!=summary provide a showForm() here. Modified: trunk/lib/plugin/WikiPoll.php =================================================================== --- trunk/lib/plugin/WikiPoll.php 2012-12-03 17:42:48 UTC (rev 8594) +++ trunk/lib/plugin/WikiPoll.php 2012-12-04 12:49:42 UTC (rev 8595) @@ -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); } @@ -146,7 +146,7 @@ $request->setArg('nocache', 'purge'); $args = $this->getArgs($argstr, $request); if (!$args['page']) { - return $this->error(sprintf(_("A required argument '%s' is missing."), 'page')); + return $this->error(sprintf(_("A required argument “%s” is missing."), 'page')); } if (!empty($args['admin']) and $request->_user->isAdmin()) { // reset statistics Modified: trunk/lib/plugin/_AuthInfo.php =================================================================== --- trunk/lib/plugin/_AuthInfo.php 2012-12-03 17:42:48 UTC (rev 8594) +++ trunk/lib/plugin/_AuthInfo.php 2012-12-04 12:49:42 UTC (rev 8595) @@ -96,7 +96,7 @@ unset($DBAuthParams['dummy']); $table->pushContent($this->_showhash("\$DBAuthParams[]", $DBAuthParams)); $html->pushContent($table); - $html->pushContent(HTML(HTML::h3(fmt("Personal Auth Settings for '%s'", $userid)))); + $html->pushContent(HTML(HTML::h3(fmt("Personal Auth Settings for “%s”", $userid)))); if (!$user) { $html->pushContent(HTML::p(fmt("No userid"))); } else { Modified: trunk/lib/plugin/_BackendInfo.php =================================================================== --- trunk/lib/plugin/_BackendInfo.php 2012-12-03 17:42:48 UTC (rev 8594) +++ trunk/lib/plugin/_BackendInfo.php 2012-12-04 12:49:42 UTC (rev 8595) @@ -54,7 +54,7 @@ $this->readonly_pagemeta = array(); $this->hidden_pagemeta = array('_cached_html'); - $html = HTML(HTML::h3(fmt("Querying backend directly for '%s'", + $html = HTML(HTML::h3(fmt("Querying backend directly for “%s”", $page))); $table = HTML::table(array('border' => 1, Modified: trunk/lib/plugin/_Retransform.php =================================================================== --- trunk/lib/plugin/_Retransform.php 2012-12-03 17:42:48 UTC (rev 8594) +++ trunk/lib/plugin/_Retransform.php 2012-12-04 12:49:42 UTC (rev 8595) @@ -49,7 +49,7 @@ if (empty($page)) return ''; - $html = HTML(HTML::h3(fmt("Retransform page '%s'", + $html = HTML(HTML::h3(fmt("Retransform page “%s”", $page))); // bypass WikiDB and cache, go directly through the backend. Modified: trunk/lib/plugin/text2png.php =================================================================== --- trunk/lib/plugin/text2png.php 2012-12-03 17:42:48 UTC (rev 8594) +++ trunk/lib/plugin/text2png.php 2012-12-04 12:49:42 UTC (rev 8595) @@ -223,7 +223,7 @@ 'alt' => $text, 'title' => '"' . $text . '"' . _(" produced by ") . $this->getName()))); } else { - trigger_error(sprintf(_("couldn't open file '%s' for writing"), + trigger_error(sprintf(_("couldn't open file “%s” for writing"), $filepath . $filename), E_USER_NOTICE); } return $html; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |