jenkins-bot has submitted this change and it was merged.

Change subject: Set correct label and lang/dir attributes in the dashboard 
filter
......................................................................


Set correct label and lang/dir attributes in the dashboard filter

Also restore the default 'any' labels properly.

Bug: T109590
Change-Id: I1d5cad6d778bb5f011a698f4fd3cb32443a1ba3e
---
M modules/dashboard/ext.cx.dashboard.js
1 file changed, 37 insertions(+), 8 deletions(-)

Approvals:
  Nikerabbit: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/dashboard/ext.cx.dashboard.js 
b/modules/dashboard/ext.cx.dashboard.js
index 2583557..d367d21 100644
--- a/modules/dashboard/ext.cx.dashboard.js
+++ b/modules/dashboard/ext.cx.dashboard.js
@@ -292,22 +292,51 @@
                } );
 
                this.$sourceLanguageFilter.on( 'change', function () {
-                       var code = $( this ).val();
+                       var $selector,
+                               code = $( this ).val();
 
                        setFilter( 'sourceLanguage', code );
 
-                       self.$sourceLanguageFilter
-                               .siblings( 
'.translation-language-select-content' )
-                               .text( $.uls.data.getAutonym( code ) );
+                       $selector = self.$sourceLanguageFilter
+                               .siblings( 
'.translation-language-select-content' );
+
+                       if ( code === '' ) {
+                               $selector
+                                       .text( mw.msg( 
'cx-translation-filter-from-any-language' ) )
+                                       .removeProp( 'lang' )
+                                       .removeProp( 'dir' );
+                       } else {
+                               $selector
+                                       .text( $.uls.data.getAutonym( code ) )
+                                       .prop( {
+                                               lang: code,
+                                               dir: $.uls.data.getDir( code )
+                                       } );
+                       }
                } );
 
                this.$targetLanguageFilter.on( 'change', function () {
-                       var code = $( this ).val();
+                       var $selector,
+                               code = $( this ).val();
 
                        setFilter( 'targetLanguage', code );
-                       self.$targetLanguageFilter
-                               .siblings( 
'.translation-language-select-content' )
-                               .text( $.uls.data.getAutonym( code ) );
+
+                       $selector = self.$targetLanguageFilter
+                               .siblings( 
'.translation-language-select-content' );
+
+                       if ( code === '' ) {
+                               $selector
+                                       .text( mw.msg( 
'cx-translation-filter-to-any-language' ) )
+                                       .removeProp( 'lang' )
+                                       .removeProp( 'dir' );
+                       } else {
+                               $selector
+                                       .text( $.uls.data.getAutonym( code ) )
+                                       .prop( {
+                                               lang: code,
+                                               dir: $.uls.data.getDir( code )
+                                       } );
+                       }
                } );
 
                this.initSourceSelector();

-- 
To view, visit https://gerrit.wikimedia.org/r/232684
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1d5cad6d778bb5f011a698f4fd3cb32443a1ba3e
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Amire80 <[email protected]>
Gerrit-Reviewer: Nikerabbit <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to