Skip to content

Commit 3ab87ec

Browse files
committed
fix problems
1 parent 83b7230 commit 3ab87ec

File tree

1 file changed

+17
-19
lines changed

1 file changed

+17
-19
lines changed

oclp_r/support/translate_language.py

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,18 @@
22
from plistlib import load
33
from pathlib import Path
44
import logging
5-
def _load_gui_defaults(self) -> None:
6-
settings_plist = global_settings.GlobalEnviromentSettings().global_settings_plist
7-
if not Path(settings_plist).exists():
8-
return
9-
10-
try:
11-
plist = plistlib.load(Path(settings_plist).open("rb"))
12-
except Exception as e:
13-
logging.error("Error: Unable to read global settings file")
14-
return
5+
156
class TranslateLanguage:
167
def __init__(self, global_constants: Constants) -> None:
178
self.file_name: str = ".com.hackdoc.oclp-r.plist"
189
self.global_settings_folder: str = "/Users/Shared"
1910
self.global_settings_plist: str = f"{self.global_settings_folder}/{self.file_name}"
20-
self.plist = load(Path(self.global_settings_plist).open("rb"))
21-
# self.constants: Constants = global_constants
22-
self.language_point = self.plist["GUI:language_option"]
11+
try:
12+
self.plist = load(Path(self.global_settings_plist).open("rb"))
13+
self.language_point = self.plist["GUI:language_option"]
14+
except FileNotFoundError:
15+
self.language_point = "English"
16+
2317
def application_entry(self):
2418
if self.language_point=="English":
2519
trans={
@@ -2434,9 +2428,11 @@ def __init__(self, global_constants: Constants) -> None:
24342428
self.file_name: str = ".com.hackdoc.oclp-r.plist"
24352429
self.global_settings_folder: str = "/Users/Shared"
24362430
self.global_settings_plist: str = f"{self.global_settings_folder}/{self.file_name}"
2437-
self.plist = load(Path(self.global_settings_plist).open("rb"))
2438-
# self.constants: Constants = global_constants
2439-
self.language_point = self.plist["GUI:language_option"]
2431+
try:
2432+
self.plist = load(Path(self.global_settings_plist).open("rb"))
2433+
self.language_point = self.plist["GUI:language_option"]
2434+
except FileNotFoundError:
2435+
self.language_point = "English"
24402436
def detect(self):
24412437
if self.language_point=="English":
24422438
trans={
@@ -2495,9 +2491,11 @@ def __init__(self, global_constants: Constants) -> None:
24952491
self.file_name: str = ".com.hackdoc.oclp-r.plist"
24962492
self.global_settings_folder: str = "/Users/Shared"
24972493
self.global_settings_plist: str = f"{self.global_settings_folder}/{self.file_name}"
2498-
self.plist = load(Path(self.global_settings_plist).open("rb"))
2499-
# self.constants: Constants = global_constants
2500-
self.language_point = self.plist["GUI:language_option"]
2494+
try:
2495+
self.plist = load(Path(self.global_settings_plist).open("rb"))
2496+
self.language_point = self.plist["GUI:language_option"]
2497+
except FileNotFoundError:
2498+
self.language_point = "English"
25012499
def bluetooth(self):
25022500
if self.language_point=="English":
25032501
trans={

0 commit comments

Comments
 (0)