jenkins-bot has submitted this change and it was merged. Change subject: Change EXIF to Exif ......................................................................
Change EXIF to Exif Per https://en.wikipedia.org/wiki/Exchangeable_image_file_format. Spotted by Shirayuki and documented on https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Sesp-property-exif-data/en Change-Id: I92ba67ec60ccfe7a173d950593357b86792b8ed3 --- M includes/DefaultSettings.php M includes/ImagePage.php M includes/api/ApiQueryFilearchive.php M includes/api/ApiQueryImageInfo.php M includes/media/Bitmap.php M includes/media/Exif.php M includes/media/ExifBitmap.php M languages/messages/MessagesEn.php M maintenance/language/checkLanguage.inc M maintenance/language/languages.inc M maintenance/language/messageTypes.inc M maintenance/language/messages.inc M maintenance/tables.sql M resources/mediawiki.libs/mediawiki.libs.jpegmeta.js M skins/common/oldshared.css M skins/common/shared.css M tests/phpunit/includes/api/RandomImageGenerator.php 17 files changed, 24 insertions(+), 24 deletions(-) Approvals: Shirayuki: Looks good to me, but someone else must approve Raimond Spekking: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 407ac8f..5330caf 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -496,11 +496,11 @@ $wgLockManagers = array(); /** - * Show EXIF data, on by default if available. - * Requires PHP's EXIF extension: http://www.php.net/manual/en/ref.exif.php + * Show Exif data, on by default if available. + * Requires PHP's Exif extension: http://www.php.net/manual/en/ref.exif.php * * @note FOR WINDOWS USERS: - * To enable EXIF functions, add the following lines to the "Windows + * To enable Exif functions, add the following lines to the "Windows * extensions" section of php.ini: * @code{.ini} * extension=extensions/php_mbstring.dll @@ -848,7 +848,7 @@ /** - * Some tests and extensions use exiv2 to manipulate the EXIF metadata in some + * Some tests and extensions use exiv2 to manipulate the Exif metadata in some * image formats. */ $wgExiv2Command = '/usr/bin/exiv2'; diff --git a/includes/ImagePage.php b/includes/ImagePage.php index e687046..a5beb5d 100644 --- a/includes/ImagePage.php +++ b/includes/ImagePage.php @@ -250,7 +250,7 @@ * * @todo FIXME: Bad interface, see note on MediaHandler::formatMetadata(). * - * @param array $metadata the array containing the EXIF data + * @param array $metadata the array containing the Exif data * @return String The metadata table. This is treated as Wikitext (!) */ protected function makeMetadataTable( $metadata ) { diff --git a/includes/api/ApiQueryFilearchive.php b/includes/api/ApiQueryFilearchive.php index c34859b..408c7c2 100644 --- a/includes/api/ApiQueryFilearchive.php +++ b/includes/api/ApiQueryFilearchive.php @@ -281,7 +281,7 @@ ' parseddescription - Parse the description on the version', ' mime - Adds MIME of the image', ' mediatype - Adds the media type of the image', - ' metadata - Lists EXIF metadata for the version of the image', + ' metadata - Lists Exif metadata for the version of the image', ' bitdepth - Adds the bit depth of the version', ' archivename - Adds the file name of the archive version for non-latest versions' ), diff --git a/includes/api/ApiQueryImageInfo.php b/includes/api/ApiQueryImageInfo.php index 5ed9d38..4849f40 100644 --- a/includes/api/ApiQueryImageInfo.php +++ b/includes/api/ApiQueryImageInfo.php @@ -545,7 +545,7 @@ 'thumbmime' => ' thumbmime - Adds MIME type of the image thumbnail' . ' (requires url and param ' . $modulePrefix . 'urlwidth)', 'mediatype' => ' mediatype - Adds the media type of the image', - 'metadata' => ' metadata - Lists EXIF metadata for the version of the image', + 'metadata' => ' metadata - Lists Exif metadata for the version of the image', 'archivename' => ' archivename - Adds the file name of the archive version for non-latest versions', 'bitdepth' => ' bitdepth - Adds the bit depth of the version', ); diff --git a/includes/media/Bitmap.php b/includes/media/Bitmap.php index 1ce3d5e..9f7a09c 100644 --- a/includes/media/Bitmap.php +++ b/includes/media/Bitmap.php @@ -131,7 +131,7 @@ # The size of the image on the page 'clientWidth' => $params['width'], 'clientHeight' => $params['height'], - # Comment as will be added to the EXIF of the thumbnail + # Comment as will be added to the Exif of the thumbnail 'comment' => isset( $params['descriptionUrl'] ) ? "File source: {$params['descriptionUrl']}" : '', # Properties of the original image diff --git a/includes/media/Exif.php b/includes/media/Exif.php index d7c45d3..9a2794a 100644 --- a/includes/media/Exif.php +++ b/includes/media/Exif.php @@ -114,7 +114,7 @@ */ function __construct( $file, $byteOrder = '' ) { /** - * Page numbers here refer to pages in the EXIF 2.2 standard + * Page numbers here refer to pages in the Exif 2.2 standard * * Note, Exif::UNDEFINED is treated as a string, not as an array of bytes * so don't put a count parameter for any UNDEFINED values. @@ -168,7 +168,7 @@ # Exif IFD Attribute Information (p30-31) 'EXIF' => array( # TODO: NOTE: Nonexistence of this field is taken to mean nonconformance - # to the EXIF 2.1 AND 2.2 standards + # to the Exif 2.1 AND 2.2 standards 'ExifVersion' => Exif::UNDEFINED, # Exif version 'FlashPixVersion' => Exif::UNDEFINED, # Supported Flashpix version #p32 diff --git a/includes/media/ExifBitmap.php b/includes/media/ExifBitmap.php index 98c423f..d8d0bed 100644 --- a/includes/media/ExifBitmap.php +++ b/includes/media/ExifBitmap.php @@ -84,7 +84,7 @@ return self::METADATA_GOOD; } if ( $metadata === self::OLD_BROKEN_FILE ) { - # Old special value indicating that there is no EXIF data in the file. + # Old special value indicating that there is no Exif data in the file. # or that there was an error well extracting the metadata. wfDebug( __METHOD__ . ": back-compat version\n" ); return self::METADATA_COMPATIBLE; diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index 93e9746..2bc5b6a 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -4032,7 +4032,7 @@ 'metadata-langitem' => "'''$2:''' $1", # only translate this message to other languages if you have to change it 'metadata-langitem-default' => '$1', # only translate this message to other languages if you have to change it -# EXIF tags +# Exif tags 'exif-imagewidth' => 'Width', 'exif-imagelength' => 'Height', 'exif-bitspersample' => 'Bits per component', @@ -4229,7 +4229,7 @@ $8', # only translate this message to other languages if you have to change it 'exif-subjectnewscode-value' => '$2 ($1)', # only translate this message to other languages if you have to change it -# EXIF attributes +# Exif attributes 'exif-compression-1' => 'Uncompressed', 'exif-compression-2' => 'CCITT Group 3 1-Dimensional Modified Huffman run length encoding', 'exif-compression-3' => 'CCITT Group 3 fax encoding', diff --git a/maintenance/language/checkLanguage.inc b/maintenance/language/checkLanguage.inc index 9e583e7..59b6fcd 100644 --- a/maintenance/language/checkLanguage.inc +++ b/maintenance/language/checkLanguage.inc @@ -222,7 +222,7 @@ --links: Link the message values (default off). --prefix: prefix to add to links. --wikilang: For the links, what is the content language of the wiki to display the output in (default en). - --noexif: Do not check for EXIF messages (a bit hard and boring to translate), if you know + --noexif: Do not check for Exif messages (a bit hard and boring to translate), if you know that they are currently not translated and want to focus on other problems (default off). --whitelist: Do only the following checks (form: code,code). --blacklist: Do not do the following checks (form: code,code). diff --git a/maintenance/language/languages.inc b/maintenance/language/languages.inc index 9fbc0bc..31bfcb9 100644 --- a/maintenance/language/languages.inc +++ b/maintenance/language/languages.inc @@ -43,7 +43,7 @@ * Load the list of languages: all the Messages*.php * files in the languages directory. * - * @param $exif bool Treat the EXIF messages? + * @param $exif bool Treat the Exif messages? */ function __construct( $exif = true ) { require( __DIR__ . '/messageTypes.inc' ); diff --git a/maintenance/language/messageTypes.inc b/maintenance/language/messageTypes.inc index 9e629b4..b997fe0 100644 --- a/maintenance/language/messageTypes.inc +++ b/maintenance/language/messageTypes.inc @@ -480,7 +480,7 @@ 'changed', // @deprecated. Remove in MediaWiki 1.23. ); -/** EXIF messages, which may be set as optional in several checks, but are generally mandatory */ +/** Exif messages, which may be set as optional in several checks, but are generally mandatory */ $wgEXIFMessages = array( 'exif-imagewidth', 'exif-imagelength', diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc index a8b682b..7b4e1d9 100644 --- a/maintenance/language/messages.inc +++ b/maintenance/language/messages.inc @@ -4051,9 +4051,9 @@ 'variantname-shi' => 'Variants for Tachelhit language', 'media-info' => 'Media information', 'metadata' => 'Metadata', - 'exif' => 'EXIF tags', + 'exif' => 'Exif tags', 'exif-values' => 'Make & model, can be wikified in order to link to the camera and model name', - 'exif-compression' => 'EXIF attributes', + 'exif-compression' => 'Exif attributes', 'exif-copyrighted' => '', 'exif-unknowndate' => '', 'exif-photometricinterpretation' => '', diff --git a/maintenance/tables.sql b/maintenance/tables.sql index 19c740b..07972aa 100644 --- a/maintenance/tables.sql +++ b/maintenance/tables.sql @@ -807,7 +807,7 @@ img_width int NOT NULL default 0, img_height int NOT NULL default 0, - -- Extracted EXIF metadata stored as a serialized PHP array. + -- Extracted Exif metadata stored as a serialized PHP array. img_metadata mediumblob NOT NULL, -- For images, bits per pixel if known. diff --git a/resources/mediawiki.libs/mediawiki.libs.jpegmeta.js b/resources/mediawiki.libs/mediawiki.libs.jpegmeta.js index af49889..2242924 100644 --- a/resources/mediawiki.libs/mediawiki.libs.jpegmeta.js +++ b/resources/mediawiki.libs/mediawiki.libs.jpegmeta.js @@ -274,7 +274,7 @@ this.JpegMeta.JpegFile.prototype._JFIF_IDENT = "JFIF\x00"; this.JpegMeta.JpegFile.prototype._JFXX_IDENT = "JFXX\x00"; - /* EXIF idents */ + /* Exif idents */ this.JpegMeta.JpegFile.prototype._EXIF_IDENT = "Exif\x00"; /* TIFF types */ diff --git a/skins/common/oldshared.css b/skins/common/oldshared.css index 833ece2..fa86aee 100644 --- a/skins/common/oldshared.css +++ b/skins/common/oldshared.css @@ -281,7 +281,7 @@ font-style: italic; } -/* Classes for EXIF data display */ +/* Classes for Exif data display */ table.mw_metadata { margin-left: 0.5em; } diff --git a/skins/common/shared.css b/skins/common/shared.css index 26a7781..8b8706b 100644 --- a/skins/common/shared.css +++ b/skins/common/shared.css @@ -684,7 +684,7 @@ padding-right: 2em; } -/* Classes for EXIF data display */ +/* Classes for Exif data display */ table.mw_metadata { font-size: 0.8em; margin-left: 0.5em; diff --git a/tests/phpunit/includes/api/RandomImageGenerator.php b/tests/phpunit/includes/api/RandomImageGenerator.php index 1b815ac..59756b2 100644 --- a/tests/phpunit/includes/api/RandomImageGenerator.php +++ b/tests/phpunit/includes/api/RandomImageGenerator.php @@ -34,7 +34,7 @@ private $shapesToDraw = 5; /** - * Orientations: 0th row, 0th column, EXIF orientation code, rotation 2x2 matrix that is opposite of orientation + * Orientations: 0th row, 0th column, Exif orientation code, rotation 2x2 matrix that is opposite of orientation * n.b. we do not handle the 'flipped' orientations, which is why there is no entry for 2, 4, 5, or 7. Those * seem to be rare in real images anyway * (we also would need a non-symmetric shape for the images to test those, like a letter F) @@ -304,7 +304,7 @@ /** * Given an image specification, produce rotated version - * This is used when simulating a rotated image capture with EXIF orientation + * This is used when simulating a rotated image capture with Exif orientation * @param $spec Object returned by getImageSpec * @param $matrix 2x2 transformation matrix * @return transformed Spec -- To view, visit https://gerrit.wikimedia.org/r/63121 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I92ba67ec60ccfe7a173d950593357b86792b8ed3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Siebrand <[email protected]> Gerrit-Reviewer: IAlex <[email protected]> Gerrit-Reviewer: Raimond Spekking <[email protected]> Gerrit-Reviewer: Shirayuki <[email protected]> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
