Merge branch 'master' of github.com:wikimedia/jquery.uls

Conflicts:
	examples/index-i18n.html
This commit is contained in:
Santhosh Thottingal
2012-10-09 19:44:01 +05:30
10 changed files with 222 additions and 110 deletions

View File

@@ -29,9 +29,9 @@
onReady: function ( ) {
this.i18n();
},
onSelect: function ( language ) {
var languageName = $.uls.data.autonym( language );
$( 'a#pageLanguage' ).text( languageName );
onSelect : function( language ) {
var languageName = $.uls.data.getAutonym( language );
$('a#pageLanguage').text( languageName );
i18n.locale = language;
// For ULS
i18n.load( '../i18n/' + language + '.json', language );

View File

@@ -32,7 +32,7 @@
$( document ).ready( function() {
$( '.uls-trigger' ).uls( {
onSelect : function( language ) {
var languageName = $.uls.data.autonym( language );
var languageName = $.uls.data.getAutonym( language );
$('a#pageLanguage').text( languageName );
},
quickList: ['en', 'hi', 'he', 'ml', 'ta','fr'] //FIXME