From: Siebrand Mazeland Date: Fri, 10 Aug 2012 08:59:55 +0000 (+0200) Subject: Fix typo: occured -> occurred. X-Git-Tag: 1.31.0-rc.0~22780 X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/journal.php?a=commitdiff_plain;h=9ff9aaae63524b762c4604ac63165d9f5e01d367;p=lhc%2Fweb%2Fwiklou.git Fix typo: occured -> occurred. Change-Id: I5e66fdd52791487f81796ae1965ac31c94b36182 --- diff --git a/includes/Exception.php b/includes/Exception.php index 7d4c551af7..d5cf543fa4 100644 --- a/includes/Exception.php +++ b/includes/Exception.php @@ -185,7 +185,7 @@ class MWException extends Exception { /** * Return the requested URL and point to file and line number from which the - * exception occured + * exception occurred * * @return string */ diff --git a/includes/api/ApiFormatBase.php b/includes/api/ApiFormatBase.php index 1c6a871ae5..a8d69f5dc9 100644 --- a/includes/api/ApiFormatBase.php +++ b/includes/api/ApiFormatBase.php @@ -326,7 +326,7 @@ class ApiFormatFeedWrapper extends ApiFormatBase { */ public static function setResult( $result, $feed, $feedItems ) { // Store output in the Result data. - // This way we can check during execution if any error has occured + // This way we can check during execution if any error has occurred // Disable size checking for this because we can't continue // cleanly; size checking would cause more problems than it'd // solve @@ -371,7 +371,7 @@ class ApiFormatFeedWrapper extends ApiFormatBase { } $feed->outFooter(); } else { - // Error has occured, print something useful + // Error has occurred, print something useful ApiBase::dieDebug( __METHOD__, 'Invalid feed class/item' ); } } diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php index 5e97293978..420acd3d9e 100644 --- a/includes/api/ApiMain.php +++ b/includes/api/ApiMain.php @@ -393,7 +393,7 @@ class ApiMain extends ApiBase { // Reset and print just the error message ob_clean(); - // If the error occured during printing, do a printer->profileOut() + // If the error occurred during printing, do a printer->profileOut() $this->mPrinter->safeProfileOut(); $this->printResult( true ); } diff --git a/includes/filebackend/FileBackend.php b/includes/filebackend/FileBackend.php index ff9329c807..4b707fc331 100644 --- a/includes/filebackend/FileBackend.php +++ b/includes/filebackend/FileBackend.php @@ -254,13 +254,13 @@ abstract class FileBackend { * * @par Return value: * - * This returns a Status, which contains all warnings and fatals that occured + * This returns a Status, which contains all warnings and fatals that occurred * during the operation. The 'failCount', 'successCount', and 'success' members * will reflect each operation attempted. * * The status will be "OK" unless: * - a) unexpected operation errors occurred (network partitions, disk full...) - * - b) significant operation errors occured and 'force' was not set + * - b) significant operation errors occurred and 'force' was not set * * @param $ops Array List of operations to execute in order * @param $opts Array Batch operation options @@ -447,10 +447,10 @@ abstract class FileBackend { * - bypassReadOnly : Allow writes in read-only mode (since 1.20) * * @par Return value: - * This returns a Status, which contains all warnings and fatals that occured + * This returns a Status, which contains all warnings and fatals that occurred * during the operation. The 'failCount', 'successCount', and 'success' members * will reflect each operation attempted for the given files. The status will be - * considered "OK" as long as no fatal errors occured. + * considered "OK" as long as no fatal errors occurred. * * @param $ops Array Set of operations to execute * @param $opts Array Batch operation options diff --git a/includes/filebackend/FileOpBatch.php b/includes/filebackend/FileOpBatch.php index fd83e2c362..335587255b 100644 --- a/includes/filebackend/FileOpBatch.php +++ b/includes/filebackend/FileOpBatch.php @@ -50,7 +50,7 @@ class FileOpBatch { * * The resulting Status will be "OK" unless: * - a) unexpected operation errors occurred (network partitions, disk full...) - * - b) significant operation errors occured and 'force' was not set + * - b) significant operation errors occurred and 'force' was not set * * @param $performOps Array List of FileOp operations * @param $opts Array Batch operation options diff --git a/includes/installer/DatabaseInstaller.php b/includes/installer/DatabaseInstaller.php index 2cc539bccc..0beedfa462 100644 --- a/includes/installer/DatabaseInstaller.php +++ b/includes/installer/DatabaseInstaller.php @@ -273,7 +273,7 @@ abstract class DatabaseInstaller { $up = DatabaseUpdater::newForDB( $this->db ); $up->doUpdates(); } catch ( MWException $e ) { - echo "\nAn error occured:\n"; + echo "\nAn error occurred:\n"; echo $e->getText(); $ret = false; } diff --git a/includes/media/Bitmap.php b/includes/media/Bitmap.php index 56c5842a7b..0f30c6f047 100644 --- a/includes/media/Bitmap.php +++ b/includes/media/Bitmap.php @@ -274,7 +274,7 @@ class BitmapHandler extends ImageHandler { * @param $image File File associated with this thumbnail * @param $params array Array with scaler params * - * @return MediaTransformError Error object if error occured, false (=no error) otherwise + * @return MediaTransformError Error object if error occurred, false (=no error) otherwise */ protected function transformImageMagick( $image, $params ) { # use ImageMagick @@ -373,7 +373,7 @@ class BitmapHandler extends ImageHandler { * @param $image File File associated with this thumbnail * @param $params array Array with scaler params * - * @return MediaTransformError Error object if error occured, false (=no error) otherwise + * @return MediaTransformError Error object if error occurred, false (=no error) otherwise */ protected function transformImageMagickExt( $image, $params ) { global $wgSharpenReductionThreshold, $wgSharpenParameter, $wgMaxAnimatedGifArea; @@ -450,7 +450,7 @@ class BitmapHandler extends ImageHandler { * @param $image File File associated with this thumbnail * @param $params array Array with scaler params * - * @return MediaTransformError Error object if error occured, false (=no error) otherwise + * @return MediaTransformError Error object if error occurred, false (=no error) otherwise */ protected function transformCustom( $image, $params ) { # Use a custom convert command @@ -477,7 +477,7 @@ class BitmapHandler extends ImageHandler { } /** - * Log an error that occured in an external process + * Log an error that occurred in an external process * * @param $retval int * @param $err int @@ -506,7 +506,7 @@ class BitmapHandler extends ImageHandler { * @param $image File File associated with this thumbnail * @param $params array Array with scaler params * - * @return MediaTransformError Error object if error occured, false (=no error) otherwise + * @return MediaTransformError Error object if error occurred, false (=no error) otherwise */ protected function transformGd( $image, $params ) { # Use PHP's builtin GD library functions. diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index afb4319259..e77e177e32 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -2195,7 +2195,7 @@ Permitted {{PLURAL:$3|file type is|file types are}} $2.', 'hookaborted' => 'The modification you tried to make was aborted by an extension.', 'illegal-filename' => 'The filename is not allowed.', 'overwrite' => 'Overwriting an existing file is not allowed.', -'unknown-error' => 'An unknown error occured.', +'unknown-error' => 'An unknown error occurred.', 'tmp-create-error' => 'Could not create temporary file.', 'tmp-write-error' => 'Error writing temporary file.', 'large-file' => 'It is recommended that files are no larger than $1; @@ -2293,7 +2293,7 @@ Please verify that the URL is valid and accessible and try again. If the problem persists, contact an [[Special:ListUsers/sysop|administrator]].', 'upload-too-many-redirects' => 'The URL contained too many redirects', 'upload-unknown-size' => 'Unknown size', -'upload-http-error' => 'An HTTP error occured: $1', +'upload-http-error' => 'An HTTP error occurred: $1', 'upload-copy-upload-invalid-domain' => 'Copy uploads are not available from this domain.', # File backend