Merge "Move "mul" to the top of the termbox"

wikimedia · Nov 20, 2024 · 9873ebe · 9873ebe
2 parents 22a4a1c + 66115bd
commit 9873ebe
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/repo/includes/Hooks/OutputPageBeforeHTMLHookHandler.php b/repo/includes/Hooks/OutputPageBeforeHTMLHookHandler.php
@@ -268,7 +268,7 @@ private function getTermsLanguages(
 			$this->repoSettings->getSetting( 'tmpEnableMulLanguageCode' )
 			&& $this->repoSettings->getSetting( 'tmpAlwaysShowMulLanguageCode' )
 		) {
-			return array_merge( $userPreferredTermsLanguages, [ 'mul' ] );
+			return array_merge( [ 'mul' ], $userPreferredTermsLanguages );
 		}
 
 		// Check both the html snippets and the (possibly empty) entity for a "mul" term.
@@ -281,8 +281,8 @@ private function getTermsLanguages(
 		}
 
 		if ( $hasMulTerm ) {
-			// There is a "mul" term present, show as last entry in the term box.
-			return array_merge( $userPreferredTermsLanguages, [ 'mul' ] );
+			// There is a "mul" term present, show as first entry in the term box.
+			return array_merge( [ 'mul' ], $userPreferredTermsLanguages );
 		}
 		return $userPreferredTermsLanguages;
 	}

diff --git a/view/resources/jquery/wikibase/jquery.wikibase.entitytermsforlanguagelistview.js b/view/resources/jquery/wikibase/jquery.wikibase.entitytermsforlanguagelistview.js
@@ -93,7 +93,7 @@
 			}
 
 			PARENT.prototype._create.call( this );
-			this._defaultLanguages = this.options.userLanguages;
+			this._defaultLanguages = this.options.userLanguages.slice();
 
 			this._amendDefaultLanguages();
 
@@ -119,7 +119,7 @@
 				}
 			}
 
-			this._defaultLanguages.push( 'mul' );
+			this._defaultLanguages.unshift( 'mul' );
 		},
 
 		/**
@@ -162,8 +162,8 @@
 					.match( /(?:^|\s)wikibase-entitytermsforlanguageview-(\S+)/ );
 				if ( match && match[ 1 ] !== languages[ i ] ) {
 					if ( match[ 1 ] !== 'mul' ) {
-						// "mul" might be included in the existing term box, but we want it to be after
-						// everything else, thus discarding it is expected.
+						// "mul" might be included in the existing term box, but we want it to be the
+						// first entry, thus discarding it is expected.
 						mw.log.warn( 'Existing entitytermsforlanguagelistview DOM does not match configured languages' );
 					}
 					mismatchAt = i;

diff --git a/view/tests/qunit/jquery/wikibase/jquery.wikibase.entitytermsforlanguagelistview.tests.js b/view/tests/qunit/jquery/wikibase/jquery.wikibase.entitytermsforlanguagelistview.tests.js
@@ -177,7 +177,7 @@
 
 		assert.deepEqual(
 			entitytermsforlanguagelistview._defaultLanguages,
-			[ 'de', 'en', 'mul' ],
+			[ 'mul', 'de', 'en' ],
 			'Default languages if a "mul" term is present.'
 		);
 	} );
@@ -194,7 +194,7 @@
 
 		assert.deepEqual(
 			entitytermsforlanguagelistview._defaultLanguages,
-			[ 'de', 'en', 'mul' ],
+			[ 'mul', 'de', 'en' ],
 			'"mul" should always be added to the default languages, even if it has no term.'
 		);
 	} );