diff options
author | Pierre Schmitz <pierre@archlinux.de> | 2013-01-18 16:46:04 +0100 |
---|---|---|
committer | Pierre Schmitz <pierre@archlinux.de> | 2013-01-18 16:46:04 +0100 |
commit | 63601400e476c6cf43d985f3e7b9864681695ed4 (patch) | |
tree | f7846203a952e38aaf66989d0a4702779f549962 /maintenance/language/writeMessagesArray.inc | |
parent | 8ff01378c9e0207f9169b81966a51def645b6a51 (diff) |
Update to MediaWiki 1.20.2
this update includes:
* adjusted Arch Linux skin
* updated FluxBBAuthPlugin
* patch for https://bugzilla.wikimedia.org/show_bug.cgi?id=44024
Diffstat (limited to 'maintenance/language/writeMessagesArray.inc')
-rw-r--r-- | maintenance/language/writeMessagesArray.inc | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/maintenance/language/writeMessagesArray.inc b/maintenance/language/writeMessagesArray.inc index 524c2ba6..b2e04c7f 100644 --- a/maintenance/language/writeMessagesArray.inc +++ b/maintenance/language/writeMessagesArray.inc @@ -41,16 +41,28 @@ class MessageWriter { * @param $write Boolean: write to the messages file? * @param $listUnknown Boolean: list the unknown messages? * @param $removeUnknown Boolean: whether to remove unkown messages + * @param $messagesFolder String: path to a folder to store the MediaWiki messages. Defaults to the current install. */ - public static function writeMessagesToFile( $messages, $code, $write, $listUnknown, $removeUnknown ) { + public static function writeMessagesToFile( $messages, $code, $write, $listUnknown, $removeUnknown, $messagesFolder = false ) { # Rewrite the messages array $messages = self::writeMessagesArray( $messages, $code == 'en', false, $removeUnknown ); $messagesText = $messages[0]; $sortedMessages = $messages[1]; # Write to the file - $filename = Language::getMessagesFileName( $code ); - $contents = file_get_contents( $filename ); + if ( $messagesFolder ) + $filename = Language::getFileName( "$messagesFolder/Messages", $code ); + else + $filename = Language::getMessagesFileName( $code ); + + if ( file_exists( $filename ) ) + $contents = file_get_contents( $filename ); + else + $contents = '<?php +$messages = array( +); +'; + if( strpos( $contents, '$messages' ) !== false ) { $contents = explode( '$messages', $contents ); if( $messagesText == '$messages' . $contents[1] ) { @@ -93,7 +105,7 @@ class MessageWriter { */ public static function writeMessagesArray( $messages, $ignoredComments = false, $prefix = false, $removeUnknown = false ) { # Load messages - $dir = $prefix ? $prefix : dirname( __FILE__ ); + $dir = $prefix ? $prefix : __DIR__; require( $dir . '/messages.inc' ); self::$messageStructure = $wgMessageStructure; @@ -156,6 +168,7 @@ class MessageWriter { * @param $messages Array: key of messages. * @param $ignored Array: list of ingored message keys. * @param $optional Array: list of optional message keys. + * @return array */ public static function makeComments( $messages, $ignored, $optional ) { # Comment collector @@ -181,7 +194,7 @@ class MessageWriter { * @param $messageComments Array: optional comments for messages in this block. * @param $prefix String: prefix for every line, for indenting purposes. * - * @return The block, formatted in PHP. + * @return string The block, formatted in PHP. */ public static function writeMessagesBlock( $blockComment, $messages, $messageComments = array(), $prefix = '' ) { |