Phoenix303 has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/233097

Change subject: Show the selected language at the top left, even though it has 
no results.
......................................................................

Show the selected language at the top left, even though it has no results.

Change-Id: I664aad7d8d1fd3f6963debd23f278412798721bd
---
M resources/js/ext.translate.special.searchtranslations.js
1 file changed, 12 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate 
refs/changes/97/233097/1

diff --git a/resources/js/ext.translate.special.searchtranslations.js 
b/resources/js/ext.translate.special.searchtranslations.js
index 34d3e23..eacdafc 100644
--- a/resources/js/ext.translate.special.searchtranslations.js
+++ b/resources/js/ext.translate.special.searchtranslations.js
@@ -65,13 +65,19 @@
                        unique = [],
                        regions,
                        $ulsTrigger,
-                       languageLabel;
+                       uri;
 
                $languages = $( '.facet.languages' );
                languages = $languages.data( 'facets' );
                currentLanguage = $languages.data( 'language' );
                if ( !languages ) {
                        return;
+               }
+
+               if ( currentLanguage !== '' ) {
+                       uri = new mw.Uri( location.href );
+                       uri.extend( { 'language': '' } );
+                       addToSelectedBox( getLanguageLabel( currentLanguage ), 
uri.toString() );
                }
 
                resultCount = Object.keys( languages ).length;
@@ -110,14 +116,12 @@
                for ( i = 0; i <= quickLanguageList.length; i++ ) {
                        languageCode = quickLanguageList[i];
                        result = languages[languageCode];
-                       languageLabel = mw.config.get( 'wgULSLanguages' 
)[languageCode] || languageCode;
                        if ( !result ) {
                                continue;
                        }
 
                        if ( currentLanguage === languageCode ) {
                                selectedClasss = 'selected';
-                               addToSelectedBox( languageLabel, result.url );
                        } else {
                                selectedClasss = '';
                        }
@@ -128,7 +132,7 @@
                                        .addClass( 'facet-name ' + 
selectedClasss )
                                        .append( $('<a>')
                                                .attr( 'href', result.url )
-                                               .text( mw.config.get( 
'wgULSLanguages' )[languageCode] || languageCode )
+                                               .text( getLanguageLabel( 
languageCode ) )
                                        ),
                                        $( '<span>')
                                                .addClass( 'facet-count' )
@@ -320,6 +324,10 @@
                return uri.query[ name ] || '';
        }
 
+       function getLanguageLabel( languageCode ) {
+               return mw.config.get( 'wgULSLanguages' )[languageCode] || 
languageCode;
+       }
+
        // Build a selected box to show the selected items
        function buildSelectedBox() {
                $( '.tux-searchpage .tux-searchboxform .tux-search-tabs' 
).after(

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I664aad7d8d1fd3f6963debd23f278412798721bd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Phoenix303 <[email protected]>

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

Reply via email to