<fix> fix unable to get python version due to codec problem

update version to v2.3.5
anonymousException · Jun 5, 2024 · 6791ea1 · 6791ea1
1 parent 840fd37
commit 6791ea1
Show file tree

Hide file tree

Showing 30 changed files with 39 additions and 44 deletions.
diff --git a/src/call_game_python.py b/src/call_game_python.py
@@ -30,22 +30,17 @@ def get_python_path(game_path):
     return python_path
 
 
-def get_python_version(game_path):
-    command = get_python_path(game_path) + ' -O --version'
-    f = io.open(os.getcwd() + '/tmp_python_version.txt', 'w', encoding='utf-8')
-    p = subprocess.Popen(command, shell=True, stdout=f, stderr=f,
-                         creationflags=0x08000000, text=True, encoding='utf-8')
-    p.wait()
-    f.close()
-    f = io.open(os.getcwd() + '/tmp_python_version.txt', 'r', encoding='utf-8')
-    python_version = f.read()
-    f.close()
-    os.remove(os.getcwd() + '/tmp_python_version.txt')
-    return python_version
-
-
 def is_python2(game_path):
-    return get_python_version(game_path).startswith('Python 2.')
+    python_dir = os.path.dirname(get_python_path(game_path))
+    paths = os.walk(python_dir, topdown=False)
+    is_py2 = False
+    for path, dir_lst, file_lst in paths:
+        for file_name in file_lst:
+            i = os.path.join(path, file_name)
+            if 'python2' in i or 'py2' in i:
+                is_py2 = True
+                break
+    return is_py2
 
 
 def get_py_path(game_path):

diff --git a/src/qm/arabic.qm b/src/qm/arabic.qm
diff --git a/src/qm/bengali.qm b/src/qm/bengali.qm
diff --git a/src/qm/chinese.qm b/src/qm/chinese.qm
diff --git a/src/qm/french.qm b/src/qm/french.qm
diff --git a/src/qm/german.qm b/src/qm/german.qm
diff --git a/src/qm/greek.qm b/src/qm/greek.qm
diff --git a/src/qm/hindi.qm b/src/qm/hindi.qm
diff --git a/src/qm/japanese.qm b/src/qm/japanese.qm
diff --git a/src/qm/korean.qm b/src/qm/korean.qm
diff --git a/src/qm/portuguese.qm b/src/qm/portuguese.qm
diff --git a/src/qm/russian.qm b/src/qm/russian.qm
diff --git a/src/qm/spanish.qm b/src/qm/spanish.qm
diff --git a/src/qm/turkish.qm b/src/qm/turkish.qm
diff --git a/src/qm/urdu.qm b/src/qm/urdu.qm
diff --git a/src/ts/arabic.ts b/src/ts/arabic.ts
@@ -1195,8 +1195,8 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.3.4</source>
-        <translation>الإصدار2.3.4</translation>
+        <source>Version 2.3.5</source>
+        <translation>الإصدار2.3.5</translation>
     </message>
     <message>
         <location filename="../ui.ui" line="113"/>

diff --git a/src/ts/bengali.ts b/src/ts/bengali.ts
@@ -1195,8 +1195,8 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.3.4</source>
-        <translation>সংস্করণ 2.3.4</translation>
+        <source>Version 2.3.5</source>
+        <translation>সংস্করণ 2.3.5</translation>
     </message>
     <message>
         <location filename="../ui.ui" line="113"/>

diff --git a/src/ts/chinese.ts b/src/ts/chinese.ts
@@ -1193,8 +1193,8 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.3.4</source>
-        <translation>版本 2.3.4</translation>
+        <source>Version 2.3.5</source>
+        <translation>版本 2.3.5</translation>
     </message>
     <message>
         <location filename="../ui.ui" line="113"/>

diff --git a/src/ts/default.ts b/src/ts/default.ts
@@ -1268,7 +1268,7 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.3.4</source>
+        <source>Version 2.3.5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

