Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/270599
Change subject: Remove hyphens from all languages when creating a gray link
......................................................................
Remove hyphens from all languages when creating a gray link
The current code was removing hyphens only from accept-language,
such as en-us. Such hyphens can also appear in language codes
that come from other sources, so now they are removed from the whole list.
Bug: T113945
Change-Id: I77c5a0380a8f20d5c1f0a898dd780e5bfbf75229
---
M modules/entrypoint/ext.cx.interlanguagelink.js
1 file changed, 11 insertions(+), 13 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/99/270599/1
diff --git a/modules/entrypoint/ext.cx.interlanguagelink.js
b/modules/entrypoint/ext.cx.interlanguagelink.js
index 4047e82..4951b9e 100644
--- a/modules/entrypoint/ext.cx.interlanguagelink.js
+++ b/modules/entrypoint/ext.cx.interlanguagelink.js
@@ -25,25 +25,13 @@
function getSuggestedTargetLanguages() {
var i, splitCode, splitCodes, specialCodeIndex,
uniquePossibleTargetLanguages,
- acceptLanguages,
possibleTargetLanguages = [],
pageLanguage = mw.config.get( 'wgPageContentLanguage' );
possibleTargetLanguages.push( mw.config.get( 'wgUserLanguage' )
);
possibleTargetLanguages.push( mw.uls.getBrowserLanguage() );
- acceptLanguages = mw.uls.getAcceptLanguageList();
- // Accept language codes can have country extensions like en-US.
- // So remove them so that it is like domain code format.
- for ( i = 0; i < acceptLanguages.length; i++ ) {
- // be-tarask has hyphen in the code
- if ( acceptLanguages[ i ] === 'be-tarask' ) {
- continue;
- }
- acceptLanguages[ i ] = acceptLanguages[ i ].split( '-'
)[ 0 ];
- }
-
- $.merge( possibleTargetLanguages, acceptLanguages );
+ $.merge( possibleTargetLanguages,
mw.uls.getAcceptLanguageList() );
$.merge( possibleTargetLanguages, mw.uls.getPreviousLanguages()
);
// Replace possibly non-standard, macro and duplicate language
codes
@@ -63,6 +51,16 @@
}
}
+ // Language codes can have country extensions like en-US.
+ // Remove them so that it is like domain code format.
+ for ( i = 0; i < possibleTargetLanguages.length; i++ ) {
+ // be-tarask has hyphen in the code
+ if ( possibleTargetLanguages[ i ] === 'be-tarask' ) {
+ continue;
+ }
+ possibleTargetLanguages[ i ] = possibleTargetLanguages[
i ].split( '-' )[ 0 ];
+ }
+
uniquePossibleTargetLanguages = mw.cx.unique(
possibleTargetLanguages );
return $.grep( uniquePossibleTargetLanguages, function (
language ) {
--
To view, visit https://gerrit.wikimedia.org/r/270599
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I77c5a0380a8f20d5c1f0a898dd780e5bfbf75229
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Amire80 <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
