jenkins-bot has submitted this change and it was merged.
Change subject: Fix loading of messages using $wgMessagesDirs
......................................................................
Fix loading of messages using $wgMessagesDirs
This was missed during the migration.
Change-Id: I29be3acdec8aea7e1e080f2c0875393ca6caee34
---
M FlaggedRevs.php
M FlaggedRevs.setup.php
M tests/FlaggedRevsSetupTest.php
3 files changed, 19 insertions(+), 17 deletions(-)
Approvals:
Raimond Spekking: Looks good to me, approved
jenkins-bot: Verified
diff --git a/FlaggedRevs.php b/FlaggedRevs.php
index de60e62..bb297de 100644
--- a/FlaggedRevs.php
+++ b/FlaggedRevs.php
@@ -43,7 +43,7 @@
# Define were PHP files and i18n files are located
require( dirname( __FILE__ ) . '/FlaggedRevs.setup.php' );
require( dirname( __FILE__ ) . '/frontend/FlaggedRevsUI.setup.php' );
-FlaggedRevsSetup::defineSourcePaths( $wgAutoloadClasses,
$wgExtensionMessagesFiles );
+FlaggedRevsSetup::defineSourcePaths( $wgAutoloadClasses,
$wgExtensionMessagesFiles, $wgMessagesDirs );
# Define JS/CSS modules and file locations
FlaggedRevsUISetup::defineResourceModules( $wgResourceModules );
diff --git a/FlaggedRevs.setup.php b/FlaggedRevs.setup.php
index a6e487e..1b87cdf 100644
--- a/FlaggedRevs.setup.php
+++ b/FlaggedRevs.setup.php
@@ -30,11 +30,12 @@
* Register source code paths.
* This function must NOT depend on any config vars.
*
- * @param $classes Array $wgAutoloadClasses
- * @param $messagesFiles Array $wgExtensionMessagesFiles
+ * @param array $classes $wgAutoloadClasses
+ * @param array $messagesFiles $wgExtensionMessagesFiles
+ * @param array $messagesDirs $wgMessagesDirs
* @return void
*/
- public static function defineSourcePaths( array &$classes, array
&$messagesFiles ) {
+ public static function defineSourcePaths( array &$classes, array
&$messagesFiles, array &$messagesDirs ) {
$dir = dirname( __FILE__ );
# Basic directory layout
@@ -80,7 +81,7 @@
### Presentation classes ###
# Main i18n file and special page alias file
- $wgMessagesDirs['FlaggedRevs'] = __DIR__ . '/i18n/flaggedrevs';
+ $messagesDirs['FlaggedRevs'] = __DIR__ . '/i18n/flaggedrevs';
$messagesFiles['FlaggedRevs'] = "$langDir/FlaggedRevs.i18n.php";
$messagesFiles['FlaggedRevsMagic'] =
"$langDir/FlaggedRevs.i18n.magic.php";
$messagesFiles['FlaggedRevsAliases'] =
"$langDir/FlaggedRevs.alias.php";
@@ -93,47 +94,47 @@
$classes['RejectConfirmationFormUI'] =
"$frontendDir/RejectConfirmationFormUI.php";
# Revision review UI
$classes['RevisionReview'] =
"$spActionDir/RevisionReview_body.php";
- $wgMessagesDirs['RevisionReview'] = __DIR__ .
'/i18n/revisionreview';
+ $messagesDirs['RevisionReview'] = __DIR__ .
'/i18n/revisionreview';
$messagesFiles['RevisionReview'] =
"$langDir/RevisionReview.i18n.php";
# Stable version config UI
$classes['Stabilization'] =
"$spActionDir/Stabilization_body.php";
- $wgMessagesDirs['Stabilization'] = __DIR__ .
'/i18n/stabilization';
+ $messagesDirs['Stabilization'] = __DIR__ .
'/i18n/stabilization';
$messagesFiles['Stabilization'] =
"$langDir/Stabilization.i18n.php";
# Reviewed versions list
$classes['ReviewedVersions'] =
"$spReportDir/ReviewedVersions_body.php";
- $wgMessagesDirs['ReviewedVersions'] = __DIR__ .
'/i18n/reviewedversions';
+ $messagesDirs['ReviewedVersions'] = __DIR__ .
'/i18n/reviewedversions';
$messagesFiles['ReviewedVersions'] =
"$langDir/ReviewedVersions.i18n.php";
# Unreviewed pages list
$classes['UnreviewedPages'] =
"$spReportDir/UnreviewedPages_body.php";
- $wgMessagesDirs['UnreviewedPages'] = __DIR__ .
'/i18n/unreviewedpages';
+ $messagesDirs['UnreviewedPages'] = __DIR__ .
'/i18n/unreviewedpages';
$messagesFiles['UnreviewedPages'] =
"$langDir/UnreviewedPages.i18n.php";
# Pages with pending changes list
$classes['PendingChanges'] =
"$spReportDir/PendingChanges_body.php";
- $wgMessagesDirs['PendingChanges'] = __DIR__ .
'/i18n/pendingchanges';
+ $messagesDirs['PendingChanges'] = __DIR__ .
'/i18n/pendingchanges';
$messagesFiles['PendingChanges'] =
"$langDir/PendingChanges.i18n.php";
# Pages with tagged pending changes list
$classes['ProblemChanges'] =
"$spReportDir/ProblemChanges_body.php";
- $wgMessagesDirs['ProblemChanges'] = __DIR__ .
'/i18n/problemchanges';
+ $messagesDirs['ProblemChanges'] = __DIR__ .
'/i18n/problemchanges';
$messagesFiles['ProblemChanges'] =
"$langDir/ProblemChanges.i18n.php";
# Reviewed pages list
$classes['ReviewedPages'] =
"$spReportDir/ReviewedPages_body.php";
- $wgMessagesDirs['ReviewedPages'] = __DIR__ .
'/i18n/reviewedpages';
+ $messagesDirs['ReviewedPages'] = __DIR__ .
'/i18n/reviewedpages';
$messagesFiles['ReviewedPages'] =
"$langDir/ReviewedPages.i18n.php";
# Stable pages list (for protection config)
$classes['StablePages'] = "$spReportDir/StablePages_body.php";
- $wgMessagesDirs['StablePages'] = __DIR__ . '/i18n/stablepages';
+ $messagesDirs['StablePages'] = __DIR__ . '/i18n/stablepages';
$messagesFiles['StablePages'] = "$langDir/StablePages.i18n.php";
# Configured pages list (non-protection config)
$classes['ConfiguredPages'] =
"$spReportDir/ConfiguredPages_body.php";
- $wgMessagesDirs['ConfiguredPages'] = __DIR__ .
'/i18n/configuredpages';
+ $messagesDirs['ConfiguredPages'] = __DIR__ .
'/i18n/configuredpages';
$messagesFiles['ConfiguredPages'] =
"$langDir/ConfiguredPages.i18n.php";
# Filterable review log page to oversee reviews
$classes['QualityOversight'] =
"$spReportDir/QualityOversight_body.php";
- $wgMessagesDirs['QualityOversight'] = __DIR__ .
'/i18n/qualityoversight';
+ $messagesDirs['QualityOversight'] = __DIR__ .
'/i18n/qualityoversight';
$messagesFiles['QualityOversight'] =
"$langDir/QualityOversight.i18n.php";
# Review statistics
$classes['ValidationStatistics'] =
"$spReportDir/ValidationStatistics_body.php";
- $wgMessagesDirs['ValidationStatistics'] = __DIR__ .
'/i18n/validationstatistics';
+ $messagesDirs['ValidationStatistics'] = __DIR__ .
'/i18n/validationstatistics';
$messagesFiles['ValidationStatistics'] =
"$langDir/ValidationStatistics.i18n.php";
### End ###
diff --git a/tests/FlaggedRevsSetupTest.php b/tests/FlaggedRevsSetupTest.php
index 3aed367..0d6077c 100644
--- a/tests/FlaggedRevsSetupTest.php
+++ b/tests/FlaggedRevsSetupTest.php
@@ -8,10 +8,11 @@
public function testDefineSourcePaths() {
$autoloadClasses = $messagesFiles = $aliasesFiles = array();
- FlaggedRevsSetup::defineSourcePaths( $autoloadClasses,
$messagesFiles );
+ FlaggedRevsSetup::defineSourcePaths( $autoloadClasses,
$messagesFiles, $messagesDirs );
$fileLists = array(
'$autoloadClasses' => $autoloadClasses,
'$messageFiles' => $messagesFiles,
+ '$messagesDirs' => $messagesDirs,
);
foreach ( $fileLists as $listName => $list ) {
$this->assertNotEmpty( $list, "$listName variable is
not empty" );
--
To view, visit https://gerrit.wikimedia.org/r/123567
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I29be3acdec8aea7e1e080f2c0875393ca6caee34
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/FlaggedRevs
Gerrit-Branch: master
Gerrit-Owner: Siebrand <[email protected]>
Gerrit-Reviewer: Raimond Spekking <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
