bryce/mediawiki-extensions-UniversalLanguageSelector
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated util functions names after refactoring

Browse Source 
jquery.uls.js is just updated from GitHub.

Change-Id: I506ab810d7136ba5d96dfdd469394a843110f8de
This commit is contained in:
Amir E. Aharoni
2012-10-08 00:13:34 +02:00
parent 93ced2526e
commit 8d31bf8c07
4 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
resources/js/ext.uls.displaysettings.js
View File

@@ -129,7 +129,7 @@
var language = languages[i];
var $button = $( '<button>' )
.addClass( 'button uls-language-button' )
.text( $.uls.data.autonym( language ) );
.text( $.uls.data.getAutonym( language ) );
if ( language === this.uiLanguage ) {
$button.addClass( 'down' );
}
@@ -244,7 +244,7 @@
$systemFont.attr( 'selected', savedFont === 'system' || !savedFont );
var $fontLabel = this.$template.find( 'label#ui-font-selector-label' );
$fontLabel.html( '<strong>'
+ $.i18n( 'ext-uls-webfonts-select-for', $.uls.data.autonym( this.uiLanguage ) )
+ $.i18n( 'ext-uls-webfonts-select-for', $.uls.data.getAutonym( this.uiLanguage ) )
+ '</strong>'
+ '<div>'
+ $.i18n( 'ext-uls-webfonts-select-for-ui-info' )
@@ -279,7 +279,7 @@
var $fontLabel = this.$template.find( '#content-font-selector-label' );
$fontLabel.html( '<strong>'
+ $.i18n( 'ext-uls-webfonts-select-for',
$.uls.data.autonym( this.contentLanguage ) )
$.uls.data.getAutonym( this.contentLanguage ) )
+ '</strong>'
+ '<div>'
+ $.i18n( 'ext-uls-webfonts-select-for-content-info' )

8
resources/js/ext.uls.init.js
View File

@@ -71,18 +71,22 @@
]
.concat( mw.uls.getPreviousLanguages() )
.concat( mw.uls.getAcceptLanguageList() );
if ( window.GEO ) {
list = list.concat( $.uls.data.languagesInTerritory( window.GEO.country_code ) );
list = list.concat( $.uls.data.getLanguagesInTerritory( window.GEO.country_code ) );
}
$.each( list, function ( i, v ) {
if ( $.inArray( v, unique ) === -1 ) {
unique.push( v );
}
} );
// Filter out unknown and unsupported languages
unique = $.grep( unique, function ( langCode, index ) {
return $.fn.uls.defaults.languages[langCode];
} );
return unique;
};
@@ -170,7 +174,7 @@
fade: true,
trigger: 'manual',
title: function () {
var prevLangName = $.uls.data.autonym( previousLang );
var prevLangName = $.uls.data.getAutonym( previousLang );
var linkClass = 'uls-prevlang-link';
var prevLangLink = "<a href='#' lang = '" +
previousLang + "' class = '" + linkClass + "' >" +