From 01f516c9d1d994c8c4de9e2a978b21d5fb61c100 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sun, 23 Dec 2012 17:53:48 -0800
Subject: [PATCH] Removing some pointless indirection

---
 yomi_base/reader.py | 12 ++++--------
 yomichan.py         |  4 ++--
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/yomi_base/reader.py b/yomi_base/reader.py
index 5f0acb7..631f7db 100644
--- a/yomi_base/reader.py
+++ b/yomi_base/reader.py
@@ -38,7 +38,7 @@ class MainWindowReader(QtGui.QMainWindow):
             self.archiveIndex = None
 
 
-    def __init__(self, parent, preferences, languages, filename=None, anki=None, closed=None, updated=None):
+    def __init__(self, parent, preferences, language, filename=None, anki=None, closed=None, updated=None):
         QtGui.QMainWindow.__init__(self, parent)
         uic.loadUi(buildResPath('ui/reader.ui'), self)
 
@@ -49,7 +49,7 @@ class MainWindowReader(QtGui.QMainWindow):
         self.preferences = preferences
         self.updateFinder = UpdateFinder()
         self.state = self.State()
-        self.languages = languages
+        self.language = language
         self.addedFacts = list()
         self.anki = anki
         self.closed = closed
@@ -271,7 +271,7 @@ class MainWindowReader(QtGui.QMainWindow):
 
     def onDefinitionSearchReturn(self):
         text = unicode(self.textDefinitionSearch.text())
-        definitions, length = self.language().wordSearch(
+        definitions, length = self.language.wordSearch(
             text,
             self.preferences.searchResultMax,
             self.preferences.searchGroupByExp
@@ -496,7 +496,7 @@ class MainWindowReader(QtGui.QMainWindow):
             return
 
         contentSampleFlat = contentSample.replace('\n', unicode())
-        definitionsMatched, lengthMatched = self.language().wordSearch(
+        definitionsMatched, lengthMatched = self.language.wordSearch(
             contentSampleFlat,
             self.preferences.searchResultMax,
             self.preferences.searchGroupByExp
@@ -574,7 +574,3 @@ class MainWindowReader(QtGui.QMainWindow):
 
     def setStatus(self, status):
         self.statusBar.showMessage(status)
-
-
-    def language(self):
-        return self.languages['Japanese']
diff --git a/yomichan.py b/yomichan.py
index 08cdb96..6fe4107 100755
--- a/yomichan.py
+++ b/yomichan.py
@@ -27,7 +27,7 @@ from yomi_base.reader import MainWindowReader
 
 class Yomichan:
     def __init__(self):
-        self.languages = {'Japanese': japanese.initLanguage()}
+        self.language = japanese.initLanguage()
         self.preferences = Preferences()
         self.preferences.load()
 
@@ -57,7 +57,7 @@ class YomichanPlugin(Yomichan):
             self.window = MainWindowReader(
                 self.parent,
                 self.preferences,
-                self.languages,
+                self.language,
                 None,
                 self.anki,
                 self.onWindowClose