jenkins-bot has submitted this change and it was merged.
Change subject: Source Selector: Allow unsupported languages from url for
testing
......................................................................
Source Selector: Allow unsupported languages from url for testing
* Removes validations that were excluding unsupported languages from url
* Adds check to make sure source and target languages are not the same.
Bug: T85333
Change-Id: I3423b2c5c654c079c2f3aa55814a60ce78c3387c
---
M modules/source/ext.cx.source.selector.js
1 file changed, 9 insertions(+), 11 deletions(-)
Approvals:
Santhosh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/source/ext.cx.source.selector.js
b/modules/source/ext.cx.source.selector.js
index 7ef184f..a01c93a 100644
--- a/modules/source/ext.cx.source.selector.js
+++ b/modules/source/ext.cx.source.selector.js
@@ -176,7 +176,7 @@
* @return {array} An array of valid target languages
*/
CXSourceSelector.prototype.getValidTargetLanguages = function (
sourceLanguage ) {
- return this.languagePairs[ sourceLanguage ];
+ return this.languagePairs[ sourceLanguage ] || [];
};
/**
@@ -342,9 +342,14 @@
* @param {string} language Language code.
*/
CXSourceSelector.prototype.sourceLanguageChangeHandler = function (
language ) {
+ var validTargetLanguages;
+
this.setSourceLanguage( language );
this.fillTargetLanguages();
- this.setTargetLanguage( this.getValidTargetLanguages( language
)[ 0 ] );
+ validTargetLanguages = this.getValidTargetLanguages( language );
+ if ( validTargetLanguages.length > 0 ) {
+ this.setTargetLanguage( validTargetLanguages[ 0 ] );
+ }
this.check();
};
@@ -353,18 +358,11 @@
* @param {string} language Language code.
*/
CXSourceSelector.prototype.targetLanguageChangeHandler = function (
language ) {
- // Only allow valid target languages to be selected
- if ( !this.isValidTarget( language, this.getSourceLanguage() )
) {
+ // Don't allow setting the target language to the source
language.
+ if ( language === this.getSourceLanguage() ) {
return;
}
-
this.setTargetLanguage( language );
-
- // Disable the target input if the target language is not valid
- // for the current source language
- this.$targetTitleInput
- .prop( 'disabled', !this.isValidTarget( language,
this.getSourceLanguage() ) );
-
this.check();
};
--
To view, visit https://gerrit.wikimedia.org/r/183892
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3423b2c5c654c079c2f3aa55814a60ce78c3387c
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Jsahleen <[email protected]>
Gerrit-Reviewer: Amire80 <[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
