From e0e4c9e1b80815c41b2b57cd4781344e601f54eb Mon Sep 17 00:00:00 2001
From: Santhosh Thottingal <santhosh.thottingal@gmail.com>
Date: Tue, 7 Aug 2012 16:06:05 +0530
Subject: [PATCH] Always use autonyms for search results

Change-Id: Iacbaa78c9f66b0c754ac9faf9bb2752f95b35693
---
 src/jquery.uls.languagefilter.js |  6 +++---
 src/jquery.uls.lcd.js            | 14 ++++++--------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/jquery.uls.languagefilter.js b/src/jquery.uls.languagefilter.js
index 42a1233..69d5dd5 100644
--- a/src/jquery.uls.languagefilter.js
+++ b/src/jquery.uls.languagefilter.js
@@ -134,7 +134,7 @@
 						// Autofill the first result.
 						that.autofill( code, name );
 					}
-					that.render( code, name );
+					that.render( code );
 					that.resultCount++;
 				} );
 				that.resultHandler( query );
@@ -178,12 +178,12 @@
 			this.$suggestion.val( suggestion );
 		},
 
-		render: function( langCode, languageName ) {
+		render: function( langCode ) {
 			var $target = this.options.$target;
 			if ( !$target ) {
 				return;
 			}
-			$target.append( langCode, null, languageName );
+			$target.append( langCode, null );
 		},
 
 		escapeRegex: function( value ) {
diff --git a/src/jquery.uls.lcd.js b/src/jquery.uls.lcd.js
index 492b14a..7820afe 100644
--- a/src/jquery.uls.lcd.js
+++ b/src/jquery.uls.lcd.js
@@ -31,8 +31,8 @@
 	LanguageCategoryDisplay.prototype = {
 		constructor: LanguageCategoryDisplay,
 
-		append: function( langCode, regionCode, languageName ) {
-			this.addToRegion( langCode, regionCode, languageName );
+		append: function( langCode, regionCode ) {
+			this.addToRegion( langCode, regionCode );
 		},
 
 		/**
@@ -41,15 +41,13 @@
 		 * Otherwise to all regions that this language belongs.
 		 * @param langCode
 		 * @param region Optional region
-		 * @param languageName Optional languageName
 		 */
-		addToRegion: function( langCode, region, languageName) {
+		addToRegion: function( langCode, region ) {
 			var that = this;
 			var language = that.options.languages[langCode],
-				langName = languageName ||
-					$.uls.data.autonym( langCode ) ||
-					that.options.languages[langCode] ||
-					langCode,
+				langName = $.uls.data.autonym( langCode )
+					|| language
+					|| langCode,
 				regions = [];
 			if ( region ) {
 				regions.push( region );