From 448340b9da6d9a4501642f4ff0fb149242f7e344 Mon Sep 17 00:00:00 2001 From: "Amir E. Aharoni" Date: Mon, 6 May 2013 01:43:33 +0300 Subject: [PATCH] Fixes for empty interlanguage links list * Change the title near the icon to 'Language'. * Remove the empty box in the Monobook skin. Bug: 47972 Bug: 47967 Change-Id: Ie6930509ed7f200cf0bffda91b8d9fd58f1bed8b --- Resources.php | 3 +++ UniversalLanguageSelector.i18n.php | 6 ++++++ resources/js/ext.uls.interface.js | 13 +++++++++++++ 3 files changed, 22 insertions(+) diff --git a/Resources.php b/Resources.php index 4747205f..0018022e 100644 --- a/Resources.php +++ b/Resources.php @@ -75,6 +75,9 @@ $wgResourceModules['ext.uls.interface'] = array( 'ext.uls.displaysettings', 'ext.uls.inputsettings', ), + 'messages' => array( + 'uls-plang-title-languages', + ), 'position' => 'top', ) + $resourcePaths; diff --git a/UniversalLanguageSelector.i18n.php b/UniversalLanguageSelector.i18n.php index 811a1ab2..0f84006d 100644 --- a/UniversalLanguageSelector.i18n.php +++ b/UniversalLanguageSelector.i18n.php @@ -23,18 +23,24 @@ $messages = array(); /** * English * @author santhosh + * @author Amire80 */ $messages['en'] = array( 'UniversalLanguageSelector' => 'Universal Language Selector', 'uls-desc' => 'Gives the user several ways to select a language and to adjust language settings', + + 'uls-plang-title-languages' => 'Languages', ); /** Message documentation (Message documentation) * @author Shirayuki + * @author Amire80 */ $messages['qqq'] = array( 'UniversalLanguageSelector' => 'Extension name', 'uls-desc' => 'Extension description', + 'uls-plang-title-languages' => 'A title for the are in the sidebar in which the interlanguage links are supposed to appear. +This title is shown when there are no interlanguage links there, but an icon that enables the ULS is shown.', 'uls-select-content-language' => 'Main heading in the language selector popup. {{Identical|Select language}}', ); diff --git a/resources/js/ext.uls.interface.js b/resources/js/ext.uls.interface.js index b6851446..e0e87272 100644 --- a/resources/js/ext.uls.interface.js +++ b/resources/js/ext.uls.interface.js @@ -40,8 +40,21 @@ .addClass( 'uls-trigger' ) .attr( 'title', $.i18n( 'ext-uls-language-settings-title' ) ) ); + // Remove the dummy link that was added to make sure that the section appears $pLang.find( '.uls-p-lang-dummy' ).remove(); + + if ( !$pLang.find( 'div ul' ).children().length ) { + // Replace the title of the interlanguage links + // area if there are no interlanguage links + $pLang.find( 'h3' ) + .text( mw.msg( 'uls-plang-title-languages' ) ); + + // Remove the empty box that appears in the monobook skin + if ( mw.config.get( 'skin' ) === 'monobook' ) { + $pLang.find( 'div.pBody' ).remove(); + } + } } $ulsTrigger = $( '.uls-trigger' );