Merge "Help links for input settings"

This commit is contained in:
jenkins-bot authored and Gerrit Code Review committed 2013-07-15 13:23:46 +00:00
commit a14f941f48
5 files changed
+20 -2

No files matched your search

+3
View File
@@ -71,6 +71,9 @@ $wgResourceModules['ext.uls.inputsettings'] = array(
'ext.uls.ime',
'jquery.i18n',
),
'messages' => array(
'uls-ime-helppage',
),
) + $resourcePaths;
// Interface language selection module
+3
View File
@@ -24,12 +24,14 @@ $messages = array();
* English
* @author santhosh
* @author Amire80
* @author Nike
*/
$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',
'uls-ime-helppage' => 'https://www.mediawiki.org/wiki/Special:MyLanguage/Help:Extension:UniversalLanguageSelector/Input_methods/$1',
);
/** Message documentation (Message documentation)
@@ -42,6 +44,7 @@ $messages['qqq'] = array(
'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.
{{Identical|Language}}',
'uls-ime-helppage' => 'Target page for ime helps. $1 is ime id. Intented for wiki local customization.',
);
/** Arabic (العربية)
+1
View File
@@ -33,6 +33,7 @@
"ext-uls-input-settings-ime-settings": "Input methods for $1",
"ext-uls-input-settings-ui-language": "Language used for writing",
"ext-uls-back-to-input-settings": "Back to input settings",
"ext-uls-ime-help": "How to use",
"ext-uls-disable-input-method": "Use native keyboard",
"ext-uls-input-settings-more-languages-tooltip": "More languages",
"jquery-ime-other-languages": "Other languages",
+4
View File
@@ -116,3 +116,7 @@ div.input-settings-block {
color: #0645AD;
cursor: pointer;
}
.uls-input-settings .uls-ime-help {
margin-left: 10px;
}
+9 -2
View File
@@ -169,7 +169,7 @@
* @return {Object} jQuery object corresponding to the input method item.
*/
renderInputmethodOption: function ( imeId, selected ) {
var $imeLabel, name, description, inputmethod, $inputMethodItem;
var $imeLabel, name, description, $helplink, inputmethod, $inputMethodItem;
if ( imeId !== 'system' && !$.ime.sources[imeId] ) {
// imeId not known for jquery.ime.
@@ -194,8 +194,14 @@
if ( imeId === 'system' ) {
name = $.i18n( 'ext-uls-disable-input-method' );
description = '';
$helplink = '';
} else {
inputmethod = $.ime.inputmethods[imeId];
$helplink = $( '<a>' )
.addClass( 'uls-ime-help' )
.text( $.i18n( 'ext-uls-ime-help' ) )
.attr( 'href', mw.msg( 'uls-ime-helppage' ).replace( '$1', imeId ) )
.attr( 'target', '_blank' );
if ( !inputmethod ) {
// The input method definition(rules) not loaded.
// We will show the name from $.ime.sources
@@ -209,7 +215,8 @@
$imeLabel.append(
$( '<strong>' ).text( name ),
$( '<span>' ).text( description )
$( '<span>' ).text( description ),
$helplink
);
return $imeLabel;