Merge from 2.3: Fix for issues #2257 and #2259

- Also update translations
spyder-ide · Mar 21, 2015 · b46fadc · b46fadc
2 parents eee7a72 + 251dc5d
commit b46fadc
Show file tree

Hide file tree

Showing 25 changed files with 1,483 additions and 1,441 deletions.
diff --git a/spyderlib/ipythonconfig.py b/spyderlib/ipythonconfig.py
@@ -34,7 +34,9 @@ def is_qtconsole_installed():
 
     # Check if pyzmq is installed too, else, what's the point?
     pyzmq_installed = programs.is_module_installed('zmq', version=ZMQ_REQVER)
-    if programs.is_module_installed('IPython.qt') and pyzmq_installed:
+    pygments_installed = programs.is_module_installed('pygments')
+    if programs.is_module_installed('IPython.qt') and pyzmq_installed \
+      and pygments_installed:    
         return True
     else:
         return False

diff --git a/spyderlib/locale/es/LC_MESSAGES/spyderlib.mo b/spyderlib/locale/es/LC_MESSAGES/spyderlib.mo