Mercurial Repositories > eric / file diff

--- a/Project/ProjectTranslationsBrowser.py	Sun Apr 09 19:41:35 2017 +0200
+++ b/Project/ProjectTranslationsBrowser.py	Mon Apr 10 19:14:40 2017 +0200
@@ -888,7 +888,7 @@
     def __readStderrLupdate(self):
         """
         Private slot to handle the readyReadStandardError signal of the
-        pylupdate process.
+        pylupdate4/pylupdate5/pyside-lupdate process.
         """
         proc = self.sender()
         if proc is not None:
@@ -986,8 +986,8 @@
         
     def __generateTSFile(self, noobsolete=False, generateAll=True):
         """
-        Private method used to run pylupdate/pylupdate4 to generate the .ts
-        files.
+        Private method used to run pylupdate4/pylupdate5/pyside-lupdate to
+        generate the .ts files.
         
         @param noobsolete flag indicating whether obsolete entries should be
             kept (boolean)
@@ -1036,23 +1036,14 @@
             return
         
         if self.project.getProjectType() in ["Qt4", "Qt4C"]:
-            self.pylupdate = 'pylupdate4'
-            if Utilities.isWindowsPlatform():
-                self.pylupdate = \
-                    Utilities.getWindowsExecutablePath(self.pylupdate)
+            self.pylupdate = Utilities.generatePyQtToolPath('pylupdate4')
         elif self.project.getProjectType() in ["PyQt5", "PyQt5C"]:
-            self.pylupdate = 'pylupdate5'
-            if Utilities.isWindowsPlatform():
-                self.pylupdate = \
-                    Utilities.getWindowsExecutablePath(self.pylupdate)
+            self.pylupdate = Utilities.generatePyQtToolPath('pylupdate5')
         elif self.project.getProjectType() in ["E6Plugin"]:
             if PYQT_VERSION < 0x050000:
-                self.pylupdate = 'pylupdate4'
+                self.pylupdate = Utilities.generatePyQtToolPath('pylupdate4')
             else:
-                self.pylupdate = 'pylupdate5'
-            if Utilities.isWindowsPlatform():
-                self.pylupdate = \
-                    Utilities.getWindowsExecutablePath(self.pylupdate)
+                self.pylupdate = Utilities.generatePyQtToolPath('pylupdate5')
         elif self.project.getProjectType() in ["PySide", "PySideC"]:
             self.pylupdate = Utilities.generatePySideToolPath('pyside-lupdate')
         else: