From e8ed043352b30cbfc6ccd4c195da9ed1663ca5bd Mon Sep 17 00:00:00 2001 From: "Amir E. Aharoni" Date: Mon, 10 Dec 2012 21:50:36 +0200 Subject: [PATCH] (bug 42382) Indicate context in input settings/more languages 1. Fix a regression introduced in https://github.com/wikimedia/jquery.uls/commit/27039e1141e888d165af287c942efe5c7f8be013 - a change in a class name caused the back link not to appear. Now the link is back. 2. Copy the same logic to the input settings panel. Change-Id: Ie80032ee2e14853f96cfb3b48dec5c85398c8373 --- resources/js/ext.uls.displaysettings.js | 4 ++-- resources/js/ext.uls.inputsettings.js | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/resources/js/ext.uls.displaysettings.js b/resources/js/ext.uls.displaysettings.js index 25e39af2..178f0788 100644 --- a/resources/js/ext.uls.displaysettings.js +++ b/resources/js/ext.uls.displaysettings.js @@ -234,8 +234,8 @@ displaySettings.$parent.show(); } ); - uls.$menu.find( 'div.uls-title' ).append( $back ); - uls.$menu.find( 'div.uls-title h1' ) + uls.$menu.find( 'div.uls-title-region' ).append( $back ); + uls.$menu.find( 'h1.uls-title' ) .data( 'i18n', 'ext-uls-display-settings-ui-language' ) .i18n(); }, diff --git a/resources/js/ext.uls.inputsettings.js b/resources/js/ext.uls.inputsettings.js index 59a2ddf0..8806ffaa 100644 --- a/resources/js/ext.uls.inputsettings.js +++ b/resources/js/ext.uls.inputsettings.js @@ -297,14 +297,18 @@ onReady: function () { var uls = this, $back = $( '' ) - .text( $.i18n( 'ext-uls-back-to-input-settings' ) ); + .data( 'i18n', 'ext-uls-back-to-input-settings' ) + .i18n(); $back.click( function () { uls.hide(); inputSettings.$parent.show(); } ); - uls.$menu.find( 'div.uls-title' ).append( $back ); + uls.$menu.find( 'div.uls-title-region' ).append( $back ); + uls.$menu.find( 'h1.uls-title' ) + .data( 'i18n', 'ext-uls-input-settings-ui-language' ) + .i18n(); }, onSelect: function ( langCode ) { inputSettings.enableApplyButton();