From 72e90545454c0e014318fa3c81658e035aac58c1 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Wed, 10 Jun 2009 13:00:47 +0200 Subject: applying patch to version 1.15.0 --- maintenance/language/StatOutputs.php | 4 +- maintenance/language/dumpMessages.php | 4 +- maintenance/language/makeMessageDB.php | 45 ++++++++++++++++ maintenance/language/messageTypes.inc | 11 ++-- maintenance/language/messages.inc | 98 ++++++++++++++++++++++++++++++++-- 5 files changed, 148 insertions(+), 14 deletions(-) create mode 100644 maintenance/language/makeMessageDB.php (limited to 'maintenance/language') diff --git a/maintenance/language/StatOutputs.php b/maintenance/language/StatOutputs.php index f65b263e..b41278b4 100644 --- a/maintenance/language/StatOutputs.php +++ b/maintenance/language/StatOutputs.php @@ -48,7 +48,7 @@ class wikiStatsOutput extends statsOutput { echo ''; } function element( $in, $heading = false ) { - echo ($heading ? '!' : '|') . " $in\n"; + echo ($heading ? '!' : '|') . "$in\n"; } function formatPercent( $subset, $total, $revert = false, $accuracy = 2 ) { $v = @round(255 * $subset / $total); @@ -68,7 +68,7 @@ class wikiStatsOutput extends statsOutput { $color = $red . $green . $blue; $percent = statsOutput::formatPercent( $subset, $total, $revert, $accuracy ); - return 'bgcolor="#'. $color .'" | '. $percent; + return 'bgcolor="#'. $color .'"|'. $percent; } } diff --git a/maintenance/language/dumpMessages.php b/maintenance/language/dumpMessages.php index 5669e58c..35aeeb75 100644 --- a/maintenance/language/dumpMessages.php +++ b/maintenance/language/dumpMessages.php @@ -7,11 +7,9 @@ /** */ require_once( dirname(__FILE__).'/../commandLine.inc' ); -$wgMessageCache->disableTransform(); $messages = array(); $wgEnglishMessages = array_keys( Language::getMessagesFor( 'en' ) ); -foreach ( $wgEnglishMessages as $key ) -{ +foreach ( $wgEnglishMessages as $key ) { $messages[$key] = wfMsg( $key ); } print "MediaWiki $wgVersion language file\n"; diff --git a/maintenance/language/makeMessageDB.php b/maintenance/language/makeMessageDB.php new file mode 100644 index 00000000..f853b395 --- /dev/null +++ b/maintenance/language/makeMessageDB.php @@ -0,0 +1,45 @@ +run(); + +class MakeMessagesDB { + + function run() { + global $wgExtensionMessagesFiles, $wgMessageCache, $IP; + + $nameHash = md5( implode( "\n", array_keys( $wgExtensionMessagesFiles ) ) ); + $dir = "$IP/cache/ext-msgs"; + wfMkdirParents( $dir ); + $db = dba_open( "$dir/$nameHash.cdb", 'n', 'cdb' ); + if ( !$db ) { + echo "Cannot open DB file\n"; + exit( 1 ); + } + + # Load extension messages + foreach ( $wgExtensionMessagesFiles as $file ) { + $messages = $magicWords = array(); + require( $file ); + foreach ( $messages as $lang => $unused ) { + $wgMessageCache->processMessagesArray( $messages, $lang ); + } + } + + # Write them to the file + foreach ( $wgMessageCache->mExtensionMessages as $lang => $messages ) { + foreach ( $messages as $key => $text ) { + dba_insert( "$lang:$key", $text, $db ); + } + } + + dba_close( $db ); + } +} + diff --git a/maintenance/language/messageTypes.inc b/maintenance/language/messageTypes.inc index 1b95fe98..d155db94 100644 --- a/maintenance/language/messageTypes.inc +++ b/maintenance/language/messageTypes.inc @@ -108,8 +108,6 @@ $wgIgnoredMessages = array( 'statistics-summary', 'statistics-footer', 'talkpagetext', - 'trackback', - 'trackbackexcerpt', 'uploadfooter', 'listgrouprights-link', 'search-interwiki-custom', @@ -153,7 +151,6 @@ $wgIgnoredMessages = array( 'unusedtemplates-summary', 'fewestrevisions-summary', 'upload-summary', - 'pagetitle-view-mainpage', 'newuserlogentry', 'restrictlogpage', 'wantedtemplates-summary', @@ -180,6 +177,9 @@ $wgOptionalMessages = array( 'variantname-zh-my', 'variantname-zh-sg', 'variantname-zh', + 'variantname-gan-hans', + 'variantname-gan-hant', + 'variantname-gan', 'variantname-sr-ec', 'variantname-sr-el', 'variantname-sr', @@ -264,7 +264,6 @@ $wgOptionalMessages = array( 'pagetitle', 'filename-prefix-blacklist', 'edittools', - 'patrol-log-diff', 'size-bytes', 'size-kilobytes', 'size-megabytes', @@ -328,12 +327,16 @@ $wgOptionalMessages = array( 'pipe-separator', 'word-separator', 'ellipsis', + 'percent', 'autocomment-prefix', 'listgrouprights-right-display', 'timezone-utc', 'whatlinkshere-backlink', 'recentchangeslinked-backlink', 'diff-with-additional', + 'pagetitle-view-mainpage', + 'trackback', + 'trackbackexcerpt', ); /** EXIF messages, which may be set as optional in several checks, but are generally mandatory */ diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc index d7475428..fb22bc9c 100644 --- a/maintenance/language/messages.inc +++ b/maintenance/language/messages.inc @@ -16,6 +16,8 @@ $wgMessageStructure = array( 'tog-highlightbroken', 'tog-justify', 'tog-hideminor', + 'tog-hidepatrolled', + 'tog-newpageshidepatrolled', 'tog-extendwatchlist', 'tog-usenewrc', 'tog-numberheadings', @@ -50,6 +52,7 @@ $wgMessageStructure = array( 'tog-watchlisthideminor', 'tog-watchlisthideliu', 'tog-watchlisthideanons', + 'tog-watchlisthidepatrolled', 'tog-nolangconversion', 'tog-ccmeonemails', 'tog-diffonly', @@ -395,6 +398,11 @@ $wgMessageStructure = array( 'yournick', 'badsig', 'badsiglength', + 'yourgender', + 'gender-unknown', + 'gender-male', + 'gender-female', + 'prefs-help-gender', 'email', 'prefs-help-realname', 'loginerror', @@ -453,6 +461,10 @@ $wgMessageStructure = array( 'resetpass-submit-loggedin', 'resetpass-wrong-oldpass', 'resetpass-temp-password', + 'resetpass-log', + 'resetpass-logtext', + 'resetpass-logentry', + 'resetpass-comment', ), 'toolbar' => array( 'bold_sample', @@ -629,13 +641,22 @@ $wgMessageStructure = array( 'rev-deleted-event', 'rev-deleted-text-permission', 'rev-deleted-text-view', + 'rev-deleted-no-diff', + 'rev-deleted-unhide-diff', 'rev-delundel', 'revisiondelete', 'revdelete-nooldid-title', 'revdelete-nooldid-text', + 'revdelete-nologtype-title', + 'revdelete-nologtype-text', + 'revdelete-toomanytargets-title', + 'revdelete-toomanytargets-text', + 'revdelete-nologid-title', + 'revdelete-nologid-text', 'revdelete-selected', 'logdelete-selected', 'revdelete-text', + 'revdelete-suppress-text', 'revdelete-legend', 'revdelete-hide-text', 'revdelete-hide-name', @@ -690,6 +711,7 @@ $wgMessageStructure = array( 'mergehistory-autocomment', 'mergehistory-comment', 'mergehistory-same-destination', + 'mergehistory-reason' ), 'mergelog' => array( 'mergelog', @@ -776,6 +798,9 @@ $wgMessageStructure = array( 'notextmatches', 'prevn', 'nextn', + 'prevn-title', + 'nextn-title', + 'shown-title', 'viewprevnext', 'searchmenu-legend', 'searchmenu-exists', @@ -869,6 +894,7 @@ $wgMessageStructure = array( 'prefs-resetpass', 'saveprefs', 'resetprefs', + 'restoreprefs', 'textboxsize', 'prefs-edit-boxsize', 'rows', @@ -891,6 +917,16 @@ $wgMessageStructure = array( 'timezoneoffset', 'servertime', 'guesstimezone', + 'timezoneregion-africa', + 'timezoneregion-america', + 'timezoneregion-antarctica', + 'timezoneregion-arctic', + 'timezoneregion-asia', + 'timezoneregion-atlantic', + 'timezoneregion-australia', + 'timezoneregion-europe', + 'timezoneregion-indian', + 'timezoneregion-pacific', 'allowemail', 'prefs-searchoptions', 'prefs-namespaces', @@ -898,6 +934,8 @@ $wgMessageStructure = array( 'default', 'defaultns', 'files', + 'prefs-custom-css', + 'prefs-custom-js', ), 'userrights' => array( 'userrights', @@ -999,6 +1037,8 @@ $wgMessageStructure = array( 'right-userrights', 'right-userrights-interwiki', 'right-siteadmin', + 'right-reset-passwords', + 'right-override-export-depth', ), 'rightslog' => array( 'rightslog', @@ -1107,6 +1147,7 @@ $wgMessageStructure = array( 'filename', 'filedesc', 'fileuploadsummary', + 'filereuploadsummary', 'filestatus', 'filesource', 'uploadedfiles', @@ -1140,6 +1181,7 @@ $wgMessageStructure = array( 'overwroteimage', 'uploaddisabled', 'uploaddisabledtext', + 'php-uploaddisabledtext', 'uploadscripted', 'uploadcorrupt', 'uploadvirus', @@ -1213,14 +1255,11 @@ $wgMessageStructure = array( 'shareduploadwiki-desc', 'shareduploadwiki-linktext', 'shareddescriptionfollows', - 'shareduploadduplicate', - 'shareduploadduplicate-linktext', - 'shareduploadconflict', - 'shareduploadconflict-linktext', 'noimage', 'noimage-linktext', 'uploadnewversion-linktext', - 'imagepage-searchdupe', + 'shared-repo-from', + 'shared-repo', ), 'filerevert' => array( 'filerevert', @@ -1359,6 +1398,7 @@ $wgMessageStructure = array( 'wantedcategories-summary', 'wantedpages', 'wantedpages-summary', + 'wantedpages-badtitle', 'wantedfiles', 'wantedfiles-summary', 'wantedtemplates', @@ -1397,7 +1437,9 @@ $wgMessageStructure = array( 'listusers', 'listusers-summary', 'listusers-editsonly', + 'listusers-creationsort', 'usereditcount', + 'usercreated', 'newpages', 'newpages-summary', 'newpages-username', @@ -1465,6 +1507,7 @@ $wgMessageStructure = array( ), 'deletedcontribs' => array( 'deletedcontributions', + 'deletedcontributions-title', ), 'linksearch' => array( 'linksearch', @@ -1728,6 +1771,7 @@ $wgMessageStructure = array( 'sp-contributions-newbies-sub', 'sp-contributions-newbies-title', 'sp-contributions-blocklog', + 'sp-contributions-logs', 'sp-contributions-search', 'sp-contributions-username', 'sp-contributions-submit', @@ -1828,9 +1872,11 @@ $wgMessageStructure = array( 'block-log-flags-noemail', 'block-log-flags-nousertalk', 'block-log-flags-angry-autoblock', + 'block-log-flags-hiddenname', 'range_block_disabled', 'ipb_expiry_invalid', 'ipb_expiry_temp', + 'ipb_hide_invalid', 'ipb_already_blocked', 'ipb-needreblock', 'ipb_cant_unblock', @@ -1899,6 +1945,9 @@ $wgMessageStructure = array( 'move-redirect-suppressed', 'movelogpage', 'movelogpagetext', + 'movesubpage', + 'movesubpagetext', + 'movenosubpage', 'movereason', 'revertmove', 'delete_and_move', @@ -1926,8 +1975,11 @@ $wgMessageStructure = array( 'export-submit', 'export-addcattext', 'export-addcat', + 'export-addnstext', + 'export-addns', 'export-download', 'export-templates', + 'export-pagelinks', ), 'allmessages' => array( 'allmessages', @@ -1954,6 +2006,7 @@ $wgMessageStructure = array( 'import-interwiki-text', 'import-interwiki-source', 'import-interwiki-history', + 'import-interwiki-templates', 'import-interwiki-submit', 'import-interwiki-namespace', 'import-upload-filename', @@ -2270,6 +2323,11 @@ $wgMessageStructure = array( 'variantname-zh-my', 'variantname-zh', ), + 'variantname-gan' => array( + 'variantname-gan-hans', + 'variantname-gan-hant', + 'variantname-gan', + ), 'variantname-sr' => array( 'variantname-sr-ec', 'variantname-sr-el', @@ -2684,6 +2742,7 @@ $wgMessageStructure = array( 'pipe-separator', 'word-separator', 'ellipsis', + 'percent', ), 'imgmulti' => array( 'imgmultipageprev', @@ -2877,6 +2936,28 @@ $wgMessageStructure = array( 'external_images' => array( 'external_image_whitelist', ), + 'special-tags' => array( + 'tags', + 'tag-filter', + 'tag-filter-submit', + 'tags-title', + 'tags-intro', + 'tags-tag', + 'tags-display-header', + 'tags-description-header', + 'tags-hitcount-header', + 'tags-edit', + 'tags-hitcount', + ), + 'db-error-messages' => array( + 'dberr-header', + 'dberr-problems', + 'dberr-again', + 'dberr-info', + 'dberr-usegoogle', + 'dberr-outofdate', + 'dberr-cachederror', + ), ); /** Comments for each block */ @@ -3003,6 +3084,7 @@ XHTML id names.", To disable showing a particular link, set it to 'disable', e.g. 'variantname-zh-sg' => 'disable', Variants for Chinese language", + 'variantname-gan' => 'Variants for Gan language', 'variantname-sr' => 'Variants for Serbian language', 'variantname-kk' => 'Variants for Kazakh language', 'variantname-ku' => 'Variants for Kurdish language', @@ -3073,6 +3155,8 @@ Variants for Chinese language", 'special-specialpages' => 'Special:SpecialPages', 'special-blank' => 'Special:BlankPage', 'external_images' => 'External image whitelist', + 'special-tags' => 'Special:Tags', + 'db-error-messages' => 'Database error messages', ); /** Short comments for standalone messages */ @@ -3081,6 +3165,9 @@ $wgMessageComments = array( 'lastmodifiedat' => '$1 date, $2 time', 'sitenotice' => 'the equivalent to wgSiteNotice', 'history-feed-item-nocomment' => 'user at time', + 'sharedupload' => '$1 is the repo name, $2 is shareduploadwiki(-desc)', + 'shared-repo-from' => '$1 is the repository name', + 'shared-repo' => 'used when shared-repo-NAME does not exist', 'editcomment' => 'only shown if there is an edit comment', 'revertpage' => 'Additionally available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from', 'lastmodifiedatby' => '$1 date, $2 time, $3 user', @@ -3100,4 +3187,5 @@ $wgMessageComments = array( 'userrights' => 'Not used as normal message but as header for the special page itself', 'revision-info' => 'Additionally available: $3: revision id', 'revision-info-current' => 'Available parameters: $1: timestamp; $2: userlinks; $3: revision id', + 'nocontribs' => 'Optional parameter: $1 is the user name', ); -- cgit v1.2.2