diff --git a/src/ts/french.ts b/src/ts/french.ts
@@ -1195,8 +1195,8 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.3.4</source>
-        <translation>Version 2.3.4</translation>
+        <source>Version 2.3.5</source>
+        <translation>Version 2.3.5</translation>
     </message>
     <message>
         <location filename="../ui.ui" line="113"/>

diff --git a/src/ts/german.ts b/src/ts/german.ts
@@ -1303,8 +1303,8 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.3.4</source>
-        <translation>Version 2.3.4</translation>
+        <source>Version 2.3.5</source>
+        <translation>Version 2.3.5</translation>
     </message>
     <message>
         <location filename="../ui.ui" line="391"/>

diff --git a/src/ts/greek.ts b/src/ts/greek.ts
@@ -1268,8 +1268,8 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.3.4</source>
-        <translation>Έκδοση 2.3.4</translation>
+        <source>Version 2.3.5</source>
+        <translation>Έκδοση 2.3.5</translation>
     </message>
     <message>
         <location filename="../ui.ui" line="391"/>

diff --git a/src/ts/hindi.ts b/src/ts/hindi.ts
@@ -1195,8 +1195,8 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.3.4</source>
-        <translation>संस्करण 2.3.4</translation>
+        <source>Version 2.3.5</source>
+        <translation>संस्करण 2.3.5</translation>
     </message>
     <message>
         <location filename="../ui.ui" line="113"/>

diff --git a/src/ts/japanese.ts b/src/ts/japanese.ts
@@ -1189,8 +1189,8 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.3.4</source>
-        <translation>バージョン2.3.4</translation>
+        <source>Version 2.3.5</source>
+        <translation>バージョン2.3.5</translation>
     </message>
     <message>
         <location filename="../ui.ui" line="113"/>

diff --git a/src/ts/korean.ts b/src/ts/korean.ts
@@ -1303,8 +1303,8 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.3.4</source>
-        <translation>버전 2.3.4</translation>
+        <source>Version 2.3.5</source>
+        <translation>버전 2.3.5</translation>
     </message>
     <message>
         <location filename="../ui.ui" line="391"/>

diff --git a/src/ts/portuguese.ts b/src/ts/portuguese.ts
@@ -1195,8 +1195,8 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.3.4</source>
-        <translation>Versão 2.3.4</translation>
+        <source>Version 2.3.5</source>
+        <translation>Versão 2.3.5</translation>
     </message>
     <message>
         <location filename="../ui.ui" line="113"/>

diff --git a/src/ts/russian.ts b/src/ts/russian.ts
@@ -1195,8 +1195,8 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.3.4</source>
-        <translation>Версия 2.3.4</translation>
+        <source>Version 2.3.5</source>
+        <translation>Версия 2.3.5</translation>
     </message>
     <message>
         <location filename="../ui.ui" line="113"/>

diff --git a/src/ts/spanish.ts b/src/ts/spanish.ts
@@ -1195,8 +1195,8 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.3.4</source>
-        <translation>Versión 2.3.4</translation>
+        <source>Version 2.3.5</source>
+        <translation>Versión 2.3.5</translation>
     </message>
     <message>
         <location filename="../ui.ui" line="113"/>

diff --git a/src/ts/turkish.ts b/src/ts/turkish.ts
@@ -1280,8 +1280,8 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.3.4</source>
-        <translation>Sürüm 2.3.4</translation>
+        <source>Version 2.3.5</source>
+        <translation>Sürüm 2.3.5</translation>
     </message>
     <message>
         <location filename="../ui.ui" line="391"/>

diff --git a/src/ts/urdu.ts b/src/ts/urdu.ts
@@ -1195,8 +1195,8 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.3.4</source>
-        <translation>ورژن 2.3.4</translation>
+        <source>Version 2.3.5</source>
+        <translation>ورژن 2.3.5</translation>
     </message>
     <message>
         <location filename="../ui.ui" line="113"/>