X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2Flanguage%2Flanguages.inc;h=9c9b7ff07c4094f7a70ab6c1b2f4da6169477548;hb=f506a05aaa035b96537b33244b0f18b093048e97;hp=61ee424a9939b515eed21fc6f3e6f37a54c64101;hpb=665f171a18061aacd339102a21f32d714c5de50d;p=lhc%2Fweb%2Fwiklou.git diff --git a/maintenance/language/languages.inc b/maintenance/language/languages.inc index 61ee424a99..c6a5c68299 100644 --- a/maintenance/language/languages.inc +++ b/maintenance/language/languages.inc @@ -26,9 +26,9 @@ */ class Languages { /** @var array List of languages */ - protected $mLanguages; # + protected $mLanguages; - /** @var array Raw list of the messages in each language */ + /** @var array Raw list of the messages in each language */ protected $mRawMessages; /** @var array Messages in each language (except for English), divided to groups */ @@ -55,23 +55,16 @@ class Languages { /** @var array Magic words */ protected $mMagicWords; - /** @var array Special page aliases */ + /** @var array Special page aliases */ protected $mSpecialPageAliases; /** * Load the list of languages: all the Messages*.php * files in the languages directory. - * - * @param $exif bool Treat the Exif messages? */ - function __construct( $exif = true ) { - require __DIR__ . '/messageTypes.inc'; - $this->mIgnoredMessages = $wgIgnoredMessages; - if ( $exif ) { - $this->mOptionalMessages = array_merge( $wgOptionalMessages ); - } else { - $this->mOptionalMessages = array_merge( $wgOptionalMessages, $wgEXIFMessages ); - } + function __construct() { + Hooks::run( 'LocalisationIgnoredOptionalMessages', + [ &$this->mIgnoredMessages, &$this->mOptionalMessages ] ); $this->mLanguages = array_keys( Language::fetchLanguageNames( null, 'mwfile' ) ); sort( $this->mLanguages ); @@ -107,7 +100,7 @@ class Languages { /** * Load the language file. * - * @param $code string The language code. + * @param string $code The language code. */ protected function loadFile( $code ) { if ( isset( $this->mRawMessages[$code] ) && @@ -119,18 +112,22 @@ class Languages { ) { return; } - $this->mRawMessages[$code] = array(); + $this->mRawMessages[$code] = []; $this->mFallback[$code] = ''; - $this->mNamespaceNames[$code] = array(); - $this->mNamespaceAliases[$code] = array(); - $this->mMagicWords[$code] = array(); - $this->mSpecialPageAliases[$code] = array(); + $this->mNamespaceNames[$code] = []; + $this->mNamespaceAliases[$code] = []; + $this->mMagicWords[$code] = []; + $this->mSpecialPageAliases[$code] = []; + + $jsonfilename = Language::getJsonMessagesFileName( $code ); + if ( file_exists( $jsonfilename ) ) { + $json = Language::getLocalisationCache()->readJSONFile( $jsonfilename ); + $this->mRawMessages[$code] = $json['messages']; + } + $filename = Language::getMessagesFileName( $code ); if ( file_exists( $filename ) ) { require $filename; - if ( isset( $messages ) ) { - $this->mRawMessages[$code] = $messages; - } if ( isset( $fallback ) ) { $this->mFallback[$code] = $fallback; } @@ -161,7 +158,7 @@ class Languages { * translated - messages which are either required or optional, but translated from * English and needed. * - * @param $code string The language code. + * @param string $code The language code. */ private function loadMessages( $code ) { if ( isset( $this->mMessages[$code] ) ) { @@ -170,10 +167,10 @@ class Languages { $this->loadFile( $code ); $this->loadGeneralMessages(); $this->mMessages[$code]['all'] = $this->mRawMessages[$code]; - $this->mMessages[$code]['required'] = array(); - $this->mMessages[$code]['optional'] = array(); - $this->mMessages[$code]['obsolete'] = array(); - $this->mMessages[$code]['translated'] = array(); + $this->mMessages[$code]['required'] = []; + $this->mMessages[$code]['optional'] = []; + $this->mMessages[$code]['obsolete'] = []; + $this->mMessages[$code]['translated'] = []; foreach ( $this->mMessages[$code]['all'] as $key => $value ) { if ( isset( $this->mGeneralMessages['required'][$key] ) ) { $this->mMessages[$code]['required'][$key] = $value; @@ -204,10 +201,10 @@ class Languages { } $this->loadFile( 'en' ); $this->mGeneralMessages['all'] = $this->mRawMessages['en']; - $this->mGeneralMessages['required'] = array(); - $this->mGeneralMessages['optional'] = array(); - $this->mGeneralMessages['ignored'] = array(); - $this->mGeneralMessages['translatable'] = array(); + $this->mGeneralMessages['required'] = []; + $this->mGeneralMessages['optional'] = []; + $this->mGeneralMessages['ignored'] = []; + $this->mGeneralMessages['translatable'] = []; foreach ( $this->mGeneralMessages['all'] as $key => $value ) { if ( in_array( $key, $this->mIgnoredMessages ) ) { $this->mGeneralMessages['ignored'][$key] = $value; @@ -233,7 +230,7 @@ class Languages { * translated - messages which are either required or optional, but translated from * English and needed. * - * @param $code string The language code. + * @param string $code The language code. * * @return string The messages in this language. */ @@ -265,7 +262,7 @@ class Languages { /** * Get fallback language code for a specific language. * - * @param $code string The language code. + * @param string $code The language code. * * @return string Fallback code. */ @@ -278,7 +275,7 @@ class Languages { /** * Get namespace names for a specific language. * - * @param $code string The language code. + * @param string $code The language code. * * @return array Namespace names. */ @@ -291,7 +288,7 @@ class Languages { /** * Get namespace aliases for a specific language. * - * @param $code string The language code. + * @param string $code The language code. * * @return array Namespace aliases. */ @@ -304,7 +301,7 @@ class Languages { /** * Get magic words for a specific language. * - * @param $code string The language code. + * @param string $code The language code. * * @return array Magic words. */ @@ -317,7 +314,7 @@ class Languages { /** * Get special page aliases for a specific language. * - * @param $code string The language code. + * @param string $code The language code. * * @return array Special page aliases. */ @@ -330,7 +327,7 @@ class Languages { /** * Get the untranslated messages for a specific language. * - * @param $code string The language code. + * @param string $code The language code. * * @return array The untranslated messages for this language. */ @@ -344,14 +341,14 @@ class Languages { /** * Get the duplicate messages for a specific language. * - * @param $code string The language code. + * @param string $code The language code. * * @return array The duplicate messages for this language. */ public function getDuplicateMessages( $code ) { $this->loadGeneralMessages(); $this->loadMessages( $code ); - $duplicateMessages = array(); + $duplicateMessages = []; foreach ( $this->mMessages[$code]['translated'] as $key => $value ) { if ( $this->mGeneralMessages['translatable'][$key] == $value ) { $duplicateMessages[$key] = $value; @@ -364,7 +361,7 @@ class Languages { /** * Get the obsolete messages for a specific language. * - * @param $code string The language code. + * @param string $code The language code. * * @return array The obsolete messages for this language. */ @@ -378,15 +375,15 @@ class Languages { /** * Get the messages whose variables do not match the original ones. * - * @param $code string The language code. + * @param string $code The language code. * * @return array The messages whose variables do not match the original ones. */ public function getMessagesWithMismatchVariables( $code ) { $this->loadGeneralMessages(); $this->loadMessages( $code ); - $variables = array( '\$1', '\$2', '\$3', '\$4', '\$5', '\$6', '\$7', '\$8', '\$9' ); - $mismatchMessages = array(); + $variables = [ '\$1', '\$2', '\$3', '\$4', '\$5', '\$6', '\$7', '\$8', '\$9' ]; + $mismatchMessages = []; foreach ( $this->mMessages[$code]['translated'] as $key => $value ) { $missing = false; foreach ( $variables as $var ) { @@ -412,14 +409,14 @@ class Languages { /** * Get the messages which do not use plural. * - * @param $code string The language code. + * @param string $code The language code. * * @return array The messages which do not use plural in this language. */ public function getMessagesWithoutPlural( $code ) { $this->loadGeneralMessages(); $this->loadMessages( $code ); - $messagesWithoutPlural = array(); + $messagesWithoutPlural = []; foreach ( $this->mMessages[$code]['translated'] as $key => $value ) { if ( stripos( $this->mGeneralMessages['translatable'][$key], '{{plural:' ) !== false && stripos( $value, '{{plural:' ) === false @@ -434,14 +431,14 @@ class Languages { /** * Get the empty messages. * - * @param $code string The language code. + * @param string $code The language code. * * @return array The empty messages for this language. */ public function getEmptyMessages( $code ) { $this->loadGeneralMessages(); $this->loadMessages( $code ); - $emptyMessages = array(); + $emptyMessages = []; foreach ( $this->mMessages[$code]['translated'] as $key => $value ) { if ( $value === '' || $value === '-' ) { $emptyMessages[$key] = $value; @@ -454,14 +451,14 @@ class Languages { /** * Get the messages with trailing whitespace. * - * @param $code string The language code. + * @param string $code The language code. * * @return array The messages with trailing whitespace in this language. */ public function getMessagesWithWhitespace( $code ) { $this->loadGeneralMessages(); $this->loadMessages( $code ); - $messagesWithWhitespace = array(); + $messagesWithWhitespace = []; foreach ( $this->mMessages[$code]['translated'] as $key => $value ) { if ( $this->mGeneralMessages['translatable'][$key] !== '' && $value !== rtrim( $value ) ) { $messagesWithWhitespace[$key] = $value; @@ -474,23 +471,23 @@ class Languages { /** * Get the non-XHTML messages. * - * @param $code string The language code. + * @param string $code The language code. * * @return array The non-XHTML messages for this language. */ public function getNonXHTMLMessages( $code ) { $this->loadGeneralMessages(); $this->loadMessages( $code ); - $wrongPhrases = array( + $wrongPhrases = [ '