fix mac binary & make translator can handle error

skps2010 · Sep 23, 2023 · a2816f5 · a2816f5
1 parent ed06385
commit a2816f5
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 12 deletions.
diff --git a/build/makeDistributionMacOSX b/build/makeDistributionMacOSX
@@ -56,9 +56,10 @@ cp -r $3 $framework_folder
 cp /usr/local/lib/libfreetype.6.dylib $framework_folder
 cp /usr/local/opt/libpng/lib/libpng16.16.dylib $framework_folder
 cp /usr/local/opt/sdl12-compat/lib/libSDL-1.2.0.dylib $framework_folder
+cp /usr/local/Cellar/sdl2/2.28.3/lib/libSDL2-2.0.0.dylib $framework_folder
 
 install_name_tool -change /usr/local/lib/libfreetype.6.dylib @executable_path/../Frameworks/libfreetype.6.dylib $onelife_app
-install_name_tool -change /usr/local/opt/libpng/lib/libpng16.16.dylib @executable_path/libpng16.16.dylib $framework_folder/libfreetype.6.dylib
+install_name_tool -change /usr/local/opt/libpng/lib/libpng16.16.dylib @executable_path/../Frameworks/libfreetype.6.dylib $framework_folder/libfreetype.6.dylib
 install_name_tool -id @executable_path/libpng16.16.dylib $framework_folder/libpng16.16.dylib
 install_name_tool -change /usr/local/opt/sdl12-compat/lib/libSDL-1.2.0.dylib @executable_path/../Frameworks/libSDL-1.2.0.dylib $onelife_app
 

diff --git a/gameSource/ExistingAccountPage.cpp b/gameSource/ExistingAccountPage.cpp
@@ -542,7 +542,7 @@ void ExistingAccountPage::actionPerformed( GUIComponent *inTarget ) {
             system("open translator; sleep 1.0; while pgrep -f translator >/dev/null; do sleep 1.0; done");
         }
         else
-            system("open translator.py -a Terminal; sleep 1.0; while pgrep -f translator.py >/dev/null; do sleep 1.0; done");
+            system("open translator.py -a Terminal; sleep 1.0; while pgrep -f translator >/dev/null; do sleep 1.0; done");
 
 #elif defined(WIN32)
         char fullscreen = SettingsManager::getIntSetting("fullscreen", 0);

diff --git a/scripts/skps2010Scripts/translator.py b/scripts/skps2010Scripts/translator.py
@@ -66,8 +66,12 @@ def main():
     for i in range(len(data['key'])):
         translated = data['value'][i]
         if translated != '':
-            with open(f'objects/{data["key"][i]}', encoding='utf-8') as f:
-                content = f.readlines()
+            try:
+                with open(f'objects/{data["key"][i]}', encoding='utf-8') as f:
+                    content = f.readlines()
+            except FileNotFoundError as e:
+                print(e)
+                continue
 
             if is_append and data2['value'][i] != '':
                 content[1] = translated.split('#')[0].split(
@@ -79,14 +83,18 @@ def main():
                 f.writelines(content)
 
     menuItems = {}
-    with open('languages/English.txt', encoding='utf-8') as f:
-        datas = f.readlines()
-        for data in datas:
-            if data == '\n':
-                continue
-            name = data.split(' ')[0]
-            value = data[data.index('"') + 1:-2]
-            menuItems[name] = value
+    try:
+        with open('languages/English.txt', encoding='utf-8') as f:
+            datas = f.readlines()
+            for data in datas:
+                if data == '\n':
+                    continue
+                name = data.split(' ')[0]
+                value = data[data.index('"') + 1:-2]
+                menuItems[name] = value
+
+    except FileNotFoundError as e:
+        print(e)
 
     print("Translating Menu...")