From 4244f0cb49bf13b78a3c59b98238296e2166f2de Mon Sep 17 00:00:00 2001 From: Yorik van Havre Date: Thu, 5 May 2022 14:17:27 +0200 Subject: [PATCH] Tools: Favor the use of pylupdate5 over pyside2-lupdate in translation scripts (pyside2-lupdate doesn't encode properly). --- src/Tools/updatets.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Tools/updatets.py b/src/Tools/updatets.py index 559d085186..2c24556a9c 100755 --- a/src/Tools/updatets.py +++ b/src/Tools/updatets.py @@ -106,9 +106,7 @@ def find_tools(noobsolete=True): LUPDATE += " -no-obsolete" else: raise Exception("Cannot find lupdate") - if (os.system("pyside2-lupdate -version") == 0): - PYLUPDATE = "pyside2-lupdate" - elif (os.system("pylupdate -version") == 0): + if (os.system("pylupdate -version") == 0): PYLUPDATE = "pylupdate" elif (os.system("pylupdate5 -version") == 0): PYLUPDATE = "pylupdate5" @@ -118,6 +116,9 @@ def find_tools(noobsolete=True): PYLUPDATE = "pylupdate4" if noobsolete: PYLUPDATE += " -noobsolete" + elif (os.system("pyside2-lupdate -version") == 0): + PYLUPDATE = "pyside2-lupdate" + raise Exception("Please do not use pyside2-lupdate at the moment, as it shows encoding problems. Please use pylupdate5 instead.") else: raise Exception("Cannot find pylupdate") if (os.system("lconvert -h") == 0):