From e6cd0bea06e00092f0a5f4157c0153ae489149d9 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Fri, 25 May 2007 16:25:05 +0000 Subject: [PATCH] Revert r22423 -- mysteriously destroys several core files --- RELEASE-NOTES | Bin 9364 -> 8997 bytes includes/Linker.php | 4 +- includes/Parser.php | 7 +- languages/messages/MessagesEn.php | 270 +++++++++++++++++++++++++++++- 4 files changed, 271 insertions(+), 10 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 8ed5bfbf5009ba1bc1250b7a4faf79fd8dd60278..892878458058d405e00a17972dbc3888a3d94cbf 100644 GIT binary patch literal 8997 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 literal 9364 zcmeIuF#!Mo0K%a4Pi+ZLh(KY$fB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM M7%*VKfPvq@03?(E0RR91 diff --git a/includes/Linker.php b/includes/Linker.php index e7a776cf76..1f3494b5bb 100644 --- a/includes/Linker.php +++ b/includes/Linker.php @@ -414,7 +414,7 @@ class Linker { /** @todo document */ function makeImageLinkObj( $nt, $label, $alt, $align = '', $params = array(), $framed = false, - $thumb = false, $manual_thumb = '', $valign = '', $upright = false, $upright_factor = 0, $border = false, $frameless = false ) + $thumb = false, $manual_thumb = '', $valign = '', $upright = false, $upright_factor = 0, $border = false ) { global $wgContLang, $wgUser, $wgThumbLimits, $wgThumbUpright; @@ -436,7 +436,7 @@ class Linker { if ( !isset( $params['width'] ) ) { $params['width'] = $img->getWidth( $page ); - if( $thumb || $framed || $frameless ) { + if( $thumb || $framed ) { $wopt = $wgUser->getOption( 'thumbsize' ); if( !isset( $wgThumbLimits[$wopt] ) ) { diff --git a/includes/Parser.php b/includes/Parser.php index 3f9b1d69f3..0a7e86260e 100644 --- a/includes/Parser.php +++ b/includes/Parser.php @@ -4412,7 +4412,6 @@ class Parser # * ___px scale to ___ pixels width, no aligning. e.g. use in taxobox # * center center the image # * framed Keep original image size, no magnify-button. - # * frameless like 'thumbnail' but without frame, enlarge-icon and caption. User preference thumb width is used # * upright reduce width for upright images, rounded to full __0 px # * border draw a 1px border around the image # vertical-align values (no % or length right now): @@ -4437,7 +4436,6 @@ class Parser $mwManualThumb =& MagicWord::get( 'img_manualthumb' ); $mwWidth =& MagicWord::get( 'img_width' ); $mwFramed =& MagicWord::get( 'img_framed' ); - $mwFrameless =& MagicWord::get( 'img_frameless' ); $mwUpright =& MagicWord::get( 'img_upright' ); $mwBorder =& MagicWord::get( 'img_border' ); $mwPage =& MagicWord::get( 'img_page' ); @@ -4445,7 +4443,6 @@ class Parser $params = array(); $framed = $thumb = false; - $frameless = false; $upright = false; $upright_factor = 0; $border = false; @@ -4461,8 +4458,6 @@ class Parser $upright_factor = floatval( $match ); } elseif ( !is_null( $mwBorder->matchVariableStartToEnd( $val ) ) ) { $border = true; - } elseif ( !is_null( $mwFrameless->matchVariableStartToEnd( $val ) ) ) { - $frameless = true; } elseif ( ! is_null( $match = $mwManualThumb->matchVariableStartToEnd($val) ) ) { # use manually specified thumbnail $thumb=true; @@ -4509,7 +4504,7 @@ class Parser $alt = Sanitizer::stripAllTags( $alt ); # Linker does the rest - return $sk->makeImageLinkObj( $nt, $caption, $alt, $align, $params, $framed, $thumb, $manual_thumb, $valign, $upright, $upright_factor, $border, $frameless ); + return $sk->makeImageLinkObj( $nt, $caption, $alt, $align, $params, $framed, $thumb, $manual_thumb, $valign, $upright, $upright_factor, $border ); } /** diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index d69f1512fa..fa5edfe074 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -281,7 +281,6 @@ $magicWords = array( 'img_width' => array( 1, '$1px' ), 'img_center' => array( 1, 'center', 'centre' ), 'img_framed' => array( 1, 'framed', 'enframed', 'frame' ), - 'img_frameless' => array( 1, 'frameless' ), 'img_page' => array( 1, 'page=$1', 'page $1' ), 'img_upright' => array( 1, 'upright', 'upright=$1', 'upright $1' ), 'img_border' => array( 1, 'border' ), @@ -2658,4 +2657,271 @@ is collapsed. Others will be hidden by default. 'exif-lightsource-12' => 'Daylight fluorescent (D 5700 – 7100K)', 'exif-lightsource-13' => 'Day white fluorescent (N 4600 – 5400K)', 'exif-lightsource-14' => 'Cool white fluorescent (W 3900 – 4500K)', -'exif-lightsource-15' => 'White fluorescent \ No newline at end of file +'exif-lightsource-15' => 'White fluorescent (WW 3200 – 3700K)', +'exif-lightsource-17' => 'Standard light A', +'exif-lightsource-18' => 'Standard light B', +'exif-lightsource-19' => 'Standard light C', +'exif-lightsource-20' => 'D55', +'exif-lightsource-21' => 'D65', +'exif-lightsource-22' => 'D75', +'exif-lightsource-23' => 'D50', +'exif-lightsource-24' => 'ISO studio tungsten', +'exif-lightsource-255' => 'Other light source', + +'exif-focalplaneresolutionunit-2' => 'inches', + +'exif-sensingmethod-1' => 'Undefined', +'exif-sensingmethod-2' => 'One-chip color area sensor', +'exif-sensingmethod-3' => 'Two-chip color area sensor', +'exif-sensingmethod-4' => 'Three-chip color area sensor', +'exif-sensingmethod-5' => 'Color sequential area sensor', +'exif-sensingmethod-7' => 'Trilinear sensor', +'exif-sensingmethod-8' => 'Color sequential linear sensor', + +'exif-filesource-3' => 'DSC', + +'exif-scenetype-1' => 'A directly photographed image', + +'exif-customrendered-0' => 'Normal process', +'exif-customrendered-1' => 'Custom process', + +'exif-exposuremode-0' => 'Auto exposure', +'exif-exposuremode-1' => 'Manual exposure', +'exif-exposuremode-2' => 'Auto bracket', + +'exif-whitebalance-0' => 'Auto white balance', +'exif-whitebalance-1' => 'Manual white balance', + +'exif-scenecapturetype-0' => 'Standard', +'exif-scenecapturetype-1' => 'Landscape', +'exif-scenecapturetype-2' => 'Portrait', +'exif-scenecapturetype-3' => 'Night scene', + +'exif-gaincontrol-0' => 'None', +'exif-gaincontrol-1' => 'Low gain up', +'exif-gaincontrol-2' => 'High gain up', +'exif-gaincontrol-3' => 'Low gain down', +'exif-gaincontrol-4' => 'High gain down', + +'exif-contrast-0' => 'Normal', +'exif-contrast-1' => 'Soft', +'exif-contrast-2' => 'Hard', + +'exif-saturation-0' => 'Normal', +'exif-saturation-1' => 'Low saturation', +'exif-saturation-2' => 'High saturation', + +'exif-sharpness-0' => 'Normal', +'exif-sharpness-1' => 'Soft', +'exif-sharpness-2' => 'Hard', + +'exif-subjectdistancerange-0' => 'Unknown', +'exif-subjectdistancerange-1' => 'Macro', +'exif-subjectdistancerange-2' => 'Close view', +'exif-subjectdistancerange-3' => 'Distant view', + +// Pseudotags used for GPSLatitudeRef and GPSDestLatitudeRef +'exif-gpslatitude-n' => 'North latitude', +'exif-gpslatitude-s' => 'South latitude', + +// Pseudotags used for GPSLongitudeRef and GPSDestLongitudeRef +'exif-gpslongitude-e' => 'East longitude', +'exif-gpslongitude-w' => 'West longitude', + +'exif-gpsstatus-a' => 'Measurement in progress', +'exif-gpsstatus-v' => 'Measurement interoperability', + +'exif-gpsmeasuremode-2' => '2-dimensional measurement', +'exif-gpsmeasuremode-3' => '3-dimensional measurement', + +// Pseudotags used for GPSSpeedRef and GPSDestDistanceRef +'exif-gpsspeed-k' => 'Kilometres per hour', +'exif-gpsspeed-m' => 'Miles per hour', +'exif-gpsspeed-n' => 'Knots', + +// Pseudotags used for GPSTrackRef, GPSImgDirectionRef and GPSDestBearingRef +'exif-gpsdirection-t' => 'True direction', +'exif-gpsdirection-m' => 'Magnetic direction', + +# external editor support +'edit-externally' => 'Edit this file using an external application', +'edit-externally-help' => 'See the [http://meta.wikimedia.org/wiki/Help:External_editors setup instructions] for more information.', + +# 'all' in various places, this might be different for inflected languages +'recentchangesall' => 'all', +'imagelistall' => 'all', +'watchlistall1' => 'all', +'watchlistall2' => 'all', +'namespacesall' => 'all', + +# E-mail address confirmation +'confirmemail' => 'Confirm E-mail address', +'confirmemail_noemail' => 'You do not have a valid email address set in your [[Special:Preferences|user preferences]].', +'confirmemail_text' => "This wiki requires that you validate your e-mail address +before using e-mail features. Activate the button below to send a confirmation +mail to your address. The mail will include a link containing a code; load the +link in your browser to confirm that your e-mail address is valid.", +'confirmemail_pending' => '
+A confirmation code has already been e-mailed to you; if you recently +created your account, you may wish to wait a few minutes for it to +arrive before trying to request a new code. +
', +'confirmemail_send' => 'Mail a confirmation code', +'confirmemail_sent' => 'Confirmation e-mail sent.', +'confirmemail_oncreate' => 'A confirmation code was sent to your e-mail address. +This code is not required to log in, but you will need to provide it before +enabling any e-mail-based features in the wiki.', +'confirmemail_sendfailed' => 'Could not send confirmation mail. Check address for invalid characters. + +Mailer returned: $1', +'confirmemail_invalid' => 'Invalid confirmation code. The code may have expired.', +'confirmemail_needlogin' => 'You need to $1 to confirm your email address.', +'confirmemail_success' => 'Your e-mail address has been confirmed. You may now log in and enjoy the wiki.', +'confirmemail_loggedin' => 'Your e-mail address has now been confirmed.', +'confirmemail_error' => 'Something went wrong saving your confirmation.', + +'confirmemail_subject' => '{{SITENAME}} e-mail address confirmation', +'confirmemail_body' => "Someone, probably you from IP address $1, has registered an +account \"$2\" with this e-mail address on {{SITENAME}}. + +To confirm that this account really does belong to you and activate +e-mail features on {{SITENAME}}, open this link in your browser: + +$3 + +If this is *not* you, don't follow the link. This confirmation code +will expire at $4.", + +# Inputbox extension, may be useful in other contexts as well +'tryexact' => 'Try exact match', +'searchfulltext' => 'Search full text', +'createarticle' => 'Create article', + +# Scary transclusion +'scarytranscludedisabled' => '[Interwiki transcluding is disabled]', +'scarytranscludefailed' => '[Template fetch failed for $1; sorry]', +'scarytranscludetoolong' => '[URL is too long; sorry]', + +# Trackbacks +'trackbackbox' => '
+Trackbacks for this article:
+$1 +
', +'trackback' => '; $4$5 : [$2 $1]', +'trackbackexcerpt' => '; $4$5 : [$2 $1]: $3', +'trackbackremove' => ' ([$1 Delete])', +'trackbacklink' => 'Trackback', +'trackbackdeleteok' => 'The trackback was successfully deleted.', + + +# delete conflict + +'deletedwhileediting' => 'Warning: This page has been deleted after you started editing!', +'confirmrecreate' => 'User [[User:$1|$1]] ([[User talk:$1|talk]]) deleted this page after you started editing with reason: +: \'\'$2\'\' +Please confirm that really want to recreate this page.', +'recreate' => 'Recreate', + +'unit-pixel' => 'px', + +# HTML dump +'redirectingto' => 'Redirecting to [[$1]]...', + +# action=purge +'confirm_purge' => "Clear the cache of this page?\n\n$1", +'confirm_purge_button' => 'OK', + +'youhavenewmessagesmulti' => "You have new messages on $1", +'newtalkseperator' => ',_', +'searchcontaining' => "Search for articles containing ''$1''.", +'searchnamed' => "Search for articles named ''$1''.", +'articletitles' => "Articles starting with ''$1''", +'hideresults' => 'Hide results', + +# DISPLAYTITLE +'displaytitle' => '(Link to this page as [[$1]])', + +# Separator for categories in page lists +# Please don't localise this +'catseparator' => '|', + +'loginlanguagelabel' => 'Language: $1', + +# Don't duplicate this in translations; defaults should remain consistent +'loginlanguagelinks' => "* Deutsch|de +* English|en +* Esperanto|eo +* Français|fr +* Español|es +* Italiano|it +* Nederlands|nl", + +# Multipage image navigation +'imgmultipageprev' => '← previous page', +'imgmultipagenext' => 'next page →', +'imgmultigo' => 'Go!', +'imgmultigotopre' => 'Go to page', +'imgmultigotopost' => '', +'imgmultiparseerror' => 'The image file appears to be corrupted or incorrect, so {{SITENAME}} cannot retrieve a list of pages.', + +# Table pager +'ascending_abbrev' => 'asc', +'descending_abbrev' => 'desc', +'table_pager_next' => 'Next page', +'table_pager_prev' => 'Previous page', +'table_pager_first' => 'First page', +'table_pager_last' => 'Last page', +'table_pager_limit' => 'Show $1 items per page', +'table_pager_limit_submit' => 'Go', +'table_pager_empty' => 'No results', + +# Auto-summaries +'autosumm-blank' => 'Removing all content from page', +'autosumm-replace' => 'Replacing page with \'$1\'', +'autoredircomment' => 'Redirecting to [[$1]]', # This should be changed to the new naming convention, but existed beforehand. +'autosumm-new' => 'New page: $1', + +# Autoblock whitelist +'autoblock_whitelist' => 'AOL http://webmaster.info.aol.com/proxyinfo.html +*64.12.96.0/19 +*149.174.160.0/20 +*152.163.240.0/21 +*152.163.248.0/22 +*152.163.252.0/23 +*152.163.96.0/22 +*152.163.100.0/23 +*195.93.32.0/22 +*195.93.48.0/22 +*195.93.64.0/19 +*195.93.96.0/19 +*195.93.16.0/20 +*198.81.0.0/22 +*198.81.16.0/20 +*198.81.8.0/23 +*202.67.64.128/25 +*205.188.192.0/20 +*205.188.208.0/23 +*205.188.112.0/20 +*205.188.146.144/30 +*207.200.112.0/21', + +# Size units +'size-bytes' => '$1 B', +'size-kilobytes' => '$1 KB', +'size-megabytes' => '$1 MB', +'size-gigabytes' => '$1 GB', + +# Live preview +'livepreview-loading' => 'Loading…', +'livepreview-ready' => 'Loading… Ready!', +'livepreview-failed' => "Live preview failed!\nTry normal preview.", +'livepreview-error' => "Failed to connect: $1 \"$2\"\nTry normal preview.", + +# Friendlier slave lag warnings +'lag-warn-normal' => 'Changes newer than $1 seconds may not be shown in this list.', +'lag-warn-high' => 'Due to high database server lag, changes newer than $1 seconds +may not be shown in this list.', + +); + +?> -- 2.20.1