[MediaWiki-commits] [Gerrit] Do not call cxserver to display gray interwiki link - change (mediawiki...ContentTranslation)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/240076
Change subject: Do not call cxserver to display gray interwiki link
..
Do not call cxserver to display gray interwiki link
Adds a simple check to filter out language codes like
ml-IN, en-US etc coming from browser languages.
To make it future-proof, we just check if language code
is known to ULS
Re-reverts If0c329ad4094498b593df91521b28116f2804224
Bug: T110246
Change-Id: Ic1ad144b442b9f208d12466490545eee1c8a5083
---
M modules/entrypoint/ext.cx.interlanguagelink.js
1 file changed, 5 insertions(+), 41 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/76/240076/1
diff --git a/modules/entrypoint/ext.cx.interlanguagelink.js
b/modules/entrypoint/ext.cx.interlanguagelink.js
index c92089f..2fcf858 100644
--- a/modules/entrypoint/ext.cx.interlanguagelink.js
+++ b/modules/entrypoint/ext.cx.interlanguagelink.js
@@ -19,11 +19,9 @@
* - Accept-Language.
* - Browser interface language.
* This will probably include more languages in the future.
-* @param {String[]} availableTargetLanguages A list of target languages
-* that are supported by this instance.
* @return {string[]} target languages
*/
- function getSuggestedTargetLanguages( availableTargetLanguages ) {
+ function getSuggestedTargetLanguages() {
var specialCode, specialCodes, specialCodeIndex,
uniquePossibleTargetLanguages,
possibleTargetLanguages = [],
@@ -53,42 +51,10 @@
uniquePossibleTargetLanguages = mw.cx.unique(
possibleTargetLanguages );
return $.grep( uniquePossibleTargetLanguages, function (
language ) {
- return (
- $.inArray( language, availableTargetLanguages )
> -1 &&
- language !== pageLanguage
- );
+ return language !== pageLanguage &&
+ // Known language for ULS
+ language !== $.uls.data.getAutonym( language );
} );
- }
-
- /**
-* Get the list of target languages that this instance of CX supports.
-* @return {jQuery.Promise}
-*/
- function getAvailableTargetLanguages() {
- var languagePairsAPIUrl, deferred;
-
- // Optimization: creating the cxserver URL without sitemapper
- // to avoid loading the sitemapper module just for this.
- languagePairsAPIUrl =
- mw.config.get( 'wgContentTranslationSiteTemplates' ).cx
+ '/languagepairs';
-
- deferred = $.Deferred();
-
- $.get( languagePairsAPIUrl )
- .done( function ( response ) {
- deferred.resolve( response.target || [] );
- } )
- .fail( function ( response ) {
- mw.log(
- 'Error getting language pairs from ' +
languagePairsAPIUrl + ' . ' +
- response.statusText + ' (' +
response.status + '). ' +
- response.responseText
- );
-
- deferred.reject();
- } );
-
- return deferred.promise();
}
/**
@@ -181,8 +147,6 @@
}
$( function () {
- getAvailableTargetLanguages().then( function (
availableTargetLanguages ) {
- prepareCXInterLanguageLinks( availableTargetLanguages );
- } );
+ prepareCXInterLanguageLinks();
} );
}( jQuery, mediaWiki ) );
--
To view, visit https://gerrit.wikimedia.org/r/240076
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic1ad144b442b9f208d12466490545eee1c8a5083
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Do not call cxserver to display gray interwiki link - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Do not call cxserver to display gray interwiki link
..
Do not call cxserver to display gray interwiki link
Adds a simple check to filter out language codes like
ml-IN, en-US etc coming from browser languages.
To make it future-proof, we just check if language code
is known to ULS
Re-reverts If0c329ad4094498b593df91521b28116f2804224
Bug: T110246
Change-Id: Ic1ad144b442b9f208d12466490545eee1c8a5083
---
M modules/entrypoint/ext.cx.interlanguagelink.js
1 file changed, 5 insertions(+), 41 deletions(-)
Approvals:
Amire80: 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 c92089f..2fcf858 100644
--- a/modules/entrypoint/ext.cx.interlanguagelink.js
+++ b/modules/entrypoint/ext.cx.interlanguagelink.js
@@ -19,11 +19,9 @@
* - Accept-Language.
* - Browser interface language.
* This will probably include more languages in the future.
-* @param {String[]} availableTargetLanguages A list of target languages
-* that are supported by this instance.
* @return {string[]} target languages
*/
- function getSuggestedTargetLanguages( availableTargetLanguages ) {
+ function getSuggestedTargetLanguages() {
var specialCode, specialCodes, specialCodeIndex,
uniquePossibleTargetLanguages,
possibleTargetLanguages = [],
@@ -53,42 +51,10 @@
uniquePossibleTargetLanguages = mw.cx.unique(
possibleTargetLanguages );
return $.grep( uniquePossibleTargetLanguages, function (
language ) {
- return (
- $.inArray( language, availableTargetLanguages )
> -1 &&
- language !== pageLanguage
- );
+ return language !== pageLanguage &&
+ // Known language for ULS
+ language !== $.uls.data.getAutonym( language );
} );
- }
-
- /**
-* Get the list of target languages that this instance of CX supports.
-* @return {jQuery.Promise}
-*/
- function getAvailableTargetLanguages() {
- var languagePairsAPIUrl, deferred;
-
- // Optimization: creating the cxserver URL without sitemapper
- // to avoid loading the sitemapper module just for this.
- languagePairsAPIUrl =
- mw.config.get( 'wgContentTranslationSiteTemplates' ).cx
+ '/languagepairs';
-
- deferred = $.Deferred();
-
- $.get( languagePairsAPIUrl )
- .done( function ( response ) {
- deferred.resolve( response.target || [] );
- } )
- .fail( function ( response ) {
- mw.log(
- 'Error getting language pairs from ' +
languagePairsAPIUrl + ' . ' +
- response.statusText + ' (' +
response.status + '). ' +
- response.responseText
- );
-
- deferred.reject();
- } );
-
- return deferred.promise();
}
/**
@@ -181,8 +147,6 @@
}
$( function () {
- getAvailableTargetLanguages().then( function (
availableTargetLanguages ) {
- prepareCXInterLanguageLinks( availableTargetLanguages );
- } );
+ prepareCXInterLanguageLinks();
} );
}( jQuery, mediaWiki ) );
--
To view, visit https://gerrit.wikimedia.org/r/240076
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic1ad144b442b9f208d12466490545eee1c8a5083
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh
Gerrit-Reviewer: Amire80
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Do not call cxserver to display gray interwiki link - change (mediawiki...ContentTranslation)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/237084
Change subject: Do not call cxserver to display gray interwiki link
..
Do not call cxserver to display gray interwiki link
Bug: T110246
Change-Id: I081dbeb3ea2acf9f00a6418ddb8c2d9b4b0fcab6
---
M modules/entrypoint/ext.cx.interlanguagelink.js
1 file changed, 6 insertions(+), 45 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/84/237084/1
diff --git a/modules/entrypoint/ext.cx.interlanguagelink.js
b/modules/entrypoint/ext.cx.interlanguagelink.js
index c92089f..ef76005 100644
--- a/modules/entrypoint/ext.cx.interlanguagelink.js
+++ b/modules/entrypoint/ext.cx.interlanguagelink.js
@@ -1,7 +1,5 @@
/**
- * ContentTranslation Tools
- * A tool that allows editors to translate pages from one language
- * to another with the help of machine translation and other translation tools
+ * Adds an interlanguage links to suggestion translation.
*
* @file
* @ingroup Extensions
@@ -19,11 +17,9 @@
* - Accept-Language.
* - Browser interface language.
* This will probably include more languages in the future.
-* @param {String[]} availableTargetLanguages A list of target languages
-* that are supported by this instance.
* @return {string[]} target languages
*/
- function getSuggestedTargetLanguages( availableTargetLanguages ) {
+ function getSuggestedTargetLanguages() {
var specialCode, specialCodes, specialCodeIndex,
uniquePossibleTargetLanguages,
possibleTargetLanguages = [],
@@ -53,42 +49,8 @@
uniquePossibleTargetLanguages = mw.cx.unique(
possibleTargetLanguages );
return $.grep( uniquePossibleTargetLanguages, function (
language ) {
- return (
- $.inArray( language, availableTargetLanguages )
> -1 &&
- language !== pageLanguage
- );
+ return language !== pageLanguage;
} );
- }
-
- /**
-* Get the list of target languages that this instance of CX supports.
-* @return {jQuery.Promise}
-*/
- function getAvailableTargetLanguages() {
- var languagePairsAPIUrl, deferred;
-
- // Optimization: creating the cxserver URL without sitemapper
- // to avoid loading the sitemapper module just for this.
- languagePairsAPIUrl =
- mw.config.get( 'wgContentTranslationSiteTemplates' ).cx
+ '/languagepairs';
-
- deferred = $.Deferred();
-
- $.get( languagePairsAPIUrl )
- .done( function ( response ) {
- deferred.resolve( response.target || [] );
- } )
- .fail( function ( response ) {
- mw.log(
- 'Error getting language pairs from ' +
languagePairsAPIUrl + ' . ' +
- response.statusText + ' (' +
response.status + '). ' +
- response.responseText
- );
-
- deferred.reject();
- } );
-
- return deferred.promise();
}
/**
@@ -142,7 +104,7 @@
return $item;
}
- function prepareCXInterLanguageLinks( availableTargetLanguages ) {
+ function prepareCXInterLanguageLinks() {
var $newItem, $pLangList, dependencies,
suggestedTargetLanguages;
suggestedTargetLanguages = getSuggestedTargetLanguages(
availableTargetLanguages );
@@ -153,6 +115,7 @@
mw.hook( 'mw.cx.cta.shown' ).fire( campaign );
+ // TODO: load only after a click
dependencies = [ 'ext.cx.entrypoint', 'jquery.uls.data' ];
mw.loader.using( dependencies, function () {
@@ -181,8 +144,6 @@
}
$( function () {
- getAvailableTargetLanguages().then( function (
availableTargetLanguages ) {
- prepareCXInterLanguageLinks( availableTargetLanguages );
- } );
+ prepareCXInterLanguageLinks();
} );
}( jQuery, mediaWiki ) );
--
To view, visit https://gerrit.wikimedia.org/r/237084
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I081dbeb3ea2acf9f00a6418ddb8c2d9b4b0fcab6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit
___
MediaWiki-commits
[MediaWiki-commits] [Gerrit] Do not call cxserver to display gray interwiki link - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Do not call cxserver to display gray interwiki link
..
Do not call cxserver to display gray interwiki link
Bug: T110246
Change-Id: I081dbeb3ea2acf9f00a6418ddb8c2d9b4b0fcab6
---
M modules/entrypoint/ext.cx.interlanguagelink.js
1 file changed, 7 insertions(+), 46 deletions(-)
Approvals:
Santhosh: 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 c92089f..f5d8c5d 100644
--- a/modules/entrypoint/ext.cx.interlanguagelink.js
+++ b/modules/entrypoint/ext.cx.interlanguagelink.js
@@ -1,7 +1,5 @@
/**
- * ContentTranslation Tools
- * A tool that allows editors to translate pages from one language
- * to another with the help of machine translation and other translation tools
+ * Adds an interlanguage links to suggestion translation.
*
* @file
* @ingroup Extensions
@@ -19,11 +17,9 @@
* - Accept-Language.
* - Browser interface language.
* This will probably include more languages in the future.
-* @param {String[]} availableTargetLanguages A list of target languages
-* that are supported by this instance.
* @return {string[]} target languages
*/
- function getSuggestedTargetLanguages( availableTargetLanguages ) {
+ function getSuggestedTargetLanguages() {
var specialCode, specialCodes, specialCodeIndex,
uniquePossibleTargetLanguages,
possibleTargetLanguages = [],
@@ -53,42 +49,8 @@
uniquePossibleTargetLanguages = mw.cx.unique(
possibleTargetLanguages );
return $.grep( uniquePossibleTargetLanguages, function (
language ) {
- return (
- $.inArray( language, availableTargetLanguages )
> -1 &&
- language !== pageLanguage
- );
+ return language !== pageLanguage;
} );
- }
-
- /**
-* Get the list of target languages that this instance of CX supports.
-* @return {jQuery.Promise}
-*/
- function getAvailableTargetLanguages() {
- var languagePairsAPIUrl, deferred;
-
- // Optimization: creating the cxserver URL without sitemapper
- // to avoid loading the sitemapper module just for this.
- languagePairsAPIUrl =
- mw.config.get( 'wgContentTranslationSiteTemplates' ).cx
+ '/languagepairs';
-
- deferred = $.Deferred();
-
- $.get( languagePairsAPIUrl )
- .done( function ( response ) {
- deferred.resolve( response.target || [] );
- } )
- .fail( function ( response ) {
- mw.log(
- 'Error getting language pairs from ' +
languagePairsAPIUrl + ' . ' +
- response.statusText + ' (' +
response.status + '). ' +
- response.responseText
- );
-
- deferred.reject();
- } );
-
- return deferred.promise();
}
/**
@@ -142,10 +104,10 @@
return $item;
}
- function prepareCXInterLanguageLinks( availableTargetLanguages ) {
+ function prepareCXInterLanguageLinks() {
var $newItem, $pLangList, dependencies,
suggestedTargetLanguages;
- suggestedTargetLanguages = getSuggestedTargetLanguages(
availableTargetLanguages );
+ suggestedTargetLanguages = getSuggestedTargetLanguages();
if ( !suggestedTargetLanguages.length ) {
return;
@@ -153,6 +115,7 @@
mw.hook( 'mw.cx.cta.shown' ).fire( campaign );
+ // TODO: load only after a click
dependencies = [ 'ext.cx.entrypoint', 'jquery.uls.data' ];
mw.loader.using( dependencies, function () {
@@ -181,8 +144,6 @@
}
$( function () {
- getAvailableTargetLanguages().then( function (
availableTargetLanguages ) {
- prepareCXInterLanguageLinks( availableTargetLanguages );
- } );
+ prepareCXInterLanguageLinks();
} );
}( jQuery, mediaWiki ) );
--
To view, visit https://gerrit.wikimedia.org/r/237084
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I081dbeb3ea2acf9f00a6418ddb8c2d9b4b0fcab6
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit
