From d9022f63880ce039446fba8364f68e656b7bf4cb Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Thu, 3 May 2012 13:01:35 +0200 Subject: Update to MediaWiki 1.19.0 --- maintenance/language/StatOutputs.php | 4 +- maintenance/language/checkLanguage.inc | 10 +- maintenance/language/function-list.php | 63 ------ maintenance/language/generateCollationData.php | 23 +- maintenance/language/languages.inc | 112 +++++----- maintenance/language/messageTypes.inc | 33 ++- maintenance/language/messages.inc | 280 ++++++++++++++++++++----- maintenance/language/transstat.php | 4 +- maintenance/language/writeMessagesArray.inc | 3 + 9 files changed, 335 insertions(+), 197 deletions(-) delete mode 100644 maintenance/language/function-list.php (limited to 'maintenance/language') diff --git a/maintenance/language/StatOutputs.php b/maintenance/language/StatOutputs.php index c6d03641..befd0d72 100644 --- a/maintenance/language/StatOutputs.php +++ b/maintenance/language/StatOutputs.php @@ -21,7 +21,7 @@ if ( !defined( 'MEDIAWIKI' ) ) die(); * @file * @ingroup MaintenanceLanguage * @author Ævar Arnfjörð Bjarmason - * @author Ashar Voultoiz + * @author Antoine Musso */ /** A general output object. Need to be overriden */ @@ -54,7 +54,7 @@ class wikiStatsOutput extends statsOutput { echo 'English (en) is excluded because it is the default localization'; if( is_array( $wgDummyLanguageCodes ) ) { $dummyCodes = array(); - foreach( $wgDummyLanguageCodes as $dummyCode ) { + foreach( $wgDummyLanguageCodes as $dummyCode => $correctCode ) { $dummyCodes[] = $wgContLang->getLanguageName( $dummyCode ) . ' (' . $dummyCode . ')'; } echo ', as well as the following languages that are not intended for system message translations, usually because they redirect to other language codes: ' . implode( ', ', $dummyCodes ); diff --git a/maintenance/language/checkLanguage.inc b/maintenance/language/checkLanguage.inc index 1e4b94a2..8ab6125b 100644 --- a/maintenance/language/checkLanguage.inc +++ b/maintenance/language/checkLanguage.inc @@ -304,17 +304,17 @@ ENDS; /** * Check a language. - * @param $code The language code. - * @return The results. + * @param $code string The language code. + * @return array The results. */ protected function checkLanguage( $code ) { # Syntax check only + $results = array(); if ( $this->level === 0 ) { $this->L->getMessages( $code ); - return; + return $results; } - $results = array(); $checkFunctions = $this->getChecks(); $checkBlacklist = $this->getCheckBlacklist(); foreach ( $this->checks as $check ) { @@ -643,7 +643,7 @@ ENDS; /** * Check a language and show the results. - * @param $code The language code. + * @param $code string The language code. */ protected function checkLanguage( $code ) { foreach( $this->extensions as $extension ) { diff --git a/maintenance/language/function-list.php b/maintenance/language/function-list.php deleted file mode 100644 index 7b0e57c2..00000000 --- a/maintenance/language/function-list.php +++ /dev/null @@ -1,63 +0,0 @@ -addOption( 'data-dir', 'A directory on the local filesystem ' . - 'containing allkeys.txt and ucd.all.grouped.xml from unicode.org', + 'containing allkeys.txt and ucd.all.grouped.xml from unicode.org', false, true ); $this->addOption( 'debug-output', 'Filename for sending debug output to', false, true ); @@ -72,7 +76,7 @@ class GenerateCollationData extends Maintenance { // but do not skip a normal space (U+0020) since // people like to use that as a fake no header symbol. $category = substr( $data['gc'], 0, 1 ); - if ( strpos( 'LNPS', $category ) === false + if ( strpos( 'LNPS', $category ) === false && $data['cp'] !== '0020' ) { return; } @@ -84,7 +88,7 @@ class GenerateCollationData extends Maintenance { return; } - // Skip the composed Hangul syllables, we will use the bare Jamo + // Skip the composed Hangul syllables, we will use the bare Jamo // as first letters if ( $data['block'] == 'Hangul Syllables' ) { return; @@ -163,7 +167,7 @@ class GenerateCollationData extends Maintenance { } $this->weights[$cp] = $primary; if ( $tertiary === '.0008' - || $tertiary === '.000E' ) + || $tertiary === '.000E' ) { $goodTertiaryChars[$cp] = true; } @@ -192,8 +196,8 @@ class GenerateCollationData extends Maintenance { } // If one character has a given primary weight sequence, and a second - // character has a longer primary weight sequence with an initial - // portion equal to the first character, then remove the second + // character has a longer primary weight sequence with an initial + // portion equal to the first character, then remove the second // character. This avoids having characters like U+A732 (double A) // polluting the basic latin sort area. @@ -306,11 +310,12 @@ class UcdXmlReader { while ( $this->xml->name !== 'ucd' && $this->xml->read() ); $this->xml->read(); return $this->xml; - } + } /** - * Read the attributes of the current element node and return them + * Read the attributes of the current element node and return them * as an array + * @return array */ protected function readAttributes() { $attrs = array(); diff --git a/maintenance/language/languages.inc b/maintenance/language/languages.inc index 60b1112f..06102ac1 100644 --- a/maintenance/language/languages.inc +++ b/maintenance/language/languages.inc @@ -61,7 +61,7 @@ class languages { /** * Get the language list. * - * @return The language list. + * @return array The language list. */ public function getLanguages() { return $this->mLanguages; @@ -70,7 +70,7 @@ class languages { /** * Get the ignored messages list. * - * @return The ignored messages list. + * @return array The ignored messages list. */ public function getIgnoredMessages() { return $this->mIgnoredMessages; @@ -79,7 +79,7 @@ class languages { /** * Get the optional messages list. * - * @return The optional messages list. + * @return array The optional messages list. */ public function getOptionalMessages() { return $this->mOptionalMessages; @@ -137,7 +137,7 @@ class languages { * obsolete - messages which should not be translated, either because they do not exist, or they are ignored messages. * translated - messages which are either required or optional, but translated from English and needed. * - * @param $code The language code. + * @param $code string The language code. */ private function loadMessages( $code ) { if ( isset( $this->mMessages[$code] ) ) { @@ -203,7 +203,7 @@ class languages { * obsolete - messages which should not be translated, either because they do not exist, or they are ignored messages. * translated - messages which are either required or optional, but translated from English and needed. * - * @param $code The language code. + * @param $code string The language code. * * @return string The messages in this language. */ @@ -220,7 +220,7 @@ class languages { * ignored - messages which should not be translated to other languages. * translatable - messages which are either required or optional, but can be translated from English. * - * @return The general English messages. + * @return array The general English messages. */ public function getGeneralMessages() { $this->loadGeneralMessages(); @@ -230,9 +230,9 @@ class languages { /** * Get fallback language code for a specific language. * - * @param $code The language code. + * @param $code string The language code. * - * @return Fallback code. + * @return string Fallback code. */ public function getFallback( $code ) { $this->loadFile( $code ); @@ -242,7 +242,7 @@ class languages { /** * Get namespace names for a specific language. * - * @param $code The language code. + * @param $code string The language code. * * @return Namespace names. */ @@ -254,7 +254,7 @@ class languages { /** * Get namespace aliases for a specific language. * - * @param $code The language code. + * @param $code string The language code. * * @return Namespace aliases. */ @@ -266,7 +266,7 @@ class languages { /** * Get magic words for a specific language. * - * @param $code The language code. + * @param $code string The language code. * * @return Magic words. */ @@ -278,7 +278,7 @@ class languages { /** * Get special page aliases for a specific language. * - * @param $code The language code. + * @param $code string The language code. * * @return Special page aliases. */ @@ -290,9 +290,9 @@ class languages { /** * Get the untranslated messages for a specific language. * - * @param $code The language code. + * @param $code string The language code. * - * @return The untranslated messages for this language. + * @return array The untranslated messages for this language. */ public function getUntranslatedMessages( $code ) { $this->loadGeneralMessages(); @@ -303,9 +303,9 @@ class languages { /** * Get the duplicate messages for a specific language. * - * @param $code The language code. + * @param $code string The language code. * - * @return The duplicate messages for this language. + * @return array The duplicate messages for this language. */ public function getDuplicateMessages( $code ) { $this->loadGeneralMessages(); @@ -322,9 +322,9 @@ class languages { /** * Get the obsolete messages for a specific language. * - * @param $code The language code. + * @param $code string The language code. * - * @return The obsolete messages for this language. + * @return array The obsolete messages for this language. */ public function getObsoleteMessages( $code ) { $this->loadGeneralMessages(); @@ -335,9 +335,9 @@ class languages { /** * Get the messages whose variables do not match the original ones. * - * @param $code The language code. + * @param $code string The language code. * - * @return The messages whose variables do not match the original ones. + * @return array The messages whose variables do not match the original ones. */ public function getMessagesWithMismatchVariables( $code ) { $this->loadGeneralMessages(); @@ -366,9 +366,9 @@ class languages { /** * Get the messages which do not use plural. * - * @param $code The language code. + * @param $code string The language code. * - * @return The messages which do not use plural in this language. + * @return array The messages which do not use plural in this language. */ public function getMessagesWithoutPlural( $code ) { $this->loadGeneralMessages(); @@ -385,9 +385,9 @@ class languages { /** * Get the empty messages. * - * @param $code The language code. + * @param $code string The language code. * - * @return The empty messages for this language. + * @return array The empty messages for this language. */ public function getEmptyMessages( $code ) { $this->loadGeneralMessages(); @@ -404,9 +404,9 @@ class languages { /** * Get the messages with trailing whitespace. * - * @param $code The language code. + * @param $code string The language code. * - * @return The messages with trailing whitespace in this language. + * @return array The messages with trailing whitespace in this language. */ public function getMessagesWithWhitespace( $code ) { $this->loadGeneralMessages(); @@ -423,9 +423,9 @@ class languages { /** * Get the non-XHTML messages. * - * @param $code The language code. + * @param $code string The language code. * - * @return The non-XHTML messages for this language. + * @return array The non-XHTML messages for this language. */ public function getNonXHTMLMessages( $code ) { $this->loadGeneralMessages(); @@ -451,9 +451,9 @@ class languages { /** * Get the messages which include wrong characters. * - * @param $code The language code. + * @param $code string The language code. * - * @return The messages which include wrong characters in this language. + * @return array The messages which include wrong characters in this language. */ public function getMessagesWithWrongChars( $code ) { $this->loadGeneralMessages(); @@ -488,9 +488,9 @@ class languages { /** * Get the messages which include dubious links. * - * @param $code The language code. + * @param $code string The language code. * - * @return The messages which include dubious links in this language. + * @return array The messages which include dubious links in this language. */ public function getMessagesWithDubiousLinks( $code ) { $this->loadGeneralMessages(); @@ -517,9 +517,9 @@ class languages { /** * Get the messages which include unbalanced brackets. * - * @param $code The language code. + * @param $code string The language code. * - * @return The messages which include unbalanced brackets in this language. + * @return array The messages which include unbalanced brackets in this language. */ public function getMessagesWithUnbalanced( $code ) { $this->loadGeneralMessages(); @@ -547,7 +547,7 @@ class languages { if ( $a !== $b || $c !== $d ) { $messages[$key] = "$a, $b, $c, $d"; } - + } return $messages; } @@ -555,9 +555,9 @@ class languages { /** * Get the untranslated namespace names. * - * @param $code The language code. + * @param $code string The language code. * - * @return The untranslated namespace names in this language. + * @return array The untranslated namespace names in this language. */ public function getUntranslatedNamespaces( $code ) { $this->loadFile( 'en' ); @@ -570,9 +570,9 @@ class languages { /** * Get the project talk namespace names with no $1. * - * @param $code The language code. + * @param $code string The language code. * - * @return The problematic project talk namespaces in this language. + * @return array The problematic project talk namespaces in this language. */ public function getProblematicProjectTalks( $code ) { $this->loadFile( $code ); @@ -599,9 +599,9 @@ class languages { /** * Get the untranslated magic words. * - * @param $code The language code. + * @param $code string The language code. * - * @return The untranslated magic words in this language. + * @return array The untranslated magic words in this language. */ public function getUntranslatedMagicWords( $code ) { $this->loadFile( 'en' ); @@ -618,9 +618,9 @@ class languages { /** * Get the obsolete magic words. * - * @param $code The language code. + * @param $code string The language code. * - * @return The obsolete magic words in this language. + * @return array The obsolete magic words in this language. */ public function getObsoleteMagicWords( $code ) { $this->loadFile( 'en' ); @@ -637,9 +637,9 @@ class languages { /** * Get the magic words that override the original English magic word. * - * @param $code The language code. + * @param $code string The language code. * - * @return The overriding magic words in this language. + * @return array The overriding magic words in this language. */ public function getOverridingMagicWords( $code ) { $this->loadFile( 'en' ); @@ -666,9 +666,9 @@ class languages { /** * Get the magic words which do not match the case-sensitivity of the original words. * - * @param $code The language code. + * @param $code string The language code. * - * @return The magic words whose case does not match in this language. + * @return array The magic words whose case does not match in this language. */ public function getCaseMismatchMagicWords( $code ) { $this->loadFile( 'en' ); @@ -689,9 +689,9 @@ class languages { /** * Get the untranslated special page names. * - * @param $code The language code. + * @param $code string The language code. * - * @return The untranslated special page names in this language. + * @return array The untranslated special page names in this language. */ public function getUntraslatedSpecialPages( $code ) { $this->loadFile( 'en' ); @@ -708,9 +708,9 @@ class languages { /** * Get the obsolete special page names. * - * @param $code The language code. + * @param $code string The language code. * - * @return The obsolete special page names in this language. + * @return array The obsolete special page names in this language. */ public function getObsoleteSpecialPages( $code ) { $this->loadFile( 'en' ); @@ -726,7 +726,11 @@ class languages { } class extensionLanguages extends languages { - private $mMessageGroup; # The message group + + /** + * @var MessageGroup + */ + private $mMessageGroup; /** * Load the messages group. @@ -743,7 +747,7 @@ class extensionLanguages extends languages { /** * Get the extension name. * - * @return The extension name. + * @return string The extension name. */ public function name() { return $this->mMessageGroup->getLabel(); @@ -752,7 +756,7 @@ class extensionLanguages extends languages { /** * Load the language file. * - * @param $code The language code. + * @param $code string The language code. */ protected function loadFile( $code ) { if( !isset( $this->mRawMessages[$code] ) ) { diff --git a/maintenance/language/messageTypes.inc b/maintenance/language/messageTypes.inc index 62374500..1c33667a 100644 --- a/maintenance/language/messageTypes.inc +++ b/maintenance/language/messageTypes.inc @@ -90,6 +90,8 @@ $wgIgnoredMessages = array( 'accesskey-blockip-block', 'accesskey-export', 'accesskey-import', + 'accesskey-watchlistedit-normal-submit', + 'accesskey-watchlistedit-raw-submit', 'addsection', 'talkpageheader', 'anonnotice', @@ -125,7 +127,6 @@ $wgIgnoredMessages = array( 'revision-nav', 'rfcurl', 'shareddescriptionfollows', - 'signature', 'signature-anon', 'signupstart', 'signupend', @@ -181,7 +182,6 @@ $wgIgnoredMessages = array( 'unusedtemplates-summary', 'fewestrevisions-summary', 'upload-summary', - 'newuserlogentry', 'wantedtemplates-summary', 'activeusers-summary', 'search-summary', @@ -189,6 +189,8 @@ $wgIgnoredMessages = array( 'addsection-preload', 'addsection-editintro', 'longpage-hint', + 'javascripttest-backlink', + 'javascripttest-qunit-name', ); /** Optional messages, which may be translated only if changed in the target language. */ @@ -197,7 +199,6 @@ $wgOptionalMessages = array( 'editsection-brackets', 'feed-atom', 'feed-rss', - 'sectionlink', 'unit-pixel', 'userrights-irreversible-marker', 'tog-nolangconversion', @@ -233,6 +234,9 @@ $wgOptionalMessages = array( 'variantname-ike-cans', 'variantname-ike-latn', 'variantname-iu', + 'variantname-shi-tfng', + 'variantname-shi-latn', + 'variantname-shi', 'rc-change-size', 'resetpass_text', 'image_sample', @@ -314,10 +318,6 @@ $wgOptionalMessages = array( 'minutes-abbrev', 'hours-abbrev', 'days-abbrev', - 'filerevert-backlink', - 'filedelete-backlink', - 'delete-backlink', - 'protect-backlink', 'pagetitle', 'filename-prefix-blacklist', 'edittools', @@ -326,6 +326,20 @@ $wgOptionalMessages = array( 'size-kilobytes', 'size-megabytes', 'size-gigabytes', + 'size-terabytes', + 'size-petabytes', + 'size-exabytes', + 'size-zetabytes', + 'size-yottabytes', + 'bitrate-bits', + 'bitrate-kilobits', + 'bitrate-megabits', + 'bitrate-gigabits', + 'bitrate-terabits', + 'bitrate-petabits', + 'bitrate-exabits', + 'bitrate-zetabits', + 'bitrate-yottabits', 'iranian-calendar-m1', 'iranian-calendar-m2', 'iranian-calendar-m3', @@ -392,13 +406,10 @@ $wgOptionalMessages = array( 'listgrouprights-right-display', 'listgrouprights-right-revoked', 'timezone-utc', - 'whatlinkshere-backlink', - 'recentchangeslinked-backlink', 'unpatrolledletter', 'diff-with-additional', 'pagetitle-view-mainpage', - 'trackback', - 'trackbackexcerpt', + 'backlinksubtitle', 'prefs-registration-date-time', 'prefs-memberingroups-type', 'shared-repo-name-wikimediacommons', diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc index d707cf5d..bdd4d397 100644 --- a/maintenance/language/messages.inc +++ b/maintenance/language/messages.inc @@ -301,6 +301,7 @@ $wgMessageStructure = array( 'ok', 'pagetitle', 'pagetitle-view-mainpage', + 'backlinksubtitle', 'retrievedfrom', 'youhavenewmessages', 'newmessageslink', @@ -385,6 +386,7 @@ $wgMessageStructure = array( 'formerror', 'badarticleerror', 'cannotdelete', + 'cannotdelete-title', 'badtitle', 'badtitletext', 'perfcached', @@ -392,11 +394,12 @@ $wgMessageStructure = array( 'querypage-no-updates', 'wrong_wfQuery_params', 'viewsource', - 'viewsourcefor', + 'viewsource-title', 'actionthrottled', 'actionthrottledtext', 'protectedpagetext', 'viewsourcetext', + 'viewyourtext', 'protectedinterface', 'editinginterface', 'sqlhidden', @@ -480,6 +483,7 @@ $wgMessageStructure = array( 'noemailprefs', 'emailconfirmlink', 'invalidemailaddress', + 'cannotchangeemail', 'accountcreated', 'accountcreatedtext', 'createaccount-title', @@ -495,6 +499,7 @@ $wgMessageStructure = array( 'pear-mail-error', 'php-mail-error', 'php-mail-error-unknown', + 'user-mail-no-addy', ), 'resetpass' => array( 'resetpass', @@ -521,12 +526,27 @@ $wgMessageStructure = array( 'passwordreset-pretext', 'passwordreset-username', 'passwordreset-domain', + 'passwordreset-capture', + 'passwordreset-capture-help', 'passwordreset-email', 'passwordreset-emailtitle', 'passwordreset-emailtext-ip', 'passwordreset-emailtext-user', 'passwordreset-emailelement', 'passwordreset-emailsent', + 'passwordreset-emailsent-capture', + 'passwordreset-emailerror-capture', + ), + 'changeemail' => array( + 'changeemail', + 'changeemail-header', + 'changeemail-text', + 'changeemail-no-info', + 'changeemail-oldemail', + 'changeemail-newemail', + 'changeemail-none', + 'changeemail-submit', + 'changeemail-cancel', ), 'toolbar' => array( 'bold_sample', @@ -569,9 +589,6 @@ $wgMessageStructure = array( 'blockedtext', 'autoblockedtext', 'blockednoreason', - 'blockedoriginalsource', - 'blockededitsource', - 'whitelistedittitle', 'whitelistedittext', 'confirmedittext', 'nosuchsectiontitle', @@ -755,10 +772,6 @@ $wgMessageStructure = array( 'revdelete-unsuppress', 'revdelete-log', 'revdelete-submit', - 'revdelete-logentry', - 'logdelete-logentry', - 'revdelete-logaction', - 'logdelete-logaction', 'revdelete-success', 'revdelete-failure', 'logdelete-success', @@ -768,15 +781,6 @@ $wgMessageStructure = array( 'revdel-restore-visible', 'pagehist', 'deletedhist', - 'revdelete-content', - 'revdelete-summary', - 'revdelete-uname', - 'revdelete-restricted', - 'revdelete-unrestricted', - 'revdelete-hid', - 'revdelete-unhid', - 'revdelete-log-message', - 'logdelete-log-message', 'revdelete-hide-current', 'revdelete-show-no-access', 'revdelete-modify-no-access', @@ -938,6 +942,8 @@ $wgMessageStructure = array( 'prefs-watchlist-token', 'prefs-misc', // continue checking if used from here on (r49916) 'prefs-resetpass', + 'prefs-changeemail', + 'prefs-setemail', 'prefs-email', 'prefs-rendering', 'saveprefs', @@ -997,6 +1003,7 @@ $wgMessageStructure = array( 'yourrealname', 'yourlanguage', 'yourvariant', + 'prefs-help-variant', 'yournick', 'prefs-help-signature', 'badsig', @@ -1009,7 +1016,7 @@ $wgMessageStructure = array( 'email', 'prefs-help-realname', - # 3 messages depending upon wgEmailConfirmToEdit and $wgEnableUserEmail + # 3 messages depending upon $wgEmailConfirmToEdit and $wgEnableUserEmail 'prefs-help-email', 'prefs-help-email-others', 'prefs-help-email-required', @@ -1133,13 +1140,13 @@ $wgMessageStructure = array( 'right-autopatrol', 'right-patrolmarks', 'right-unwatchedpages', - 'right-trackback', 'right-mergehistory', 'right-userrights', 'right-userrights-interwiki', 'right-siteadmin', 'right-override-export-depth', 'right-sendemail', + 'right-passwordreset', ), 'rightslog' => array( 'rightslog', @@ -1173,16 +1180,17 @@ $wgMessageStructure = array( 'action-suppressionlog', 'action-block', 'action-protect', + 'action-rollback', 'action-import', 'action-importupload', 'action-patrol', 'action-autopatrol', 'action-unwatchedpages', - 'action-trackback', 'action-mergehistory', 'action-userrights', 'action-userrights-interwiki', 'action-siteadmin', + 'action-sendemail', ), 'recentchanges' => array( 'nchanges', @@ -1213,12 +1221,12 @@ $wgMessageStructure = array( 'newpageletter', 'boteditletter', 'unpatrolledletter', - 'sectionlink', 'number_of_watching_users_RCview', 'number_of_watching_users_pageview', 'rc_categories', 'rc_categories_any', 'rc-change-size', + 'rc-change-size-new', 'newsectionsummary', 'rc-enhanced-expand', 'rc-enhanced-hide', @@ -1228,7 +1236,6 @@ $wgMessageStructure = array( 'recentchangeslinked-feed', 'recentchangeslinked-toolbox', 'recentchangeslinked-title', - 'recentchangeslinked-backlink', 'recentchangeslinked-noresult', 'recentchangeslinked-summary', 'recentchangeslinked-page', @@ -1265,6 +1272,7 @@ $wgMessageStructure = array( 'ignorewarnings', 'minlength1', 'illegalfilename', + 'filename-toolong', 'badfilename', 'filetype-mime-mismatch', 'filetype-badmime', @@ -1339,6 +1347,43 @@ $wgMessageStructure = array( 'upload-http-error', ), + 'filebackend-errors' => array( + 'backend-fail-stream', + 'backend-fail-backup', + 'backend-fail-notexists', + 'backend-fail-hashes', + 'backend-fail-notsame', + 'backend-fail-invalidpath', + 'backend-fail-delete', + 'backend-fail-alreadyexists', + 'backend-fail-store', + 'backend-fail-copy', + 'backend-fail-move', + 'backend-fail-opentemp', + 'backend-fail-writetemp', + 'backend-fail-closetemp', + 'backend-fail-read', + 'backend-fail-create', + 'backend-fail-readonly', + 'backend-fail-synced', + 'backend-fail-connect', + 'backend-fail-internal', + 'backend-fail-contenttype', + 'backend-fail-batchsize' + ), + + 'lockmanager-errors' => array( + 'lockmanager-notlocked', + 'lockmanager-fail-closelock', + 'lockmanager-fail-deletelock', + 'lockmanager-fail-acquirelock', + 'lockmanager-fail-openlock', + 'lockmanager-fail-releaselock', + 'lockmanager-fail-db-bucket', + 'lockmanager-fail-db-release', + 'lockmanager-fail-svr-release' + ), + 'zip' => array( 'zip-file-open-error', 'zip-wrong-format', @@ -1354,6 +1399,7 @@ $wgMessageStructure = array( 'uploadstash-badtoken', 'uploadstash-errclear', 'uploadstash-refresh', + 'invalid-chunk-offset', ), 'img-auth' => array( @@ -1448,7 +1494,6 @@ $wgMessageStructure = array( ), 'filerevert' => array( 'filerevert', - 'filerevert-backlink', 'filerevert-legend', 'filerevert-intro', 'filerevert-comment', @@ -1459,7 +1504,6 @@ $wgMessageStructure = array( ), 'filedelete' => array( 'filedelete', - 'filedelete-backlink', 'filedelete-legend', 'filedelete-intro', 'filedelete-intro-old', @@ -1474,6 +1518,7 @@ $wgMessageStructure = array( 'filedelete-reason-dropdown', 'filedelete-edit-reasonlist', 'filedelete-maintenance', + 'filedelete-maintenance-title', ), 'mimesearch' => array( 'mimesearch', @@ -1591,6 +1636,8 @@ $wgMessageStructure = array( 'wantedpages-badtitle', 'wantedfiles', 'wantedfiles-summary', + 'wantedfiletext-cat', + 'wantedfiletext-nocat', 'wantedtemplates', 'wantedtemplates-summary', 'mostlinked', @@ -1606,6 +1653,7 @@ $wgMessageStructure = array( 'mostrevisions', 'mostrevisions-summary', 'prefixindex', + 'prefixindex-namespace', 'prefixindex-summary', 'shortpages', 'shortpages-summary', @@ -1730,11 +1778,6 @@ $wgMessageStructure = array( 'newuserlog' => array( 'newuserlogpage', 'newuserlogpagetext', - 'newuserlogentry', - 'newuserlog-byemail', - 'newuserlog-create-entry', - 'newuserlog-create2-entry', - 'newuserlog-autocreate-entry', ), 'listgrouprights' => array( 'listgrouprights', @@ -1847,15 +1890,12 @@ $wgMessageStructure = array( 'exbeforeblank', 'exblank', 'delete-confirm', - 'delete-backlink', 'delete-legend', 'historywarning', 'confirmdeletetext', 'actioncomplete', 'actionfailed', 'deletedtext', - 'deletedarticle', - 'suppressedarticle', 'dellogpage', 'dellogpagetext', 'deletionlog', @@ -1892,8 +1932,10 @@ $wgMessageStructure = array( 'unprotectedarticle', 'movedarticleprotection', 'protect-title', + 'protect-title-notallowed', 'prot_1movedto2', - 'protect-backlink', + 'protect-badnamespace-title', + 'protect-badnamespace-text', 'protect-legend', 'protectcomment', 'protectexpiry', @@ -1911,6 +1953,7 @@ $wgMessageStructure = array( 'protect-level-sysop', 'protect-summary-cascade', 'protect-expiring', + 'protect-expiring-local', 'protect-expiry-indefinite', 'protect-cascade', 'protect-cantedit', @@ -1960,13 +2003,13 @@ $wgMessageStructure = array( 'undeletereset', 'undeleteinvert', 'undeletecomment', - 'undeletedarticle', 'undeletedrevisions', 'undeletedrevisions-files', 'undeletedfiles', 'cannotundelete', 'undeletedpage', 'undelete-header', + 'undelete-search-title', 'undelete-search-box', 'undelete-search-prefix', 'undelete-search-submit', @@ -1975,6 +2018,7 @@ $wgMessageStructure = array( 'undelete-bad-store-key', 'undelete-cleanup-error', 'undelete-missing-filearchive', + 'undelete-error', 'undelete-error-short', 'undelete-error-long', 'undelete-show-file-confirm', @@ -2023,7 +2067,6 @@ $wgMessageStructure = array( 'whatlinkshere-title', 'whatlinkshere-summary', 'whatlinkshere-page', - 'whatlinkshere-backlink', 'linkshere', 'nolinkshere', 'nolinkshere-ns', @@ -2088,6 +2131,7 @@ $wgMessageStructure = array( 'blocklist-userblocks', 'blocklist-tempblocks', 'blocklist-addressblocks', + 'blocklist-rangeblocks', 'blocklist-timestamp', 'blocklist-target', 'blocklist-expiry', @@ -2112,6 +2156,7 @@ $wgMessageStructure = array( 'unblocklink', 'change-blocklink', 'contribslink', + 'emaillink', 'autoblocker', 'blocklogpage', 'blocklog-showlog', @@ -2202,9 +2247,6 @@ $wgMessageStructure = array( 'movepage-page-moved', 'movepage-page-unmoved', 'movepage-max-pages', - '1movedto2', - '1movedto2_redir', - 'move-redirect-suppressed', 'movelogpage', 'movelogpagetext', 'movesubpage', @@ -2237,8 +2279,10 @@ $wgMessageStructure = array( 'export' => array( 'export', 'exporttext', + 'exportall', 'exportcuronly', 'exportnohistory', + 'exportlistauthors', 'export-submit', 'export-addcattext', 'export-addcat', @@ -2270,6 +2314,8 @@ $wgMessageStructure = array( 'thumbnail_error', 'djvu_page_error', 'djvu_no_xml', + 'thumbnail-temp-create', + 'thumbnail-dest-create', 'thumbnail_invalid_params', 'thumbnail_dest_directory', 'thumbnail_image-type', @@ -2311,6 +2357,11 @@ $wgMessageStructure = array( 'import-upload', 'import-token-mismatch', 'import-invalid-interwiki', + 'import-error-edit', + 'import-error-create', + 'import-error-interwiki', + 'import-error-special', + 'import-error-invalid', ), 'importlog' => array( 'importlogpage', @@ -2320,6 +2371,19 @@ $wgMessageStructure = array( 'import-logentry-interwiki', 'import-logentry-interwiki-detail', ), + 'javaccripttest' => array( + 'javascripttest', + 'javascripttest-backlink', + 'javascripttest-disabled', + 'javascripttest-title', + 'javascripttest-pagetext-noframework', + 'javascripttest-pagetext-unknownframework', + 'javascripttest-pagetext-frameworks', + 'javascripttest-pagetext-skins' , + 'javascripttest-qunit-name', + 'javascripttest-qunit-intro', + 'javascripttest-qunit-heading', + ), 'accesskeys' => array( 'accesskey-pt-userpage', 'accesskey-pt-anonuserpage', @@ -2388,6 +2452,8 @@ $wgMessageStructure = array( 'accesskey-blockip-block', 'accesskey-export', 'accesskey-import', + 'accesskey-watchlistedit-normal-submit', + 'accesskey-watchlistedit-raw-submit', ), 'tooltips' => array( 'tooltip-pt-userpage', @@ -2450,6 +2516,8 @@ $wgMessageStructure = array( 'tooltip-diff', 'tooltip-compareselectedversions', 'tooltip-watch', + 'tooltip-watchlistedit-normal-submit', + 'tooltip-watchlistedit-raw-submit', 'tooltip-recreate', 'tooltip-upload', 'tooltip-rollback', @@ -2554,9 +2622,6 @@ $wgMessageStructure = array( 'patrol-log' => array( 'patrol-log-page', 'patrol-log-header', - 'patrol-log-line', - 'patrol-log-auto', - 'patrol-log-diff', 'log-show-hide-patrol', ), 'imagedeletion' => array( @@ -2611,6 +2676,11 @@ $wgMessageStructure = array( 'minutes-abbrev', 'hours-abbrev', 'days-abbrev', + 'seconds', + 'minutes', + 'hours', + 'days', + 'ago', ), 'badimagelist' => array( 'bad_image_list', @@ -2660,6 +2730,11 @@ $wgMessageStructure = array( 'variantname-ike-latn', 'variantname-iu', ), + 'variantname-shi' => array( + 'variantname-shi-tfng', + 'variantname-shi-latn', + 'variantname-shi', + ), 'metadata' => array( 'metadata', 'metadata-help', @@ -3168,14 +3243,6 @@ $wgMessageStructure = array( 'scarytranscludefailed', 'scarytranscludetoolong', ), - 'trackbacks' => array( - 'trackbackbox', - 'trackback', - 'trackbackexcerpt', - 'trackbackremove', - 'trackbacklink', - 'trackbackdeleteok', - ), 'deleteconflict' => array( 'deletedwhileediting', 'confirmrecreate', @@ -3239,6 +3306,22 @@ $wgMessageStructure = array( 'size-kilobytes', 'size-megabytes', 'size-gigabytes', + 'size-terabytes', + 'size-petabytes', + 'size-exabytes', + 'size-zetabytes', + 'size-yottabytes', + ), + 'bitrateunits' => array( + 'bitrate-bits', + 'bitrate-kilobits', + 'bitrate-megabits', + 'bitrate-gigabits', + 'bitrate-terabits', + 'bitrate-petabits', + 'bitrate-exabits', + 'bitrate-zetabits', + 'bitrate-yottabits', ), 'livepreview' => array( 'livepreview-loading', @@ -3431,6 +3514,9 @@ $wgMessageStructure = array( 'compare-rev1', 'compare-rev2', 'compare-submit', + 'compare-invalid-title', + 'compare-title-not-exists', + 'compare-revision-not-exists', ), 'db-error-messages' => array( 'dberr-header', @@ -3460,6 +3546,91 @@ $wgMessageStructure = array( 'unwatch' => array( 'confirm-unwatch-button', ), + 'logging' => array( + 'logentry-delete-delete', + 'logentry-delete-restore', + 'logentry-delete-event', + 'logentry-delete-revision', + 'logentry-delete-event-legacy', + 'logentry-delete-revision-legacy', + 'logentry-suppress-delete', + 'logentry-suppress-event', + 'logentry-suppress-revision', + 'logentry-suppress-event-legacy', + 'logentry-suppress-revision-legacy', + 'revdelete-content-hid', + 'revdelete-summary-hid', + 'revdelete-uname-hid', + 'revdelete-content-unhid', + 'revdelete-summary-unhid', + 'revdelete-uname-unhid', + 'revdelete-restricted', + 'revdelete-unrestricted', + 'logentry-move-move', + 'logentry-move-move-noredirect', + 'logentry-move-move_redir', + 'logentry-move-move_redir-noredirect', + 'logentry-patrol-patrol', + 'logentry-patrol-patrol-auto', + 'logentry-newusers-newusers', + 'logentry-newusers-create', + 'logentry-newusers-create2', + 'logentry-newusers-autocreate', + 'newuserlog-byemail', + ), + 'feedback' => array( + 'feedback-bugornote', + 'feedback-subject', + 'feedback-message', + 'feedback-cancel', + 'feedback-submit', + 'feedback-adding', + 'feedback-error1', + 'feedback-error2', + 'feedback-error3', + 'feedback-thanks', + 'feedback-close', + 'feedback-bugcheck', + 'feedback-bugnew', + ), + 'apierrors' => array( + 'api-error-badaccess-groups', + 'api-error-badtoken', + 'api-error-copyuploaddisabled', + 'api-error-duplicate', + 'api-error-duplicate-archive', + 'api-error-duplicate-archive-popup-title', + 'api-error-duplicate-popup-title', + 'api-error-empty-file', + 'api-error-emptypage', + 'api-error-fetchfileerror', + 'api-error-file-too-large', + 'api-error-filename-tooshort', + 'api-error-filetype-banned', + 'api-error-filetype-missing', + 'api-error-hookaborted', + 'api-error-http', + 'api-error-illegal-filename', + 'api-error-internal-error', + 'api-error-invalid-file-key', + 'api-error-missingparam', + 'api-error-missingresult', + 'api-error-mustbeloggedin', + 'api-error-mustbeposted', + 'api-error-noimageinfo', + 'api-error-nomodule', + 'api-error-ok-but-empty', + 'api-error-overwrite', + 'api-error-stashfailed', + 'api-error-timeout', + 'api-error-unclassified', + 'api-error-unknown-code', + 'api-error-unknown-error', + 'api-error-unknown-warning', + 'api-error-unknownerror', + 'api-error-uploaddisabled', + 'api-error-verification-error', + ), ); /** Comments for each block */ @@ -3493,6 +3664,7 @@ XHTML id names.", 'passwordstrength' => 'JavaScript password checks', 'resetpass' => 'Change password dialog', 'passwordreset' => 'Special:PasswordReset', + 'changeemail' => 'Special:ChangeEmail', 'toolbar' => 'Edit page toolbar', 'edit' => 'Edit pages', 'parserwarnings' => 'Parser/template warnings', @@ -3522,6 +3694,8 @@ XHTML id names.", 'upload' => 'Upload', 'zip' => 'ZipDirectoryReader', 'upload-errors' => '', + 'filebackend-errors' => 'File backend', + 'lockmanager-errors' => 'Lock manager', 'uploadstash' => 'Special:UploadStash', 'img-auth' => 'img_auth script messages', 'http-errors' => 'HTTP errors', @@ -3579,6 +3753,7 @@ XHTML id names.", 'thumbnails' => 'Thumbnails', 'import' => 'Special:Import', 'importlog' => 'Import log', + 'javaccripttest' => 'JavaScriptTest', 'accesskeys' => 'Keyboard access keys for power users', 'tooltips' => 'Tooltip help for the actions', 'stylesheets' => 'Stylesheets', @@ -3605,6 +3780,7 @@ Variants for Chinese language", 'variantname-ku' => 'Variants for Kurdish language', 'variantname-tg' => 'Variants for Tajiki language', 'variantname-iu' => 'Variants for Inuktitut language', + 'variantname-shi' => 'Variants for Tachelhit language', 'media-info' => 'Media information', 'metadata' => 'Metadata', 'exif' => 'EXIF tags', @@ -3657,7 +3833,6 @@ Variants for Chinese language", 'all' => "'all' in various places, this might be different for inflected languages", 'confirmemail' => 'E-mail address confirmation', 'scarytransclusion' => 'Scary transclusion', - 'trackbacks' => 'Trackbacks', 'deleteconflict' => 'Delete conflict', 'unit-pixel' => '', 'purge' => 'action=purge', @@ -3668,6 +3843,7 @@ Variants for Chinese language", 'autosumm' => 'Auto-summaries', 'autoblock_whitelist' => 'Autoblock whitelist', 'sizeunits' => 'Size units', + 'bitrateunits' => 'Bitrate units', 'livepreview' => 'Live preview', 'lagwarning' => 'Friendlier slave lag warnings', 'watchlisteditor' => 'Watchlist editor', @@ -3688,5 +3864,7 @@ Variants for Chinese language", 'db-error-messages' => 'Database error messages', 'html-forms' => 'HTML forms', 'sqlite' => 'SQLite database support', - 'ajax-category' => 'Add categories per AJAX', + 'logging' => 'New logging system', + 'feedback' => 'Feedback', + 'apierrors' => 'API errors', ); diff --git a/maintenance/language/transstat.php b/maintenance/language/transstat.php index a3213266..fb08b7d0 100644 --- a/maintenance/language/transstat.php +++ b/maintenance/language/transstat.php @@ -21,7 +21,7 @@ * @ingroup MaintenanceLanguage * * @author Ævar Arnfjörð Bjarmason - * @author Ashar Voultoiz + * @author Antoine Musso * * Output is posted from time to time on: * http://www.mediawiki.org/wiki/Localisation_statistics @@ -97,7 +97,7 @@ $wgRequiredMessagesNumber = count( $wgGeneralMessages['required'] ); foreach ( $wgLanguages->getLanguages() as $code ) { # Don't check English, RTL English or dummy language codes if ( $code == 'en' || $code == 'enRTL' || (is_array( $wgDummyLanguageCodes ) && - in_array( $code, $wgDummyLanguageCodes ) ) ) { + isset( $wgDummyLanguageCodes[$code] ) ) ) { continue; } diff --git a/maintenance/language/writeMessagesArray.inc b/maintenance/language/writeMessagesArray.inc index 093359ca..524c2ba6 100644 --- a/maintenance/language/writeMessagesArray.inc +++ b/maintenance/language/writeMessagesArray.inc @@ -106,6 +106,9 @@ class MessageWriter { # Sort messages to blocks $sortedMessages['unknown'] = $messages; foreach( self::$messageStructure as $blockName => $block ) { + /** + * @var $block array + */ foreach( $block as $key ) { if( array_key_exists( $key, $sortedMessages['unknown'] ) ) { $sortedMessages[$blockName][$key] = $sortedMessages['unknown'][$key]; -- cgit v1.2.2