[ocrfeeder/langs: 9/15] Make engine class ignore $LANG argument if no favorite language is set

[Joaquim Manuel Pereira Rocha <jrocha src gnome org>]

commit 113f5d3499918b7626a6af7f72d6a3645e84da8e
Author: Joaquim Rocha <jrocha igalia com>
Date:   Tue Jan 29 00:37:42 2013 +0100

    Make engine class ignore $LANG argument if no favorite language is set

 src/ocrfeeder/feeder/ocrEngines.py |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/src/ocrfeeder/feeder/ocrEngines.py b/src/ocrfeeder/feeder/ocrEngines.py
index b475017..f544fec 100644
--- a/src/ocrfeeder/feeder/ocrEngines.py
+++ b/src/ocrfeeder/feeder/ocrEngines.py
@@ -56,6 +56,7 @@ class Engine:
         self.setLanguages(languages)
         self.temporary_folder = temporary_folder
         self.__color_information = None
+        self.setLanguage('')
 
     def setImage(self, image):
         image_file = tempfile.mkstemp(dir = self.temporary_folder,
@@ -74,17 +75,18 @@ class Engine:
             file_name = tempfile.mkstemp(dir = self.temporary_folder)[1]
             parsed_arguments = parsed_arguments.replace(FILE_ARGUMENT, file_name)
 
-        favorite_language = ''
-        if self.language_argument:
-            if self._favorite_language and self.languages:
+        if self._favorite_language:
+            if self.languages:
                 favorite_language = self.languages.get(self._favorite_language, '')
                 if not favorite_language:
                     values = self.languages.values()
                     if values:
                         favorite_language = values[0]
-        parsed_arguments = parsed_arguments.replace(LANGUAGE_ARGUMENT,
+                parsed_arguments = parsed_arguments.replace(LANGUAGE_ARGUMENT,
                                          '%s %s' % (self.language_argument,
                                                     favorite_language))
+        else:
+            parsed_arguments = parsed_arguments.replace(LANGUAGE_ARGUMENT, '')
 
         text = os.popen(self.engine_path + ' ' + parsed_arguments).read()
         try: