https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114144
Revision: 114144 Author: reedy Date: 2012-03-19 14:59:29 +0000 (Mon, 19 Mar 2012) Log Message: ----------- Many other occurance/occurence typos Modified Paths: -------------- trunk/extensions/AbuseFilter/AbuseFilter.i18n.php trunk/extensions/Arrays/Arrays.php trunk/extensions/Arrays/RELEASE-NOTES trunk/extensions/Chemistry/SpecialChemicalsources.php trunk/extensions/Chemistry/SpecialChemicalsources_body.php trunk/extensions/Cite/Cite_body.php trunk/extensions/DSMW/files/utils.php trunk/extensions/DSMW/includes/SemanticFunctions.php trunk/extensions/DSMW/logootComponent/logootEngine.php trunk/extensions/DynamicPageList/DPL.php trunk/extensions/DynamicPageList/DynamicPageListInclude.php trunk/extensions/FreqPatternTagCloud/includes/computation/FrequentPatternAlgorithm.php trunk/extensions/Gnuplot/Gnuplot.php trunk/extensions/InlineEditor/SentenceEditor/SentenceEditor.class.php trunk/extensions/LiveTranslate/includes/jquery.liveTranslate.js trunk/extensions/MetaKeywords/MetaKeywords.i18n.php trunk/extensions/MobileFrontend/library/WURFL/Handlers/Utils.php trunk/extensions/QPoll/Excel/PEAR.php trunk/extensions/SemanticMediaWiki/includes/queryprinters/SMW_QP_Aggregatable.php trunk/extensions/SemanticMediaWiki/languages/SMW_Messages.php trunk/extensions/SemanticResultFormats/ValueRank/SRF_ValueRank.php trunk/extensions/SimpleSecurity/SimpleSecurity_body.php trunk/extensions/Sternograph/Sternograph.body.php trunk/extensions/StringFunctions/StringFunctions.php trunk/extensions/StringFunctionsEscaped/README trunk/extensions/StringFunctionsEscaped/StringFunctionsEscaped.php trunk/extensions/Translate/TranslateUtils.php trunk/extensions/TreeAndMenu/TreeAndMenu.php trunk/extensions/WikiForum/WikiForum.i18n.php trunk/extensions/Wikidata/OmegaWiki/Test.skeleton.php Modified: trunk/extensions/AbuseFilter/AbuseFilter.i18n.php =================================================================== --- trunk/extensions/AbuseFilter/AbuseFilter.i18n.php 2012-03-19 14:55:12 UTC (rev 114143) +++ trunk/extensions/AbuseFilter/AbuseFilter.i18n.php 2012-03-19 14:59:29 UTC (rev 114144) @@ -690,7 +690,7 @@ 'abusefilter-edit-throttle-period' => 'Field label for entering a time period.', 'abusefilter-edit-throttle-seconds' => 'Throttle period in seconds. Parameters: * $1 is a number of seconds.', - 'abusefilter-edit-throttle-groups' => 'Field label for properties to group throttle counts by (for example IP address and username). Throttling is the concept of limiting occurances of a certain action in a given time frame.', + 'abusefilter-edit-throttle-groups' => 'Field label for properties to group throttle counts by (for example IP address and username). Throttling is the concept of limiting occurrences of a certain action in a given time frame.', 'abusefilter-edit-warn-message' => 'Field label for dropdown list with system messages.', 'abusefilter-edit-warn-other' => 'Option in dropdown menu to specify no item from the list should be used.', 'abusefilter-edit-warn-other-label' => 'Field label for entering a system message key to use as warning text.', Modified: trunk/extensions/Arrays/Arrays.php =================================================================== --- trunk/extensions/Arrays/Arrays.php 2012-03-19 14:55:12 UTC (rev 114143) +++ trunk/extensions/Arrays/Arrays.php 2012-03-19 14:59:29 UTC (rev 114144) @@ -446,8 +446,8 @@ /** - * locate the index of the first occurence of an element starting from the 'index' - * - print "-1" (not found) or index (found) to show the index of the first occurence of 'value' in the array identified by arrayid + * locate the index of the first occurrence of an element starting from the 'index' + * - print "-1" (not found) or index (found) to show the index of the first occurrence of 'value' in the array identified by arrayid * - if 'yes' and 'no' are set, print value of them when found or not-found * - index is 0-based , it must be non-negative and less than lenth * usage: Modified: trunk/extensions/Arrays/RELEASE-NOTES =================================================================== --- trunk/extensions/Arrays/RELEASE-NOTES 2012-03-19 14:55:12 UTC (rev 114143) +++ trunk/extensions/Arrays/RELEASE-NOTES 2012-03-19 14:59:29 UTC (rev 114144) @@ -149,7 +149,7 @@ - update '#arraysort:' adding "random" option to make the array of values in random order - add '#arrayreset' to free all defined arrays for memory saving - add '#arrayslice' to return an array bounded by start_index and length. - - add '#arraysearch.' now we can return the index of the first occurence of an element, return -1 if + - add '#arraysearch.' now we can return the index of the first occurrence of an element, return -1 if not found - remove '#arraymember,' obsoleted by '#arraysearch' - remove '#arraypush,' obsoleted by '#arraydefine' and '#arraymerge' @@ -172,4 +172,4 @@ '#arraypush' (replaced by arraymerge) '#arraypop' (replaced by arrayslice) '#arraymember' (replaced by arraysearch) - ------------------------------------------- \ No newline at end of file + ------------------------------------------- Modified: trunk/extensions/Chemistry/SpecialChemicalsources.php =================================================================== --- trunk/extensions/Chemistry/SpecialChemicalsources.php 2012-03-19 14:55:12 UTC (rev 114143) +++ trunk/extensions/Chemistry/SpecialChemicalsources.php 2012-03-19 14:59:29 UTC (rev 114144) @@ -24,8 +24,8 @@ * 1) Write your own i18n file (see instructions there) * 2) copy this file to the name of your specialpage, and in that file: * 3) make the line "require_once( 'ChemFunctions.i18n.php' );" call your i18n file - * 4) Replace all the occurences of the word 'chemicalsources' with the name of your specialpage - * 5) Replace every occurence of the word ChemFunctions with your chosen prefix from your i18n. + * 4) Replace all the occurrences of the word 'chemicalsources' with the name of your specialpage + * 5) Replace every occurrence of the word ChemFunctions with your chosen prefix from your i18n. * 6) rewrite the function TransposeAndCheckParams * You will get a list $Params which contains: $Params['paramname']='value' * You have to return a list which contains: $transParams['thestringtoreplaceinyourpage'] = 'withwhatitshouldbereplaced' Modified: trunk/extensions/Chemistry/SpecialChemicalsources_body.php =================================================================== --- trunk/extensions/Chemistry/SpecialChemicalsources_body.php 2012-03-19 14:55:12 UTC (rev 114143) +++ trunk/extensions/Chemistry/SpecialChemicalsources_body.php 2012-03-19 14:59:29 UTC (rev 114144) @@ -9,7 +9,7 @@ * To write the i18n so that it functions with another listpage: * 1) copy this file to the i18n of your choice * 2) Choose your prefix (the best way, if this i18n file is called YourPrefix, then choose that as your Prefix - * 3) Replace all occurences of ChemFunctions with the name of your Prefix. + * 3) Replace all occurrences of ChemFunctions with the name of your Prefix. * 4) $wgYourPrefix_Parameters should contain the names of the parameters as they can be given to your specialpage * In the ListPage you have created, the Magiccodes are then $ParameterName, so if the Parameter is called 'WhAtEvEr', * then in the ListPage $WhAtEvEr will be replaced with the value of the parameter WhAtEvEr Modified: trunk/extensions/Cite/Cite_body.php =================================================================== --- trunk/extensions/Cite/Cite_body.php 2012-03-19 14:55:12 UTC (rev 114143) +++ trunk/extensions/Cite/Cite_body.php 2012-03-19 14:59:29 UTC (rev 114144) @@ -510,7 +510,7 @@ $this->mRefs[$group][$key]['text'] = null; # continue without break case 'increment': - # Rollback increase in named ref occurences. + # Rollback increase in named ref occurrences. $this->mRefs[$group][$key]['count']--; break; } @@ -890,7 +890,7 @@ * @param $group * @param $key string The key for the link * @param $count int The index of the key, used for distinguishing - * multiple occurances of the same key + * multiple occurrences of the same key * @param $label int The label to use for the link, I want to * use the same label for all occourances of * the same named reference. Modified: trunk/extensions/DSMW/files/utils.php =================================================================== --- trunk/extensions/DSMW/files/utils.php 2012-03-19 14:55:12 UTC (rev 114143) +++ trunk/extensions/DSMW/files/utils.php 2012-03-19 14:59:29 UTC (rev 114144) @@ -444,7 +444,7 @@ /** * tests if the patch is remote * @param <String> $patchId - * @return <int or bool> false if no occurence + * @return <int or bool> false if no occurrence */ static function isRemote( $patchId ) { $serverId = DSMWSiteId::getInstance(); Modified: trunk/extensions/DSMW/includes/SemanticFunctions.php =================================================================== --- trunk/extensions/DSMW/includes/SemanticFunctions.php 2012-03-19 14:55:12 UTC (rev 114143) +++ trunk/extensions/DSMW/includes/SemanticFunctions.php 2012-03-19 14:59:29 UTC (rev 114144) @@ -141,7 +141,7 @@ // get hasPushHead Value if exists $start = "[[hasPushHead::"; $val1 = strpos( $pageContent, $start ); - if ( $val1 !== false ) {// if there is an occurence of [[hasPushHead:: + if ( $val1 !== false ) {// if there is an occurrence of [[hasPushHead:: $startVal = $val1 + strlen( $start ); $end = "]]"; $endVal = strpos( $pageContent, $end, $startVal ); @@ -151,7 +151,7 @@ $result = str_replace( $value, $CSID, $pageContent ); $pageContent = $result; if ( $result == "" )return false; - } else {// no occurence of [[hasPushHead:: , we add + } else {// no occurrence of [[hasPushHead:: , we add $pageContent .= ' hasPushHead: [[hasPushHead::' . $CSID . ']]'; } // save update @@ -303,7 +303,7 @@ // get hasPushHead Value if exists $start = "[[hasPullHead::"; $val1 = strpos( $pageContent, $start ); - if ( $val1 !== false ) {// if there is an occurence of [[hasPushHead:: + if ( $val1 !== false ) {// if there is an occurrence of [[hasPushHead:: $startVal = $val1 + strlen( $start ); $end = "]]"; $endVal = strpos( $pageContent, $end, $startVal ); @@ -313,7 +313,7 @@ $result = str_replace( $value, $CSID, $pageContent ); $pageContent = $result; if ( $result == "" )return false; - } else {// no occurence of [[hasPushHead:: , we add + } else {// no occurrence of [[hasPushHead:: , we add $pageContent .= ' hasPullHead: [[hasPullHead::' . $CSID . ']]'; } // save update Modified: trunk/extensions/DSMW/logootComponent/logootEngine.php =================================================================== --- trunk/extensions/DSMW/logootComponent/logootEngine.php 2012-03-19 14:55:12 UTC (rev 114143) +++ trunk/extensions/DSMW/logootComponent/logootEngine.php 2012-03-19 14:59:29 UTC (rev 114144) @@ -526,7 +526,7 @@ return $droite; } - // if there is no occurence + // if there is no occurrence ksort( $arr, SORT_NUMERIC ); reset( $arr ); $firstElementKey = key( $arr ); Modified: trunk/extensions/DynamicPageList/DPL.php =================================================================== --- trunk/extensions/DynamicPageList/DPL.php 2012-03-19 14:55:12 UTC (rev 114143) +++ trunk/extensions/DynamicPageList/DPL.php 2012-03-19 14:59:29 UTC (rev 114144) @@ -1280,8 +1280,8 @@ foreach ( $matches as $matchA ) { $matchCount = count( $matchA ); - foreach ( $matchA as $occurence => $matchB ) { - if ( $occurence < $call ) { + foreach ( $matchA as $occurrence => $matchB ) { + if ( $occurrence < $call ) { continue; } $match = $matchB[0]; @@ -1460,12 +1460,12 @@ ); } - // format one item of an entry in the output list (i.e. the collection of occurences of one item from the include parameter) + // format one item of an entry in the output list (i.e. the collection of occurrences of one item from the include parameter) function formatItem( $piece, $tagStart, $tagEnd ) { return $tagStart . $piece . $tagEnd; } - // format one single item of an entry in the output list (i.e. one occurence of one item from the include parameter) + // format one single item of an entry in the output list (i.e. one occurrence of one item from the include parameter) function formatSingleItems( &$pieces, $s, $article ) { $firstCall = true; foreach ( $pieces as $key => $val ) { @@ -1500,7 +1500,7 @@ } } - // format one single template argument of one occurence of one item from the include parameter + // format one single template argument of one occurrence of one item from the include parameter // is called via a backlink from DPLInclude::includeTemplate() function formatTemplateArg( $arg, $s, $argNr, $firstCall, $maxlen, $article ) { // we could try to format fields differently within the first call of a template Modified: trunk/extensions/DynamicPageList/DynamicPageListInclude.php =================================================================== --- trunk/extensions/DynamicPageList/DynamicPageListInclude.php 2012-03-19 14:55:12 UTC (rev 114143) +++ trunk/extensions/DynamicPageList/DynamicPageListInclude.php 2012-03-19 14:59:29 UTC (rev 114144) @@ -561,7 +561,7 @@ // template inclusion - find the place(s) where template1 is called, // replace its name by template2, then expand template2 and return the result - // we return an array containing all occurences of the template call which match the condition "$mustMatch" + // we return an array containing all occurrences of the template call which match the condition "$mustMatch" // and do NOT match the condition "$mustNotMatch" (if specified) // we use a callback function to format retrieved parameters, accessible via $dpl->formatTemplateArg() public static function includeTemplate( $parser, $dpl, $dplNr, $article, Modified: trunk/extensions/FreqPatternTagCloud/includes/computation/FrequentPatternAlgorithm.php =================================================================== --- trunk/extensions/FreqPatternTagCloud/includes/computation/FrequentPatternAlgorithm.php 2012-03-19 14:55:12 UTC (rev 114143) +++ trunk/extensions/FreqPatternTagCloud/includes/computation/FrequentPatternAlgorithm.php 2012-03-19 14:59:29 UTC (rev 114144) @@ -26,7 +26,7 @@ $numerator = 0; $denominator = 0; foreach ($transactions as $transaction) { - // For each occurence of the assumption -> increase denominator + // For each occurrence of the assumption -> increase denominator // If the conclusion occurs too -> increase numerator // Check if transaction contains assumption Modified: trunk/extensions/Gnuplot/Gnuplot.php =================================================================== --- trunk/extensions/Gnuplot/Gnuplot.php 2012-03-19 14:55:12 UTC (rev 114143) +++ trunk/extensions/Gnuplot/Gnuplot.php 2012-03-19 14:59:29 UTC (rev 114144) @@ -77,7 +77,7 @@ fwrite($handle, $wgGnuplotDefaultSize . "\n"); } - // Need to find each occurance of src:<FILE NAME> and replace it + // Need to find each occurrence of src:<FILE NAME> and replace it // with the complete file path while (strpos($gnuplotsrc, 'src:') != false) { $srcStartPosition = strpos ($gnuplotsrc, 'src:') + strlen("src:"); Modified: trunk/extensions/InlineEditor/SentenceEditor/SentenceEditor.class.php =================================================================== --- trunk/extensions/InlineEditor/SentenceEditor/SentenceEditor.class.php 2012-03-19 14:55:12 UTC (rev 114143) +++ trunk/extensions/InlineEditor/SentenceEditor/SentenceEditor.class.php 2012-03-19 14:59:29 UTC (rev 114144) @@ -44,7 +44,7 @@ } /** - * Replaces all occurences of unsupported wikitext by spaces. This is to make sure the + * Replaces all occurrences of unsupported wikitext by spaces. This is to make sure the * positions of what's left are still the same as those in the original wikitext * @param $wikitext string * @return string @@ -97,7 +97,7 @@ // split where there are at least two spaces, or a newline, or the beginning of the text $splits = preg_split( '/\s\s+|\n\s*|^/', $wikitext, -1, PREG_SPLIT_OFFSET_CAPTURE ); - // remove small occurences + // remove small occurrences foreach ( $splits as $index => $split ) { if ( strlen( $split[0] ) < 2 ) unset( $splits[$index] ); } Modified: trunk/extensions/LiveTranslate/includes/jquery.liveTranslate.js =================================================================== --- trunk/extensions/LiveTranslate/includes/jquery.liveTranslate.js 2012-03-19 14:55:12 UTC (rev 114143) +++ trunk/extensions/LiveTranslate/includes/jquery.liveTranslate.js 2012-03-19 14:59:29 UTC (rev 114144) @@ -134,7 +134,7 @@ }; /** - * Obtain the special words and wrap occurances of them into notranslate spans. + * Obtain the special words and wrap occurrences of them into notranslate spans. * * @since 1.2 * @@ -253,4 +253,4 @@ return this; -}; } )( window.jQuery, window.liveTranslate ); \ No newline at end of file +}; } )( window.jQuery, window.liveTranslate ); Modified: trunk/extensions/MetaKeywords/MetaKeywords.i18n.php =================================================================== --- trunk/extensions/MetaKeywords/MetaKeywords.i18n.php 2012-03-19 14:55:12 UTC (rev 114143) +++ trunk/extensions/MetaKeywords/MetaKeywords.i18n.php 2012-03-19 14:59:29 UTC (rev 114144) @@ -14,7 +14,7 @@ # The namespaces identifiers (all) and (main) specify a default for all namespaces and the zeroth namespace respectively.', 'metadescription' => ' # Add lines to this page in the form "namespace|description tag to set" # The namespaces identifiers (all) and (main) specify a default for all namespaces and the zeroth namespace respectively. - # Any occurences of $1 will be replaced by the current page\'s title.' + # Any occurrences of $1 will be replaced by the current page\'s title.' ); /** Message documentation (Message documentation) Modified: trunk/extensions/MobileFrontend/library/WURFL/Handlers/Utils.php =================================================================== --- trunk/extensions/MobileFrontend/library/WURFL/Handlers/Utils.php 2012-03-19 14:55:12 UTC (rev 114143) +++ trunk/extensions/MobileFrontend/library/WURFL/Handlers/Utils.php 2012-03-19 14:59:29 UTC (rev 114144) @@ -174,12 +174,12 @@ } /** - * The nth($ordinal) occurance of $needle in $haystack or -1 if no match is found + * The nth($ordinal) occurrence of $needle in $haystack or -1 if no match is found * @param string $haystack * @param string $needle * @param int $ordinal * @throws InvalidArgumentException - * @return int Char index of occurance + * @return int Char index of occurrence */ public static function ordinalIndexOf($haystack, $needle, $ordinal) { if (is_null ( $haystack ) || empty ( $haystack )) { @@ -206,7 +206,7 @@ } /** - * First occurance of a / character + * First occurrence of a / character * @param string $string Haystack * @return int Char index */ @@ -216,7 +216,7 @@ } /** - * Second occurance of a / character + * Second occurrence of a / character * @param string $string Haystack * @return int Char index */ @@ -228,7 +228,7 @@ } /** - * First occurance of a space character + * First occurrence of a space character * @param string $string Haystack * @return int Char index */ @@ -238,7 +238,7 @@ } /** - * First occurance of a ; character or length + * First occurrence of a ; character or length * @param string $string Haystack * @return int Char index */ @@ -247,7 +247,7 @@ } /** - * First occurance of $toMatch string or length + * First occurrence of $toMatch string or length * @param string $string Haystack * @param string $toMatch Needle * @return int Char index @@ -339,4 +339,4 @@ public static function removeLocale($userAgent) { return preg_replace ( self::LANGUAGE_PATTERN, "", $userAgent, 1 ); } -} \ No newline at end of file +} Modified: trunk/extensions/QPoll/Excel/PEAR.php =================================================================== --- trunk/extensions/QPoll/Excel/PEAR.php 2012-03-19 14:55:12 UTC (rev 114143) +++ trunk/extensions/QPoll/Excel/PEAR.php 2012-03-19 14:59:29 UTC (rev 114144) @@ -433,7 +433,7 @@ // {{{ delExpect() /** - * This method deletes all occurences of the specified element from + * This method deletes all occurrences of the specified element from * the expected error codes stack. * * @param mixed $error_code error code that should be deleted Modified: trunk/extensions/SemanticMediaWiki/includes/queryprinters/SMW_QP_Aggregatable.php =================================================================== --- trunk/extensions/SemanticMediaWiki/includes/queryprinters/SMW_QP_Aggregatable.php 2012-03-19 14:55:12 UTC (rev 114143) +++ trunk/extensions/SemanticMediaWiki/includes/queryprinters/SMW_QP_Aggregatable.php 2012-03-19 14:59:29 UTC (rev 114144) @@ -109,7 +109,7 @@ } /** - * Counts all the occurances of all values in the query result, + * Counts all the occurrences of all values in the query result, * and returns an array with as key the value and as value the count. * * @since 1.7 Modified: trunk/extensions/SemanticMediaWiki/languages/SMW_Messages.php =================================================================== --- trunk/extensions/SemanticMediaWiki/languages/SMW_Messages.php 2012-03-19 14:55:12 UTC (rev 114143) +++ trunk/extensions/SemanticMediaWiki/languages/SMW_Messages.php 2012-03-19 14:59:29 UTC (rev 114144) @@ -74,8 +74,8 @@ 'smw_paramdesc_default' => 'The text to display if there are no query results', 'smw_paramdesc_searchlabel' => 'The text for the link to results', 'smw_paramdesc_sep' => 'The separator for values', - 'smw-paramdesc-distribution' => 'Instead of displaying all values, count their occurances, and show these.', - 'smw-paramdesc-distributionsort' => 'Sort the value distribution by occurance count.', + 'smw-paramdesc-distribution' => 'Instead of displaying all values, count their occurrences, and show these.', + 'smw-paramdesc-distributionsort' => 'Sort the value distribution by occurrence count.', 'smw-paramdesc-distributionlimit' => 'Limit the value distribution to the count of only some values.', 'smw_paramdesc_template' => 'The name of a template with which to display the printouts', 'smw_paramdesc_columns' => 'The number of columns in which to display results (default is $1)', @@ -3770,7 +3770,7 @@ 'smw_nounitsdeclared' => "Aucune unité de mesure n'a été déclarée pour cette propriété.", 'smw_novalues' => 'Aucune valeur n’a été spécifiée.', 'smw_nodatetime' => 'La date « $1 » n’a pas été comprise.', - 'smw_toomanyclosing' => 'Il semble y avoir trop d’occurences de « $1 » dans la requête.', + 'smw_toomanyclosing' => 'Il semble y avoir trop d’occurrences de « $1 » dans la requête.', 'smw_noclosingbrackets' => 'Certains « <nowiki>[[</nowiki> » dans votre requête n’ont pas été clos par des « ]] » correspondants.', 'smw_misplacedsymbol' => 'Le symbole « $1 » a été utilisé à un endroit où il n’est pas utile.', 'smw_unexpectedpart' => 'La partie « $1 » de la requête n’a pas été comprise. Les résultats peuvent être inattendus.', Modified: trunk/extensions/SemanticResultFormats/ValueRank/SRF_ValueRank.php =================================================================== --- trunk/extensions/SemanticResultFormats/ValueRank/SRF_ValueRank.php 2012-03-19 14:55:12 UTC (rev 114143) +++ trunk/extensions/SemanticResultFormats/ValueRank/SRF_ValueRank.php 2012-03-19 14:59:29 UTC (rev 114144) @@ -3,7 +3,7 @@ /** * Result printer that prints query results as a valuerank. * In other words, it prints a list of all occuring values, with duplicates removed, - * together with their occurance count. + * together with their occurrence count. * * For example, this result set: foo bar baz foo bar bar ohi * Will be turned into Modified: trunk/extensions/SimpleSecurity/SimpleSecurity_body.php =================================================================== --- trunk/extensions/SimpleSecurity/SimpleSecurity_body.php 2012-03-19 14:55:12 UTC (rev 114143) +++ trunk/extensions/SimpleSecurity/SimpleSecurity_body.php 2012-03-19 14:59:29 UTC (rev 114144) @@ -341,7 +341,7 @@ } # If the rule applies to this title, check if we're a member of the required groups, - # remove action from rights list if not (can be mulitple occurences) + # remove action from rights list if not (can be mulitple occurrences) # - also update info array with page-restriction that apply to this title (LS), and rules in effect for this user (CR) if ( $deny ) { foreach ( $restriction as $action => $reqgroups ) { Modified: trunk/extensions/Sternograph/Sternograph.body.php =================================================================== --- trunk/extensions/Sternograph/Sternograph.body.php 2012-03-19 14:55:12 UTC (rev 114143) +++ trunk/extensions/Sternograph/Sternograph.body.php 2012-03-19 14:59:29 UTC (rev 114144) @@ -10,12 +10,12 @@ */ const DELIMETER = '^'; /** - Delimeter for Speaker blocks. The very first occurence of this string + Delimeter for Speaker blocks. The very first occurrence of this string is used to separate the speaker block from the content block. */ const SPEAKER_DELIM = '^^^'; /** - Delimeter for Context block. The very last occurence of this string + Delimeter for Context block. The very last occurrence of this string is used to separate the content block from the context block. */ const CONTEXT_DELIM = '^^'; Modified: trunk/extensions/StringFunctions/StringFunctions.php =================================================================== --- trunk/extensions/StringFunctions/StringFunctions.php 2012-03-19 14:55:12 UTC (rev 114143) +++ trunk/extensions/StringFunctions/StringFunctions.php 2012-03-19 14:59:29 UTC (rev 114144) @@ -43,7 +43,7 @@ {{#replace:value|from|to}} - Returns the given value with all occurences of 'from' replaced with 'to'. + Returns the given value with all occurrences of 'from' replaced with 'to'. See: http://php.net/manual/function.str-replace.php Modified: trunk/extensions/StringFunctionsEscaped/README =================================================================== --- trunk/extensions/StringFunctionsEscaped/README 2012-03-19 14:55:12 UTC (rev 114143) +++ trunk/extensions/StringFunctionsEscaped/README 2012-03-19 14:59:29 UTC (rev 114144) @@ -65,7 +65,7 @@ <nowiki>{{#replace_e:value|from|to}}</nowiki> -Returns the given value with all occurences of 'from' replaced with 'to'. +Returns the given value with all occurrences of 'from' replaced with 'to'. See: http://php.net/manual/function.str-replace.php Modified: trunk/extensions/StringFunctionsEscaped/StringFunctionsEscaped.php =================================================================== --- trunk/extensions/StringFunctionsEscaped/StringFunctionsEscaped.php 2012-03-19 14:55:12 UTC (rev 114143) +++ trunk/extensions/StringFunctionsEscaped/StringFunctionsEscaped.php 2012-03-19 14:59:29 UTC (rev 114144) @@ -33,7 +33,7 @@ {{#replace_e:value|from|to}} - Returns the given value with all occurences of 'from' replaced with 'to'. + Returns the given value with all occurrences of 'from' replaced with 'to'. See: http://php.net/manual/function.str-replace.php Modified: trunk/extensions/Translate/TranslateUtils.php =================================================================== --- trunk/extensions/Translate/TranslateUtils.php 2012-03-19 14:55:12 UTC (rev 114143) +++ trunk/extensions/Translate/TranslateUtils.php 2012-03-19 14:59:29 UTC (rev 114144) @@ -253,7 +253,7 @@ /** * Escapes the message, and does some mangling to whitespace, so that it is * preserved when outputted as-is to html page. Line feeds are converted to - * \<br /> and occurances of leading and trailing and multiple consecutive + * \<br /> and occurrences of leading and trailing and multiple consecutive * spaces to non-breaking spaces. * * @param $msg \string Plain text string. Modified: trunk/extensions/TreeAndMenu/TreeAndMenu.php =================================================================== --- trunk/extensions/TreeAndMenu/TreeAndMenu.php 2012-03-19 14:55:12 UTC (rev 114143) +++ trunk/extensions/TreeAndMenu/TreeAndMenu.php 2012-03-19 14:59:29 UTC (rev 114144) @@ -273,7 +273,7 @@ $wgOut->addScript( "<script type=\"$wgJsMimeType\">$(function(){\n$script\n});</script>" ); } - $text = preg_replace( "/\x7f1$u\x7f$id\x7f.+?$/m", $html, $text, 1 ); // replace first occurence of this trees root-id + $text = preg_replace( "/\x7f1$u\x7f$id\x7f.+?$/m", $html, $text, 1 ); // replace first occurrence of this trees root-id $nodes = ''; $last = -1; } Modified: trunk/extensions/WikiForum/WikiForum.i18n.php =================================================================== --- trunk/extensions/WikiForum/WikiForum.i18n.php 2012-03-19 14:55:12 UTC (rev 114143) +++ trunk/extensions/WikiForum/WikiForum.i18n.php 2012-03-19 14:59:29 UTC (rev 114144) @@ -678,7 +678,7 @@ 'wikiforum-save' => 'Enregistrer', 'wikiforum-error-search' => 'Erreur de recherche', 'wikiforum-error-search-missing-query' => 'Vous devez fournir un terme à rechercher !', - 'wikiforum-search-hits' => 'Trouvé {{PLURAL:$1|une occurence|$1 occurences}}', + 'wikiforum-search-hits' => 'Trouvé {{PLURAL:$1|une occurrence|$1 occurrences}}', 'wikiforum-search-thread' => 'Fil de discussion : $1', 'wikiforum-thread-deleted' => 'fil de discussion supprimé', 'wikiforum-topic-name' => 'Forum - $1', Modified: trunk/extensions/Wikidata/OmegaWiki/Test.skeleton.php =================================================================== --- trunk/extensions/Wikidata/OmegaWiki/Test.skeleton.php 2012-03-19 14:55:12 UTC (rev 114143) +++ trunk/extensions/Wikidata/OmegaWiki/Test.skeleton.php 2012-03-19 14:59:29 UTC (rev 114144) @@ -1,7 +1,7 @@ <?php # Empty skeleton for omegawiki test cases. -# Replace occurences of RecordHelperTest with the name of your own test case. +# Replace occurrences of RecordHelperTest with the name of your own test case. define( 'MEDIAWIKI', true ); _______________________________________________ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs