From 21b8ed694beee3d192d9ac133583e8540967ebfb Mon Sep 17 00:00:00 2001
From: Winston Sung <winston21.sung@gmail.com>
Date: Fri, 13 May 2022 18:53:40 +0800
Subject: [PATCH] Make content-language-bounded messages display in user
 interface language

This fix the issue that the system message "maps-geo-json-create-page-button", "maps-loading-map" cannot display in language variants ("page view language" aka "user language variant", see Manual:Language on MediaWiki.org )

Bug: #694
---
 psalm-baseline.xml                    | 15 ++++++---------
 src/GeoJsonPages/GeoJsonMapPageUi.php |  2 +-
 src/GeoJsonPages/GeoJsonNewPageUi.php |  2 +-
 src/Map/MapHtmlBuilder.php            |  2 +-
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 9c3d8d1ea..81dd15a64 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -86,10 +86,9 @@
       <code>addToOutput</code>
     </MissingReturnType>
     <MixedArgument occurrences="1">
-      <code>wfMessage( 'maps-loading-map' )-&gt;inContentLanguage()-&gt;text()</code>
+      <code>wfMessage( 'maps-loading-map' )-&gt;text()</code>
     </MixedArgument>
-    <MixedMethodCall occurrences="2">
-      <code>inContentLanguage</code>
+    <MixedMethodCall occurrences="1">
       <code>text</code>
     </MixedMethodCall>
     <PossiblyNullOperand occurrences="1">
@@ -101,10 +100,9 @@
   </file>
   <file src="src/GeoJsonPages/GeoJsonNewPageUi.php">
     <MixedArgument occurrences="1">
-      <code>wfMessage( 'maps-geo-json-create-page-button' )-&gt;inContentLanguage()-&gt;text()</code>
+      <code>wfMessage( 'maps-geo-json-create-page-button' )-&gt;text()</code>
     </MixedArgument>
-    <MixedMethodCall occurrences="2">
-      <code>inContentLanguage</code>
+    <MixedMethodCall occurrences="1">
       <code>text</code>
     </MixedMethodCall>
     <UndefinedFunction occurrences="1">
@@ -636,10 +634,9 @@
   </file>
   <file src="src/Map/MapHtmlBuilder.php">
     <MixedArgument occurrences="1">
-      <code>wfMessage( 'maps-loading-map' )-&gt;inContentLanguage()-&gt;text()</code>
+      <code>wfMessage( 'maps-loading-map' )-&gt;text()</code>
     </MixedArgument>
-    <MixedMethodCall occurrences="2">
-      <code>inContentLanguage</code>
+    <MixedMethodCall occurrences="1">
       <code>text</code>
     </MixedMethodCall>
     <PossiblyFalseArgument occurrences="1">
diff --git a/src/GeoJsonPages/GeoJsonMapPageUi.php b/src/GeoJsonPages/GeoJsonMapPageUi.php
index 34e02331e..f75bd1c6d 100644
--- a/src/GeoJsonPages/GeoJsonMapPageUi.php
+++ b/src/GeoJsonPages/GeoJsonMapPageUi.php
@@ -52,7 +52,7 @@ private function getHtml(): string {
 					[
 						'class' => 'maps-loading-message'
 					],
-					wfMessage( 'maps-loading-map' )->inContentLanguage()->text()
+					wfMessage( 'maps-loading-map' )->text()
 				)
 			)
 		);
diff --git a/src/GeoJsonPages/GeoJsonNewPageUi.php b/src/GeoJsonPages/GeoJsonNewPageUi.php
index 242b936dd..b30ecf241 100644
--- a/src/GeoJsonPages/GeoJsonNewPageUi.php
+++ b/src/GeoJsonPages/GeoJsonNewPageUi.php
@@ -23,7 +23,7 @@ public function addToOutput(): void {
 				[
 					'id' => 'maps-geojson-new'
 				],
-				wfMessage( 'maps-geo-json-create-page-button' )->inContentLanguage()->text()
+				wfMessage( 'maps-geo-json-create-page-button' )->text()
 			)
 		);
 	}
diff --git a/src/Map/MapHtmlBuilder.php b/src/Map/MapHtmlBuilder.php
index 7ce117cf6..a5f6e1fd2 100644
--- a/src/Map/MapHtmlBuilder.php
+++ b/src/Map/MapHtmlBuilder.php
@@ -30,7 +30,7 @@ public function getMapHTML( array $json, string $mapId, string $serviceName ): s
 				[
 					'class' => 'maps-loading-message'
 				],
-				wfMessage( 'maps-loading-map' )->inContentLanguage()->text()
+				wfMessage( 'maps-loading-map' )->text()
 			)
 			. Html::element(
 				'div',