.autonym -> .getAutonym

This commit is contained in:
Amir E. Aharoni
2012-10-07 21:50:05 +02:00
parent 52c2cac2a9
commit b52df71d8c
5 changed files with 9 additions and 9 deletions

View File

@@ -24,7 +24,7 @@
var i18n = $.i18n( ); var i18n = $.i18n( );
$( '.uls-trigger' ).uls( { $( '.uls-trigger' ).uls( {
onSelect : function( language ) { onSelect : function( language ) {
var languageName = $.uls.data.autonym( language ); var languageName = $.uls.data.getAutonym( language );
$('a#pageLanguage').text( languageName ); $('a#pageLanguage').text( languageName );
i18n.locale = language; i18n.locale = language;
// For ULS // For ULS

View File

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

View File

@@ -79,7 +79,7 @@
var autonymsByCode = {}; var autonymsByCode = {};
for ( var language in $.uls.data.languages ) { for ( var language in $.uls.data.languages ) {
autonymsByCode[language] = $.uls.data.autonym( language ); autonymsByCode[language] = $.uls.data.getAutonym( language );
} }
return autonymsByCode; return autonymsByCode;
@@ -429,8 +429,8 @@
* @param two language codes * @param two language codes
*/ */
$.uls.data.sortByAutonym = function( a, b ) { $.uls.data.sortByAutonym = function( a, b ) {
var autonymA = $.uls.data.autonym( a ) || a, var autonymA = $.uls.data.getAutonym( a ) || a,
autonymB = $.uls.data.autonym( b ) || b; autonymB = $.uls.data.getAutonym( b ) || b;
return ( autonymA.toLowerCase() < autonymB.toLowerCase() ) ? -1 : 1; return ( autonymA.toLowerCase() < autonymB.toLowerCase() ) ? -1 : 1;
}; };

View File

@@ -208,7 +208,7 @@
suggestion = userInput + languageName.substring( userInput.length, languageName.length ); suggestion = userInput + languageName.substring( userInput.length, languageName.length );
if ( suggestion.toLowerCase() !== languageName.toLowerCase() ) { if ( suggestion.toLowerCase() !== languageName.toLowerCase() ) {
// see if it was autonym match // see if it was autonym match
autonym = $.uls.data.autonym( langCode ) || ''; autonym = $.uls.data.getAutonym( langCode ) || '';
suggestion = userInput + autonym.substring( userInput.length, autonym.length ); suggestion = userInput + autonym.substring( userInput.length, autonym.length );
if ( suggestion !== autonym ) { if ( suggestion !== autonym ) {
// Give up. It may be iso/script code match. // Give up. It may be iso/script code match.
@@ -247,7 +247,7 @@
var matcher = new RegExp( "^" + this.escapeRegex( searchTerm ), 'i' ), var matcher = new RegExp( "^" + this.escapeRegex( searchTerm ), 'i' ),
languageName = this.options.languages[langCode]; languageName = this.options.languages[langCode];
return matcher.test( languageName ) || return matcher.test( languageName ) ||
matcher.test( $.uls.data.autonym( langCode ) ) || matcher.test( $.uls.data.getAutonym( langCode ) ) ||
matcher.test( langCode ) || matcher.test( langCode ) ||
matcher.test( $.uls.data.getScript( langCode ) ); matcher.test( $.uls.data.getScript( langCode ) );
} }

View File

@@ -74,7 +74,7 @@
addToRegion: function( langCode, region ) { addToRegion: function( langCode, region ) {
var that = this; var that = this;
var language = that.options.languages[langCode], var language = that.options.languages[langCode],
langName = $.uls.data.autonym( langCode ) || language || langCode, langName = $.uls.data.getAutonym( langCode ) || language || langCode,
regions = []; regions = [];
if ( region ) { if ( region ) {
@@ -206,7 +206,7 @@
var $column = this.getColumn( 'quick', i % 4 === 0 ); var $column = this.getColumn( 'quick', i % 4 === 0 );
var langCode = quickList[i]; var langCode = quickList[i];
var language = this.options.languages[langCode]; var language = this.options.languages[langCode];
var langName = $.uls.data.autonym( langCode ) || language || langCode; var langName = $.uls.data.getAutonym( langCode ) || language || langCode;
var $li = $( '<li>' ) var $li = $( '<li>' )
.data( 'code', langCode ) .data( 'code', langCode )
.attr( { .attr( {