Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201343
Change subject: mergeMessageFileList: Support reading extension/skin.json files
......................................................................
mergeMessageFileList: Support reading extension/skin.json files
No more hacky reading of PHP files!
Change-Id: I0a92f8904bbc422d5c893f7c0af2daedf7576cf0
---
M maintenance/mergeMessageFileList.php
1 file changed, 17 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/43/201343/1
diff --git a/maintenance/mergeMessageFileList.php
b/maintenance/mergeMessageFileList.php
index 2a6f8a8..f566b1d 100644
--- a/maintenance/mergeMessageFileList.php
+++ b/maintenance/mergeMessageFileList.php
@@ -150,6 +150,7 @@
require_once RUN_MAINTENANCE_IF_MAIN;
+$queue = array();
foreach ( $mmfl['setupFiles'] as $fileName ) {
if ( strval( $fileName ) === '' ) {
continue;
@@ -157,12 +158,26 @@
if ( empty( $mmfl['quiet'] ) ) {
fwrite( STDERR, "Loading data from $fileName\n" );
}
- // Include the extension to update $wgExtensionMessagesFiles
- if ( !( include_once $fileName ) ) {
+ // Using extension.json or skin.json
+ if ( substr( $fileName, -strlen( '.json' ) ) === '.json' ) {
+ $queue[$fileName] = 1;
+ } elseif ( !( include_once $fileName ) ) {
+ // Include the extension to update $wgExtensionMessagesFiles
fwrite( STDERR, "Unable to read $fileName\n" );
exit( 1 );
}
}
+
+if ( $queue ) {
+ $registry = new ExtensionRegistry();
+ $data = $registry->readFromQueue( $queue );
+ foreach ( array( 'wgExtensionMessagesFiles', 'wgMessagesDirs' ) as $var
) {
+ if ( isset( $data['globals'][$var] ) ) {
+ $GLOBALS[$var] = array_merge( $data['globals'][$var],
$GLOBALS[$var] );
+ }
+ }
+}
+
fwrite( STDERR, "\n" );
$s =
"<" . "?php\n" .
--
To view, visit https://gerrit.wikimedia.org/r/201343
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0a92f8904bbc422d5c893f7c0af2daedf7576cf0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
