jenkins-bot has submitted this change and it was merged.
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.
The special check for be-tarask is removed, because now any code
that begins with be-* will change to be and then split to
be and be-tarask.
Bug: T113945
Change-Id: I77c5a0380a8f20d5c1f0a898dd780e5bfbf75229
---
M modules/entrypoint/ext.cx.interlanguagelink.js
1 file changed, 7 insertions(+), 13 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/entrypoint/ext.cx.interlanguagelink.js
b/modules/entrypoint/ext.cx.interlanguagelink.js
index 4047e82..f9cfb61 100644
--- a/modules/entrypoint/ext.cx.interlanguagelink.js
+++ b/modules/entrypoint/ext.cx.interlanguagelink.js
@@ -25,27 +25,21 @@
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()
);
+ // 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++ ) {
+ possibleTargetLanguages[ i ] = possibleTargetLanguages[
i ].split( '-' )[ 0 ];
+ }
+
// Replace possibly non-standard, macro and duplicate language
codes
// with normalized counterparts
splitCodes = {
--
To view, visit https://gerrit.wikimedia.org/r/270599
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I77c5a0380a8f20d5c1f0a898dd780e5bfbf75229
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Amire80 <[email protected]>
Gerrit-Reviewer: Amire80 <[email protected]>
Gerrit-Reviewer: Nikerabbit <[email protected]>
Gerrit-Reviewer: Santhosh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
