From 853100b6332f22a9b099585072374e356687c5ff Mon Sep 17 00:00:00 2001 From: vargenau Date: Thu, 12 Feb 2015 10:05:45 +0000 Subject: [PATCH] Spelling: seperator --> separator git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@9532 96ab9672-09ca-45d6-a79d-3d69d39ca109 --- doc/HISTORY | 2 +- lib/FileFinder.php | 5 +---- lib/PageList.php | 12 ++++++------ lib/SemanticWeb.php | 2 +- lib/TextSearchQuery.php | 2 +- lib/plugin/SystemInfo.php | 10 +++++----- lib/plugin/Template.php | 2 +- lib/stdlib.php | 6 +++--- locale/de/pgsrc/Hilfe%2FVorlagePlugin | 4 ++-- pgsrc/ReleaseNotes | 4 ++-- 10 files changed, 23 insertions(+), 26 deletions(-) diff --git a/doc/HISTORY b/doc/HISTORY index 608a1cba4..e75450e8e 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -64,7 +64,7 @@ changes: adds PHPWIKI_DIR if started from another dir, lib/pear also ** fix slashify for Windows * check more config-default and predefined constants -* AutoSplit pagenames at subpage seperators, esp for Sidebar theme +* AutoSplit pagenames at subpage separators, esp for Sidebar theme * improve Pagelist layout by equal pagename width for limited lists * added CPAN to interwiki.map * ExternalSearchPlugin useimage arg (RFE #952323) diff --git a/lib/FileFinder.php b/lib/FileFinder.php index e0d5d2075..f4f19be57 100644 --- a/lib/FileFinder.php +++ b/lib/FileFinder.php @@ -58,7 +58,7 @@ class FileFinder } /** - * Force using '/' as path seperator. + * Force using '/' as path separator. * * @param string $path * @param string $sep @@ -226,15 +226,12 @@ class FileFinder /** * The system-dependent path-separator character. On UNIX systems, * this character is ':'; on Win32 systems it is ';'. - * Fixme: - * On Mac it cannot be : because this is the seperator there! * * @return string path_separator. */ public function _get_ini_separator() { return isWindows() ? ';' : ':'; - // return preg_match('/^Windows/', php_uname()) } /** diff --git a/lib/PageList.php b/lib/PageList.php index e7bd450cf..3606e47de 100644 --- a/lib/PageList.php +++ b/lib/PageList.php @@ -1839,15 +1839,15 @@ class PageList private function generateCommaListAsString() { if (defined($this->_options['commasep'])) - $seperator = $this->_options['commasep']; + $separator = $this->_options['commasep']; else - $seperator = ', '; + $separator = ', '; $pages = array(); foreach ($this->_pages as $pagenum => $page) { if ($s = $this->renderPageRow($page)) // some pages are not viewable $pages[] = is_string($s) ? $s : $s->asString(); } - return HTML(join($seperator, $pages)); + return HTML(join($separator, $pages)); } // comma=2 @@ -1858,15 +1858,15 @@ class PageList private function generateCommaList() { if (defined($this->_options['commasep'])) - $seperator = HTML::raw($this->_options['commasep']); + $separator = HTML::raw($this->_options['commasep']); else - $seperator = ', '; + $separator = ', '; $html = HTML(); $html->pushContent($this->renderPageRow($this->_pages[0])); next($this->_pages); foreach ($this->_pages as $pagenum => $page) { if ($s = $this->renderPageRow($page)) // some pages are not viewable - $html->pushContent($seperator, $s); + $html->pushContent($separator, $s); } return $html; } diff --git a/lib/SemanticWeb.php b/lib/SemanticWeb.php index dff3a2b8d..5e01eea0b 100644 --- a/lib/SemanticWeb.php +++ b/lib/SemanticWeb.php @@ -304,7 +304,7 @@ class SemanticAttributeSearchQuery } /** - * Strip non-numeric chars from the variable (as the groupseperator) and replace + * Strip non-numeric chars from the variable (as the group separator) and replace * it in the symbolic query for evaluation. * This version unifies the attribute values from the database to a * numeric basevalue before comparison. (area:=963.6km^2 => 9.366e+08 m^2) diff --git a/lib/TextSearchQuery.php b/lib/TextSearchQuery.php index 3a22d244a..078a7115a 100644 --- a/lib/TextSearchQuery.php +++ b/lib/TextSearchQuery.php @@ -467,7 +467,7 @@ class NumericSearchQuery } /** - * Strip non-numeric chars from the variable (as the groupseperator) and replace + * Strip non-numeric chars from the variable (as the group separator) and replace * it in the symbolic query for evaluation. * * @param $value number A numerical value: integer, float or string. diff --git a/lib/plugin/SystemInfo.php b/lib/plugin/SystemInfo.php index bf6d4440a..d4e2a04cb 100644 --- a/lib/plugin/SystemInfo.php +++ b/lib/plugin/SystemInfo.php @@ -101,7 +101,7 @@ class WikiPlugin_SystemInfo function getDefaultArguments() { - return array( // 'seperator' => ' ', // on multiple args + return array( // 'separator' => ' ', // on multiple args ); } @@ -518,7 +518,7 @@ class WikiPlugin_SystemInfo // don't parse argstr for name=value pairs. instead we use just 'name' //$args = $this->getArgs($argstr, $request); $this->_dbi =& $dbi; - $args['seperator'] = ' '; + $args['separator'] = ' '; $availableargs = // name => callback + 0 args array('appname' => create_function('', "return 'PhpWiki';"), 'version' => create_function('', "return sprintf('%s', PHPWIKI_VERSION);"), @@ -573,11 +573,11 @@ class WikiPlugin_SystemInfo if (is_object($o)) return $o; else - $output .= ($o . $args['seperator']); + $output .= ($o . $args['separator']); } - // if more than one arg, remove the trailing seperator + // if more than one arg, remove the trailing separator if ($output) $output = substr($output, 0, - -strlen($args['seperator'])); + -strlen($args['separator'])); return HTML($output); } } diff --git a/lib/plugin/Template.php b/lib/plugin/Template.php index 652526fe1..dd7e1ed58 100644 --- a/lib/plugin/Template.php +++ b/lib/plugin/Template.php @@ -25,7 +25,7 @@ * Template: Parametrized blocks. * Include text from a wiki page and replace certain placeholders by parameters. * Similiar to CreatePage with the template argument, but at run-time. - * Similiar to the mediawiki templates but not with the "|" parameter seperator. + * Similiar to the mediawiki templates but not with the "|" parameter separator. * Usage: <