--- /home/gproux/freevo-1.7.0-rc2/src/audio/plugins/coversearch.py	2006-12-17 01:20:37.000000000 +0900
+++ audio/plugins/coversearch.py	2007-01-18 02:00:55.000000000 +0900
@@ -59,6 +59,15 @@
 
 from util import amazon
 
+try:
+    amazon.setLocale(config.AMAZON_LOCALE)
+except AttributeError:
+    pass
+
+try:
+    query_encoding = config.AMAZON_QUERY_ENCODING
+except AttributeError:
+    query_encoding = "latin-1"
 
 class PluginInterface(plugin.ItemPlugin):
     """
@@ -185,7 +194,7 @@
         artist = self.item.getattr('artist')
 
         # Maybe the search string need encoding to config.LOCALE
-        search_string = '%s %s' % (artist.encode('latin-1'), album.encode('latin-1'))
+        search_string = '%s %s' % (artist.encode(query_encoding), album.encode(query_encoding))
         search_string = re.sub('[\(\[].*[\)\]]', '', search_string)
         if config.DEBUG > 1:
             print "search_string=%r" % search_string