Index: trunk/extensions/WikiForum/WikiForum.i18n.php |
— | — | @@ -678,7 +678,7 @@ |
679 | 679 | 'wikiforum-save' => 'Enregistrer', |
680 | 680 | 'wikiforum-error-search' => 'Erreur de recherche', |
681 | 681 | 'wikiforum-error-search-missing-query' => 'Vous devez fournir un terme à rechercher !', |
682 | | - 'wikiforum-search-hits' => 'Trouvé {{PLURAL:$1|une occurence|$1 occurences}}', |
| 682 | + 'wikiforum-search-hits' => 'Trouvé {{PLURAL:$1|une occurrence|$1 occurrences}}', |
683 | 683 | 'wikiforum-search-thread' => 'Fil de discussion : $1', |
684 | 684 | 'wikiforum-thread-deleted' => 'fil de discussion supprimé', |
685 | 685 | 'wikiforum-topic-name' => 'Forum - $1', |
Index: trunk/extensions/SemanticMediaWiki/includes/queryprinters/SMW_QP_Aggregatable.php |
— | — | @@ -109,7 +109,7 @@ |
110 | 110 | } |
111 | 111 | |
112 | 112 | /** |
113 | | - * Counts all the occurances of all values in the query result, |
| 113 | + * Counts all the occurrences of all values in the query result, |
114 | 114 | * and returns an array with as key the value and as value the count. |
115 | 115 | * |
116 | 116 | * @since 1.7 |
Index: trunk/extensions/SemanticMediaWiki/languages/SMW_Messages.php |
— | — | @@ -74,8 +74,8 @@ |
75 | 75 | 'smw_paramdesc_default' => 'The text to display if there are no query results', |
76 | 76 | 'smw_paramdesc_searchlabel' => 'The text for the link to results', |
77 | 77 | 'smw_paramdesc_sep' => 'The separator for values', |
78 | | - 'smw-paramdesc-distribution' => 'Instead of displaying all values, count their occurances, and show these.', |
79 | | - 'smw-paramdesc-distributionsort' => 'Sort the value distribution by occurance count.', |
| 78 | + 'smw-paramdesc-distribution' => 'Instead of displaying all values, count their occurrences, and show these.', |
| 79 | + 'smw-paramdesc-distributionsort' => 'Sort the value distribution by occurrence count.', |
80 | 80 | 'smw-paramdesc-distributionlimit' => 'Limit the value distribution to the count of only some values.', |
81 | 81 | 'smw_paramdesc_template' => 'The name of a template with which to display the printouts', |
82 | 82 | 'smw_paramdesc_columns' => 'The number of columns in which to display results (default is $1)', |
— | — | @@ -3770,7 +3770,7 @@ |
3771 | 3771 | 'smw_nounitsdeclared' => "Aucune unité de mesure n'a été déclarée pour cette propriété.", |
3772 | 3772 | 'smw_novalues' => 'Aucune valeur n’a été spécifiée.', |
3773 | 3773 | 'smw_nodatetime' => 'La date « $1 » n’a pas été comprise.', |
3774 | | - 'smw_toomanyclosing' => 'Il semble y avoir trop d’occurences de « $1 » dans la requête.', |
| 3774 | + 'smw_toomanyclosing' => 'Il semble y avoir trop d’occurrences de « $1 » dans la requête.', |
3775 | 3775 | 'smw_noclosingbrackets' => 'Certains « <nowiki>[[</nowiki> » dans votre requête n’ont pas été clos par des « ]] » correspondants.', |
3776 | 3776 | 'smw_misplacedsymbol' => 'Le symbole « $1 » a été utilisé à un endroit où il n’est pas utile.', |
3777 | 3777 | 'smw_unexpectedpart' => 'La partie « $1 » de la requête n’a pas été comprise. Les résultats peuvent être inattendus.', |
Index: trunk/extensions/StringFunctions/StringFunctions.php |
— | — | @@ -43,7 +43,7 @@ |
44 | 44 | |
45 | 45 | {{#replace:value|from|to}} |
46 | 46 | |
47 | | - Returns the given value with all occurences of 'from' replaced with 'to'. |
| 47 | + Returns the given value with all occurrences of 'from' replaced with 'to'. |
48 | 48 | See: http://php.net/manual/function.str-replace.php |
49 | 49 | |
50 | 50 | |
Index: trunk/extensions/Chemistry/SpecialChemicalsources.php |
— | — | @@ -24,8 +24,8 @@ |
25 | 25 | * 1) Write your own i18n file (see instructions there) |
26 | 26 | * 2) copy this file to the name of your specialpage, and in that file: |
27 | 27 | * 3) make the line "require_once( 'ChemFunctions.i18n.php' );" call your i18n file |
28 | | - * 4) Replace all the occurences of the word 'chemicalsources' with the name of your specialpage |
29 | | - * 5) Replace every occurence of the word ChemFunctions with your chosen prefix from your i18n. |
| 28 | + * 4) Replace all the occurrences of the word 'chemicalsources' with the name of your specialpage |
| 29 | + * 5) Replace every occurrence of the word ChemFunctions with your chosen prefix from your i18n. |
30 | 30 | * 6) rewrite the function TransposeAndCheckParams |
31 | 31 | * You will get a list $Params which contains: $Params['paramname']='value' |
32 | 32 | * You have to return a list which contains: $transParams['thestringtoreplaceinyourpage'] = 'withwhatitshouldbereplaced' |
Index: trunk/extensions/Chemistry/SpecialChemicalsources_body.php |
— | — | @@ -9,7 +9,7 @@ |
10 | 10 | * To write the i18n so that it functions with another listpage: |
11 | 11 | * 1) copy this file to the i18n of your choice |
12 | 12 | * 2) Choose your prefix (the best way, if this i18n file is called YourPrefix, then choose that as your Prefix |
13 | | - * 3) Replace all occurences of ChemFunctions with the name of your Prefix. |
| 13 | + * 3) Replace all occurrences of ChemFunctions with the name of your Prefix. |
14 | 14 | * 4) $wgYourPrefix_Parameters should contain the names of the parameters as they can be given to your specialpage |
15 | 15 | * In the ListPage you have created, the Magiccodes are then $ParameterName, so if the Parameter is called 'WhAtEvEr', |
16 | 16 | * then in the ListPage $WhAtEvEr will be replaced with the value of the parameter WhAtEvEr |
Index: trunk/extensions/InlineEditor/SentenceEditor/SentenceEditor.class.php |
— | — | @@ -44,7 +44,7 @@ |
45 | 45 | } |
46 | 46 | |
47 | 47 | /** |
48 | | - * Replaces all occurences of unsupported wikitext by spaces. This is to make sure the |
| 48 | + * Replaces all occurrences of unsupported wikitext by spaces. This is to make sure the |
49 | 49 | * positions of what's left are still the same as those in the original wikitext |
50 | 50 | * @param $wikitext string |
51 | 51 | * @return string |
— | — | @@ -97,7 +97,7 @@ |
98 | 98 | // split where there are at least two spaces, or a newline, or the beginning of the text |
99 | 99 | $splits = preg_split( '/\s\s+|\n\s*|^/', $wikitext, -1, PREG_SPLIT_OFFSET_CAPTURE ); |
100 | 100 | |
101 | | - // remove small occurences |
| 101 | + // remove small occurrences |
102 | 102 | foreach ( $splits as $index => $split ) { |
103 | 103 | if ( strlen( $split[0] ) < 2 ) unset( $splits[$index] ); |
104 | 104 | } |
Index: trunk/extensions/DSMW/logootComponent/logootEngine.php |
— | — | @@ -526,7 +526,7 @@ |
527 | 527 | return $droite; |
528 | 528 | } |
529 | 529 | |
530 | | - // if there is no occurence |
| 530 | + // if there is no occurrence |
531 | 531 | ksort( $arr, SORT_NUMERIC ); |
532 | 532 | reset( $arr ); |
533 | 533 | $firstElementKey = key( $arr ); |
Index: trunk/extensions/DSMW/files/utils.php |
— | — | @@ -444,7 +444,7 @@ |
445 | 445 | /** |
446 | 446 | * tests if the patch is remote |
447 | 447 | * @param <String> $patchId |
448 | | - * @return <int or bool> false if no occurence |
| 448 | + * @return <int or bool> false if no occurrence |
449 | 449 | */ |
450 | 450 | static function isRemote( $patchId ) { |
451 | 451 | $serverId = DSMWSiteId::getInstance(); |
Index: trunk/extensions/DSMW/includes/SemanticFunctions.php |
— | — | @@ -141,7 +141,7 @@ |
142 | 142 | // get hasPushHead Value if exists |
143 | 143 | $start = "[[hasPushHead::"; |
144 | 144 | $val1 = strpos( $pageContent, $start ); |
145 | | - if ( $val1 !== false ) {// if there is an occurence of [[hasPushHead:: |
| 145 | + if ( $val1 !== false ) {// if there is an occurrence of [[hasPushHead:: |
146 | 146 | $startVal = $val1 + strlen( $start ); |
147 | 147 | $end = "]]"; |
148 | 148 | $endVal = strpos( $pageContent, $end, $startVal ); |
— | — | @@ -151,7 +151,7 @@ |
152 | 152 | $result = str_replace( $value, $CSID, $pageContent ); |
153 | 153 | $pageContent = $result; |
154 | 154 | if ( $result == "" )return false; |
155 | | - } else {// no occurence of [[hasPushHead:: , we add |
| 155 | + } else {// no occurrence of [[hasPushHead:: , we add |
156 | 156 | $pageContent .= ' hasPushHead: [[hasPushHead::' . $CSID . ']]'; |
157 | 157 | } |
158 | 158 | // save update |
— | — | @@ -303,7 +303,7 @@ |
304 | 304 | // get hasPushHead Value if exists |
305 | 305 | $start = "[[hasPullHead::"; |
306 | 306 | $val1 = strpos( $pageContent, $start ); |
307 | | - if ( $val1 !== false ) {// if there is an occurence of [[hasPushHead:: |
| 307 | + if ( $val1 !== false ) {// if there is an occurrence of [[hasPushHead:: |
308 | 308 | $startVal = $val1 + strlen( $start ); |
309 | 309 | $end = "]]"; |
310 | 310 | $endVal = strpos( $pageContent, $end, $startVal ); |
— | — | @@ -313,7 +313,7 @@ |
314 | 314 | $result = str_replace( $value, $CSID, $pageContent ); |
315 | 315 | $pageContent = $result; |
316 | 316 | if ( $result == "" )return false; |
317 | | - } else {// no occurence of [[hasPushHead:: , we add |
| 317 | + } else {// no occurrence of [[hasPushHead:: , we add |
318 | 318 | $pageContent .= ' hasPullHead: [[hasPullHead::' . $CSID . ']]'; |
319 | 319 | } |
320 | 320 | // save update |
Index: trunk/extensions/QPoll/Excel/PEAR.php |
— | — | @@ -433,7 +433,7 @@ |
434 | 434 | // {{{ delExpect() |
435 | 435 | |
436 | 436 | /** |
437 | | - * This method deletes all occurences of the specified element from |
| 437 | + * This method deletes all occurrences of the specified element from |
438 | 438 | * the expected error codes stack. |
439 | 439 | * |
440 | 440 | * @param mixed $error_code error code that should be deleted |
Index: trunk/extensions/Wikidata/OmegaWiki/Test.skeleton.php |
— | — | @@ -1,7 +1,7 @@ |
2 | 2 | <?php |
3 | 3 | |
4 | 4 | # Empty skeleton for omegawiki test cases. |
5 | | -# Replace occurences of RecordHelperTest with the name of your own test case. |
| 5 | +# Replace occurrences of RecordHelperTest with the name of your own test case. |
6 | 6 | |
7 | 7 | |
8 | 8 | define( 'MEDIAWIKI', true ); |
Index: trunk/extensions/Translate/TranslateUtils.php |
— | — | @@ -253,7 +253,7 @@ |
254 | 254 | /** |
255 | 255 | * Escapes the message, and does some mangling to whitespace, so that it is |
256 | 256 | * preserved when outputted as-is to html page. Line feeds are converted to |
257 | | - * \<br /> and occurances of leading and trailing and multiple consecutive |
| 257 | + * \<br /> and occurrences of leading and trailing and multiple consecutive |
258 | 258 | * spaces to non-breaking spaces. |
259 | 259 | * |
260 | 260 | * @param $msg \string Plain text string. |
Index: trunk/extensions/Arrays/RELEASE-NOTES |
— | — | @@ -149,7 +149,7 @@ |
150 | 150 | - update '#arraysort:' adding "random" option to make the array of values in random order |
151 | 151 | - add '#arrayreset' to free all defined arrays for memory saving |
152 | 152 | - add '#arrayslice' to return an array bounded by start_index and length. |
153 | | - - add '#arraysearch.' now we can return the index of the first occurence of an element, return -1 if |
| 153 | + - add '#arraysearch.' now we can return the index of the first occurrence of an element, return -1 if |
154 | 154 | not found |
155 | 155 | - remove '#arraymember,' obsoleted by '#arraysearch' |
156 | 156 | - remove '#arraypush,' obsoleted by '#arraydefine' and '#arraymerge' |
— | — | @@ -172,4 +172,4 @@ |
173 | 173 | '#arraypush' (replaced by arraymerge) |
174 | 174 | '#arraypop' (replaced by arrayslice) |
175 | 175 | '#arraymember' (replaced by arraysearch) |
176 | | - ------------------------------------------- |
\ No newline at end of file |
| 176 | + ------------------------------------------- |
Index: trunk/extensions/Arrays/Arrays.php |
— | — | @@ -446,8 +446,8 @@ |
447 | 447 | |
448 | 448 | |
449 | 449 | /** |
450 | | - * locate the index of the first occurence of an element starting from the 'index' |
451 | | - * - print "-1" (not found) or index (found) to show the index of the first occurence of 'value' in the array identified by arrayid |
| 450 | + * locate the index of the first occurrence of an element starting from the 'index' |
| 451 | + * - print "-1" (not found) or index (found) to show the index of the first occurrence of 'value' in the array identified by arrayid |
452 | 452 | * - if 'yes' and 'no' are set, print value of them when found or not-found |
453 | 453 | * - index is 0-based , it must be non-negative and less than lenth |
454 | 454 | * usage: |
Index: trunk/extensions/TreeAndMenu/TreeAndMenu.php |
— | — | @@ -273,7 +273,7 @@ |
274 | 274 | $wgOut->addScript( "<script type=\"$wgJsMimeType\">$(function(){\n$script\n});</script>" ); |
275 | 275 | } |
276 | 276 | |
277 | | - $text = preg_replace( "/\x7f1$u\x7f$id\x7f.+?$/m", $html, $text, 1 ); // replace first occurence of this trees root-id |
| 277 | + $text = preg_replace( "/\x7f1$u\x7f$id\x7f.+?$/m", $html, $text, 1 ); // replace first occurrence of this trees root-id |
278 | 278 | $nodes = ''; |
279 | 279 | $last = -1; |
280 | 280 | } |
Index: trunk/extensions/Gnuplot/Gnuplot.php |
— | — | @@ -77,7 +77,7 @@ |
78 | 78 | fwrite($handle, $wgGnuplotDefaultSize . "\n"); |
79 | 79 | } |
80 | 80 | |
81 | | - // Need to find each occurance of src:<FILE NAME> and replace it |
| 81 | + // Need to find each occurrence of src:<FILE NAME> and replace it |
82 | 82 | // with the complete file path |
83 | 83 | while (strpos($gnuplotsrc, 'src:') != false) { |
84 | 84 | $srcStartPosition = strpos ($gnuplotsrc, 'src:') + strlen("src:"); |
Index: trunk/extensions/SemanticResultFormats/ValueRank/SRF_ValueRank.php |
— | — | @@ -3,7 +3,7 @@ |
4 | 4 | /** |
5 | 5 | * Result printer that prints query results as a valuerank. |
6 | 6 | * In other words, it prints a list of all occuring values, with duplicates removed, |
7 | | - * together with their occurance count. |
| 7 | + * together with their occurrence count. |
8 | 8 | * |
9 | 9 | * For example, this result set: foo bar baz foo bar bar ohi |
10 | 10 | * Will be turned into |
Index: trunk/extensions/LiveTranslate/includes/jquery.liveTranslate.js |
— | — | @@ -134,7 +134,7 @@ |
135 | 135 | }; |
136 | 136 | |
137 | 137 | /** |
138 | | - * Obtain the special words and wrap occurances of them into notranslate spans. |
| 138 | + * Obtain the special words and wrap occurrences of them into notranslate spans. |
139 | 139 | * |
140 | 140 | * @since 1.2 |
141 | 141 | * |
— | — | @@ -253,4 +253,4 @@ |
254 | 254 | |
255 | 255 | return this; |
256 | 256 | |
257 | | -}; } )( window.jQuery, window.liveTranslate ); |
\ No newline at end of file |
| 257 | +}; } )( window.jQuery, window.liveTranslate ); |
Index: trunk/extensions/SimpleSecurity/SimpleSecurity_body.php |
— | — | @@ -341,7 +341,7 @@ |
342 | 342 | } |
343 | 343 | |
344 | 344 | # If the rule applies to this title, check if we're a member of the required groups, |
345 | | - # remove action from rights list if not (can be mulitple occurences) |
| 345 | + # remove action from rights list if not (can be mulitple occurrences) |
346 | 346 | # - also update info array with page-restriction that apply to this title (LS), and rules in effect for this user (CR) |
347 | 347 | if ( $deny ) { |
348 | 348 | foreach ( $restriction as $action => $reqgroups ) { |
Index: trunk/extensions/StringFunctionsEscaped/StringFunctionsEscaped.php |
— | — | @@ -33,7 +33,7 @@ |
34 | 34 | |
35 | 35 | {{#replace_e:value|from|to}} |
36 | 36 | |
37 | | - Returns the given value with all occurences of 'from' replaced with 'to'. |
| 37 | + Returns the given value with all occurrences of 'from' replaced with 'to'. |
38 | 38 | See: http://php.net/manual/function.str-replace.php |
39 | 39 | |
40 | 40 | |
Index: trunk/extensions/StringFunctionsEscaped/README |
— | — | @@ -65,7 +65,7 @@ |
66 | 66 | |
67 | 67 | <nowiki>{{#replace_e:value|from|to}}</nowiki> |
68 | 68 | |
69 | | -Returns the given value with all occurences of 'from' replaced with 'to'. |
| 69 | +Returns the given value with all occurrences of 'from' replaced with 'to'. |
70 | 70 | |
71 | 71 | See: http://php.net/manual/function.str-replace.php |
72 | 72 | |
Index: trunk/extensions/MobileFrontend/library/WURFL/Handlers/Utils.php |
— | — | @@ -174,12 +174,12 @@ |
175 | 175 | } |
176 | 176 | |
177 | 177 | /** |
178 | | - * The nth($ordinal) occurance of $needle in $haystack or -1 if no match is found |
| 178 | + * The nth($ordinal) occurrence of $needle in $haystack or -1 if no match is found |
179 | 179 | * @param string $haystack |
180 | 180 | * @param string $needle |
181 | 181 | * @param int $ordinal |
182 | 182 | * @throws InvalidArgumentException |
183 | | - * @return int Char index of occurance |
| 183 | + * @return int Char index of occurrence |
184 | 184 | */ |
185 | 185 | public static function ordinalIndexOf($haystack, $needle, $ordinal) { |
186 | 186 | if (is_null ( $haystack ) || empty ( $haystack )) { |
— | — | @@ -206,7 +206,7 @@ |
207 | 207 | } |
208 | 208 | |
209 | 209 | /** |
210 | | - * First occurance of a / character |
| 210 | + * First occurrence of a / character |
211 | 211 | * @param string $string Haystack |
212 | 212 | * @return int Char index |
213 | 213 | */ |
— | — | @@ -216,7 +216,7 @@ |
217 | 217 | } |
218 | 218 | |
219 | 219 | /** |
220 | | - * Second occurance of a / character |
| 220 | + * Second occurrence of a / character |
221 | 221 | * @param string $string Haystack |
222 | 222 | * @return int Char index |
223 | 223 | */ |
— | — | @@ -228,7 +228,7 @@ |
229 | 229 | } |
230 | 230 | |
231 | 231 | /** |
232 | | - * First occurance of a space character |
| 232 | + * First occurrence of a space character |
233 | 233 | * @param string $string Haystack |
234 | 234 | * @return int Char index |
235 | 235 | */ |
— | — | @@ -238,7 +238,7 @@ |
239 | 239 | } |
240 | 240 | |
241 | 241 | /** |
242 | | - * First occurance of a ; character or length |
| 242 | + * First occurrence of a ; character or length |
243 | 243 | * @param string $string Haystack |
244 | 244 | * @return int Char index |
245 | 245 | */ |
— | — | @@ -247,7 +247,7 @@ |
248 | 248 | } |
249 | 249 | |
250 | 250 | /** |
251 | | - * First occurance of $toMatch string or length |
| 251 | + * First occurrence of $toMatch string or length |
252 | 252 | * @param string $string Haystack |
253 | 253 | * @param string $toMatch Needle |
254 | 254 | * @return int Char index |
— | — | @@ -339,4 +339,4 @@ |
340 | 340 | public static function removeLocale($userAgent) { |
341 | 341 | return preg_replace ( self::LANGUAGE_PATTERN, "", $userAgent, 1 ); |
342 | 342 | } |
343 | | -} |
\ No newline at end of file |
| 343 | +} |
Index: trunk/extensions/Cite/Cite_body.php |
— | — | @@ -510,7 +510,7 @@ |
511 | 511 | $this->mRefs[$group][$key]['text'] = null; |
512 | 512 | # continue without break |
513 | 513 | case 'increment': |
514 | | - # Rollback increase in named ref occurences. |
| 514 | + # Rollback increase in named ref occurrences. |
515 | 515 | $this->mRefs[$group][$key]['count']--; |
516 | 516 | break; |
517 | 517 | } |
— | — | @@ -890,7 +890,7 @@ |
891 | 891 | * @param $group |
892 | 892 | * @param $key string The key for the link |
893 | 893 | * @param $count int The index of the key, used for distinguishing |
894 | | - * multiple occurances of the same key |
| 894 | + * multiple occurrences of the same key |
895 | 895 | * @param $label int The label to use for the link, I want to |
896 | 896 | * use the same label for all occourances of |
897 | 897 | * the same named reference. |
Index: trunk/extensions/AbuseFilter/AbuseFilter.i18n.php |
— | — | @@ -690,7 +690,7 @@ |
691 | 691 | 'abusefilter-edit-throttle-period' => 'Field label for entering a time period.', |
692 | 692 | 'abusefilter-edit-throttle-seconds' => 'Throttle period in seconds. Parameters: |
693 | 693 | * $1 is a number of seconds.', |
694 | | - '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.', |
| 694 | + '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.', |
695 | 695 | 'abusefilter-edit-warn-message' => 'Field label for dropdown list with system messages.', |
696 | 696 | 'abusefilter-edit-warn-other' => 'Option in dropdown menu to specify no item from the list should be used.', |
697 | 697 | 'abusefilter-edit-warn-other-label' => 'Field label for entering a system message key to use as warning text.', |
Index: trunk/extensions/MetaKeywords/MetaKeywords.i18n.php |
— | — | @@ -14,7 +14,7 @@ |
15 | 15 | # The namespaces identifiers (all) and (main) specify a default for all namespaces and the zeroth namespace respectively.', |
16 | 16 | 'metadescription' => ' # Add lines to this page in the form "namespace|description tag to set" |
17 | 17 | # The namespaces identifiers (all) and (main) specify a default for all namespaces and the zeroth namespace respectively. |
18 | | - # Any occurences of $1 will be replaced by the current page\'s title.' |
| 18 | + # Any occurrences of $1 will be replaced by the current page\'s title.' |
19 | 19 | ); |
20 | 20 | |
21 | 21 | /** Message documentation (Message documentation) |
Index: trunk/extensions/FreqPatternTagCloud/includes/computation/FrequentPatternAlgorithm.php |
— | — | @@ -26,7 +26,7 @@ |
27 | 27 | $numerator = 0; |
28 | 28 | $denominator = 0; |
29 | 29 | foreach ($transactions as $transaction) { |
30 | | - // For each occurence of the assumption -> increase denominator |
| 30 | + // For each occurrence of the assumption -> increase denominator |
31 | 31 | // If the conclusion occurs too -> increase numerator |
32 | 32 | |
33 | 33 | // Check if transaction contains assumption |
Index: trunk/extensions/Sternograph/Sternograph.body.php |
— | — | @@ -10,12 +10,12 @@ |
11 | 11 | */ |
12 | 12 | const DELIMETER = '^'; |
13 | 13 | /** |
14 | | - Delimeter for Speaker blocks. The very first occurence of this string |
| 14 | + Delimeter for Speaker blocks. The very first occurrence of this string |
15 | 15 | is used to separate the speaker block from the content block. |
16 | 16 | */ |
17 | 17 | const SPEAKER_DELIM = '^^^'; |
18 | 18 | /** |
19 | | - Delimeter for Context block. The very last occurence of this string |
| 19 | + Delimeter for Context block. The very last occurrence of this string |
20 | 20 | is used to separate the content block from the context block. |
21 | 21 | */ |
22 | 22 | const CONTEXT_DELIM = '^^'; |
Index: trunk/extensions/DynamicPageList/DPL.php |
— | — | @@ -1280,8 +1280,8 @@ |
1281 | 1281 | |
1282 | 1282 | foreach ( $matches as $matchA ) { |
1283 | 1283 | $matchCount = count( $matchA ); |
1284 | | - foreach ( $matchA as $occurence => $matchB ) { |
1285 | | - if ( $occurence < $call ) { |
| 1284 | + foreach ( $matchA as $occurrence => $matchB ) { |
| 1285 | + if ( $occurrence < $call ) { |
1286 | 1286 | continue; |
1287 | 1287 | } |
1288 | 1288 | $match = $matchB[0]; |
— | — | @@ -1460,12 +1460,12 @@ |
1461 | 1461 | ); |
1462 | 1462 | } |
1463 | 1463 | |
1464 | | - // format one item of an entry in the output list (i.e. the collection of occurences of one item from the include parameter) |
| 1464 | + // format one item of an entry in the output list (i.e. the collection of occurrences of one item from the include parameter) |
1465 | 1465 | function formatItem( $piece, $tagStart, $tagEnd ) { |
1466 | 1466 | return $tagStart . $piece . $tagEnd; |
1467 | 1467 | } |
1468 | 1468 | |
1469 | | - // format one single item of an entry in the output list (i.e. one occurence of one item from the include parameter) |
| 1469 | + // format one single item of an entry in the output list (i.e. one occurrence of one item from the include parameter) |
1470 | 1470 | function formatSingleItems( &$pieces, $s, $article ) { |
1471 | 1471 | $firstCall = true; |
1472 | 1472 | foreach ( $pieces as $key => $val ) { |
— | — | @@ -1500,7 +1500,7 @@ |
1501 | 1501 | } |
1502 | 1502 | } |
1503 | 1503 | |
1504 | | - // format one single template argument of one occurence of one item from the include parameter |
| 1504 | + // format one single template argument of one occurrence of one item from the include parameter |
1505 | 1505 | // is called via a backlink from DPLInclude::includeTemplate() |
1506 | 1506 | function formatTemplateArg( $arg, $s, $argNr, $firstCall, $maxlen, $article ) { |
1507 | 1507 | // we could try to format fields differently within the first call of a template |
Index: trunk/extensions/DynamicPageList/DynamicPageListInclude.php |
— | — | @@ -561,7 +561,7 @@ |
562 | 562 | |
563 | 563 | // template inclusion - find the place(s) where template1 is called, |
564 | 564 | // replace its name by template2, then expand template2 and return the result |
565 | | - // we return an array containing all occurences of the template call which match the condition "$mustMatch" |
| 565 | + // we return an array containing all occurrences of the template call which match the condition "$mustMatch" |
566 | 566 | // and do NOT match the condition "$mustNotMatch" (if specified) |
567 | 567 | // we use a callback function to format retrieved parameters, accessible via $dpl->formatTemplateArg() |
568 | 568 | public static function includeTemplate( $parser, $dpl, $dplNr, $article, |