diff options
| author | rejbasket <39080670+rejbasket@users.noreply.github.com> | 2023-04-28 21:02:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-28 21:02:05 +0200 |
| commit | 36d528636368709ae93355cb86f70c89f6e36dff (patch) | |
| tree | c58e1083230c89a40ee4fdc17fc957155d6eb565 | |
| parent | fd11ad7d8580000e5736bf922efe61f8aca2a9ec (diff) | |
fixed mac dev mode translations (#2248)
updated electron-builder
Authored-by: rejbasket
| -rw-r--r-- | electron/package.json | 2 | ||||
| -rwxr-xr-x | lib/gui/electron.py | 2 | ||||
| -rw-r--r-- | lib/i18n.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/electron/package.json b/electron/package.json index 8d27d94f..083c3dd9 100644 --- a/electron/package.json +++ b/electron/package.json @@ -95,7 +95,7 @@ "devtron": "^1.4.0", "easygettext": "^2.7.0", "electron": "4.1.3", - "electron-builder": "22.8.0", + "electron-builder": "^23.0.3", "electron-debug": "^1.5.0", "electron-devtools-installer": "^2.2.4", "electron-prebuilt-compile": "4.0.0", diff --git a/lib/gui/electron.py b/lib/gui/electron.py index 651080a9..75e3b16c 100755 --- a/lib/gui/electron.py +++ b/lib/gui/electron.py @@ -37,7 +37,7 @@ def open_url(url): if sys.platform == "darwin" and getattr(sys, 'frozen', None) is None: mac_dev_env = os.environ.copy() # these are paths installed by brew or macports - yarn_path = "/usr/local/bin:/opt/local/bin:" + yarn_path = "/opt/homebrew/bin:/usr/local/bin:/opt/local/bin:" if yarn_path in mac_dev_env["PATH"]: pass else: diff --git a/lib/i18n.py b/lib/i18n.py index 204381dc..0a35ae25 100644 --- a/lib/i18n.py +++ b/lib/i18n.py @@ -30,7 +30,7 @@ def _set_locale_dir(): else: locale_dir = dirname(dirname(realpath(__file__))) - if sys.platform == "darwin": + if sys.platform == "darwin" and getattr(sys, 'frozen', False): locale_dir = os.path.join(locale_dir, "..", 'Resources', 'locales') else: locale_dir = os.path.join(locale_dir, 'locales') |