From 32b36828fdfc2a62914408008258d641b326c8e4 Mon Sep 17 00:00:00 2001 From: Ladsgroup Date: Sun, 25 Aug 2019 21:24:24 +0000 Subject: [PATCH] Revert "Return target of redirect languages in mw.uls.getFrequentLanguageList" This reverts commit 76551ed4a7fccbaf87cd850674406ae316f4f956. Reason for revert: It seems it's breaking Serbian editing Wikidata Bug: T217770 Bug: T121747 Change-Id: If69156400ff665a8c488a24f70d6a100e26761da --- resources/js/ext.uls.common.js | 7 +------ tests/qunit/ext.uls.tests.js | 30 ------------------------------ 2 files changed, 1 insertion(+), 36 deletions(-) diff --git a/resources/js/ext.uls.common.js b/resources/js/ext.uls.common.js index c12c2a01..3b1a6e37 100644 --- a/resources/js/ext.uls.common.js +++ b/resources/js/ext.uls.common.js @@ -180,7 +180,7 @@ * @return {Array} List of language codes without duplicates. */ mw.uls.getFrequentLanguageList = function ( countryCode ) { - var i, j, lang, target, + var i, j, lang, ret = [], lists = [ [ @@ -200,11 +200,6 @@ for ( i = 0; i < lists.length; i++ ) { for ( j = 0; j < lists[ i ].length; j++ ) { lang = lists[ i ][ j ]; - target = $.uls.data.isRedirect( lang ); - if ( target ) { - lang = target; - } - // Make flat, make unique, and ignore unknown/unsupported languages if ( ret.indexOf( lang ) === -1 && $.uls.data.getAutonym( lang ) !== lang ) { ret.push( lang ); diff --git a/tests/qunit/ext.uls.tests.js b/tests/qunit/ext.uls.tests.js index 8598fafe..4d7e428c 100644 --- a/tests/qunit/ext.uls.tests.js +++ b/tests/qunit/ext.uls.tests.js @@ -90,34 +90,4 @@ 'Tagalog is one of the languages presented to users in the Philippines.' ); } ); - - QUnit.test( 'Add redirect target', function ( assert ) { - var i, foundTagalog, languages, foundFil; - - foundTagalog = false; - foundFil = false; - mw.uls.getBrowserLanguage = function () { - return 'fil'; - }; - - languages = mw.uls.getFrequentLanguageList(); - - for ( i = 0; i < languages.length; i++ ) { - if ( languages[ i ] === 'tl' ) { - foundTagalog = true; - } - - if ( languages[ i ] === 'fil' ) { - foundFil = true; - } - } - assert.ok( - foundTagalog, - 'Tagalog is one of the languages presented to users when "fil" language is requested' - ); - assert.notOk( - foundFil, - '"fil" language is redirected to Tagalog' - ); - } ); }() );