Tim Starling has uploaded a new change for review.
https://gerrit.wikimedia.org/r/68121
Change subject: Remove all instances of the word "iff"
......................................................................
Remove all instances of the word "iff"
It's elitist mathematical jargon. In all cases dealt with here, it adds
no additional meaning compared to "if", beyond what was already obvious
from context. Thus, its only purpose is to smugly demonstrate that the
author attended their second-year mathematics classes, at the expense of
causing confusion for everyone who doesn't have such a background.
If you really think you need to convey extra information beyond what
"if" gives you, the English language contains plenty of devices for doing
so, without resorting to neologisms.
Change-Id: Iae21095d02ec2935c10e94f532235c2671c115b1
---
M includes/IP.php
M includes/OutputPage.php
M includes/WikiPage.php
M includes/cache/MessageCache.php
M includes/diff/DairikiDiff.php
M includes/filebackend/FileOp.php
M includes/parser/CoreParserFunctions.php
M includes/resourceloader/ResourceLoader.php
M tests/phpunit/MediaWikiTestCase.php
M tests/phpunit/maintenance/DumpTestCase.php
M tests/phpunit/maintenance/MaintenanceTest.php
11 files changed, 11 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/21/68121/1
diff --git a/includes/IP.php b/includes/IP.php
index 1e0a4f9..0a4f94c 100644
--- a/includes/IP.php
+++ b/includes/IP.php
@@ -44,7 +44,7 @@
'|' . // contains one "::" in the middle, not ending in "::WORD" (regex
for PCRE 4.0+)
RE_IPV6_WORD . '(?::(?P<abn>:(?P<iabn>))?' . RE_IPV6_WORD .
'(?!:(?P=abn))){1,5}' .
':' . RE_IPV6_WORD . '(?P=iabn)' .
- // NOTE: (?!(?P=abn)) fails iff "::" used twice; (?P=iabn)
passes iff a "::" was found.
+ // NOTE: (?!(?P=abn)) fails if "::" used twice; (?P=iabn)
passes if a "::" was found.
'|' . // contains no "::"
RE_IPV6_WORD . '(?::' . RE_IPV6_WORD . '){7}' .
')'
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 3657ac3..e30e753 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -669,7 +669,7 @@
*
* @param $timestamp string
*
- * @return Boolean: true iff cache-ok headers was sent.
+ * @return Boolean: true if cache-ok headers was sent.
*/
public function checkLastModified( $timestamp ) {
global $wgCachePages, $wgCacheEpoch, $wgUseSquid,
$wgSquidMaxage;
diff --git a/includes/WikiPage.php b/includes/WikiPage.php
index 5ed6c8d..1327e7b 100644
--- a/includes/WikiPage.php
+++ b/includes/WikiPage.php
@@ -1455,7 +1455,7 @@
}
/**
- * Returns true iff this page's content model supports sections.
+ * Returns true if this page's content model supports sections.
*
* @return boolean whether sections are supported.
*
diff --git a/includes/cache/MessageCache.php b/includes/cache/MessageCache.php
index fcefc06..d9d0f21 100644
--- a/includes/cache/MessageCache.php
+++ b/includes/cache/MessageCache.php
@@ -865,7 +865,7 @@
*
* @param string $title Message cache key with initial uppercase letter.
* @param string $code Code denoting the language to try.
- * @return string|bool The message, or false iff it does not exist or
on error
+ * @return string|bool The message, or false if it does not exist or on
error
*/
function getMsgFromNamespace( $title, $code ) {
$this->load( $code );
diff --git a/includes/diff/DairikiDiff.php b/includes/diff/DairikiDiff.php
index 174c1d6..298d724 100644
--- a/includes/diff/DairikiDiff.php
+++ b/includes/diff/DairikiDiff.php
@@ -692,7 +692,7 @@
/**
* Check for empty diff.
*
- * @return bool True iff two sequences were identical.
+ * @return bool True if two sequences were identical.
*/
function isEmpty() {
foreach ( $this->edits as $edit ) {
diff --git a/includes/filebackend/FileOp.php b/includes/filebackend/FileOp.php
index e4059d7..d071fb4 100644
--- a/includes/filebackend/FileOp.php
+++ b/includes/filebackend/FileOp.php
@@ -384,7 +384,7 @@
/**
* precheckDestExistence() helper function to get the source file SHA-1.
- * Subclasses should overwride this iff the source is not in storage.
+ * Subclasses should overwride this if the source is not in storage.
*
* @return string|bool Returns false on failure
*/
diff --git a/includes/parser/CoreParserFunctions.php
b/includes/parser/CoreParserFunctions.php
index 375ff2b..aeb77a3 100644
--- a/includes/parser/CoreParserFunctions.php
+++ b/includes/parser/CoreParserFunctions.php
@@ -139,7 +139,7 @@
$pref = $parser->getOptions()->getDateFormat();
// Specify a different default date format other than the the
normal default
- // iff the user has 'default' for their setting
+ // if the user has 'default' for their setting
if ( $pref == 'default' && $defaultPref ) {
$pref = $defaultPref;
}
diff --git a/includes/resourceloader/ResourceLoader.php
b/includes/resourceloader/ResourceLoader.php
index 543bd1d..c3ba880 100644
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -583,7 +583,7 @@
* and clear out the output buffer. If the client cache is too old then
do nothing.
* @param $context ResourceLoaderContext
* @param string $mtime The TS_MW timestamp to check the header against
- * @return bool True iff 304 header sent and output handled
+ * @return bool True if 304 header sent and output handled
*/
protected function tryRespondLastModified( ResourceLoaderContext
$context, $mtime ) {
// If there's an If-Modified-Since header, respond with a 304
appropriately
diff --git a/tests/phpunit/MediaWikiTestCase.php
b/tests/phpunit/MediaWikiTestCase.php
index 25ba29e..a1a8e95 100644
--- a/tests/phpunit/MediaWikiTestCase.php
+++ b/tests/phpunit/MediaWikiTestCase.php
@@ -777,7 +777,7 @@
}
/**
- * Returns true iff the given namespace defaults to Wikitext
+ * Returns true if the given namespace defaults to Wikitext
* according to $wgNamespaceContentModels
*
* @param int $ns The namespace ID to check
diff --git a/tests/phpunit/maintenance/DumpTestCase.php
b/tests/phpunit/maintenance/DumpTestCase.php
index 78a5153..1a94c87 100644
--- a/tests/phpunit/maintenance/DumpTestCase.php
+++ b/tests/phpunit/maintenance/DumpTestCase.php
@@ -114,7 +114,7 @@
* @param $name string: name of the closing element to look for
* (e.g.: "mediawiki" when looking for </mediawiki>)
*
- * @return bool: true iff the end node could be found. false otherwise.
+ * @return bool: true if the end node could be found. false otherwise.
*/
protected function skipToNodeEnd( $name ) {
while ( $this->xml->read() ) {
diff --git a/tests/phpunit/maintenance/MaintenanceTest.php
b/tests/phpunit/maintenance/MaintenanceTest.php
index f4b61af..318ce0d 100644
--- a/tests/phpunit/maintenance/MaintenanceTest.php
+++ b/tests/phpunit/maintenance/MaintenanceTest.php
@@ -43,7 +43,7 @@
private $testCase;
/**
- * shutdownSimulated === true iff simulateShutdown has done it's work
+ * shutdownSimulated === true if simulateShutdown has done it's work
*
* @var bool
*/
--
To view, visit https://gerrit.wikimedia.org/r/68121
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iae21095d02ec2935c10e94f532235c2671c115b1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Tim Starling <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
