Translate ISO 639 codes into something sensible

2 files changed, 19 insertions, 5 deletions

diff --git a/GetIABooksActivity.py b/GetIABooksActivity.py
index 0aeb2a1..111db07 100755
--- a/GetIABooksActivity.py
+++ b/GetIABooksActivity.py
@@ -42,6 +42,7 @@ import gobject
 
 from listview import ListView
 import opds
+import languagenames
 
 _TOOLBAR_BOOKS = 1
 _MIMETYPES = { 'PDF' : u'application/pdf', 'EPUB' : u'application/epub+zip' }
@@ -190,7 +191,9 @@ class GetIABooksActivity(activity.Activity):
         self._download_content_length = 0
         self._download_content_type = None
 
-        self.listview = ListView()
+        self._lang_code_handler = languagenames.LanguageNames()
+
+        self.listview = ListView(self._lang_code_handler)
         self.listview.connect('selection-changed', self.selection_cb)
             
         self.list_scroller = gtk.ScrolledWindow(hadjustment=None, vadjustment=None)
@@ -214,6 +217,10 @@ class GetIABooksActivity(activity.Activity):
         self.toolbox.set_current_toolbar(_TOOLBAR_BOOKS)
         self._books_toolbar.search_entry.grab_focus()
 
+    def can_close(self):
+        self._lang_code_handler.close()
+        return True
+
     def selection_cb(self, widget):
         self.clear_downloaded_bytes()
         selected_book = self.listview.get_selected_book()
@@ -227,7 +234,8 @@ class GetIABooksActivity(activity.Activity):
         self.book_data +=  _('Author:\t\t') + self.selected_book.get_author() + '\n\n'
         self.selected_author =  self.selected_book.get_author()
         self.book_data +=  _('Publisher:\t') +  self.selected_book.get_publisher() + '\n\n'
-        self.book_data +=  _('Language:\t') + self.selected_book.get_language() + '\n\n'
+        self.book_data +=  _('Language:\t') + \
+            self._lang_code_handler.get_full_language_name(self.selected_book.get_language()) + '\n\n'
         self.download_url =  self.selected_book.get_download_links()[self._books_toolbar.format_combo.props.value]
 
         textbuffer = self.textview.get_buffer()
@@ -349,7 +357,7 @@ class GetIABooksActivity(activity.Activity):
         datastore.write(journal_entry)
         os.remove(tempfile)
         self.progressbar.hide()
-        self._alert(_('Success: %s was added to Journal.') %s self.selected_title)
+        self._alert(_('Success: %s was added to Journal.') % self.selected_title)
         #self._alert(_('Success'), self.selected_title + _(' added to Journal.'))
 
     def truncate(self,  str,  length):
diff --git a/listview.py b/listview.py
index 49cbda8..0f8080f 100644
--- a/listview.py
+++ b/listview.py
@@ -48,9 +48,12 @@ class ListView(ExtListView):
                           gobject.TYPE_NONE,
                           ([])),
     }
-    def __init__(self):
+    def __init__(self, lang_code_handler):
         ExtListView.__init__(self, self.columns, sortable=True, useMarkup=False, canShowHideColumns=True)
         #self.enableDNDReordering() # Is this needed ?
+        
+        self._lang_code_handler = lang_code_handler
+
         selection = self.get_selection()
         selection.set_mode(gtk.SELECTION_SINGLE)
         selection.connect("changed", self.__selection_changed_cb)
@@ -63,7 +66,10 @@ class ListView(ExtListView):
 
         for book in results.get_book_list():
             try:
-                rows.append([book.get_title(), book.get_author(), book.get_publisher(), book.get_language(), book.get_published_year(), book])
+                rows.append([book.get_title(), book.get_author(), \
+                    book.get_publisher(), \
+                    self._lang_code_handler.get_full_language_name(book.get_language()), \
+                    book.get_published_year(), book])
             except:
                 _logger.debug(sys.exc_info())