From 8f6ecc4df80bdf157ae5ac972fa5fc1536c6018d Mon Sep 17 00:00:00 2001
From: Reedy <reedy@wikimedia.org>
Date: Thu, 11 Oct 2018 19:20:30 +0100
Subject: [PATCH] Load installer i18n when running update.php

Bug: T206765
Change-Id: Ie1c1a5dbf7c905eaca55777448e5aba00267ed31
(cherry-picked from a8408122fd7982ec1f6f380288c887298ba07045)
---
 RELEASE-NOTES-1.31     | 1 +
 maintenance/update.php | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index e4d81234ea..f310bec05a 100644
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -7,6 +7,7 @@ THIS IS NOT A RELEASE YET
   titles when asked for none
 * (T205967) Fix syntax error typo in postgres database upgrade file.
 * (T200254) Add pear/Net_SMTP 1.7.3 to composer dependencies.
+* (T206765) Load installer i18n when running update.php.
 
 == MediaWiki 1.31.1 ==
 
diff --git a/maintenance/update.php b/maintenance/update.php
index c780b6ae6b..2a1feb4603 100755
--- a/maintenance/update.php
+++ b/maintenance/update.php
@@ -85,7 +85,7 @@ class UpdateMediaWiki extends Maintenance {
 	}
 
 	function execute() {
-		global $wgVersion, $wgLang, $wgAllowSchemaUpdates;
+		global $wgVersion, $wgLang, $wgAllowSchemaUpdates, $wgMessagesDirs;
 
 		if ( !$wgAllowSchemaUpdates
 			&& !( $this->hasOption( 'force' )
@@ -111,6 +111,9 @@ class UpdateMediaWiki extends Maintenance {
 			}
 		}
 
+		// T206765: We need to load the installer i18n files as some of errors come installer/updater code
+		$wgMessagesDirs['MediawikiInstaller'] = dirname( __DIR__ ) . '/includes/installer/i18n';
+
 		$lang = Language::factory( 'en' );
 		// Set global language to ensure localised errors are in English (T22633)
 		RequestContext::getMain()->setLanguage( $lang );
-- 
2.20.1