Fix #252

kra-mo · Apr 17, 2024 · e8db732 · e8db732
1 parent 7d937c7
commit e8db732
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 136 deletions.
diff --git a/cartridges/cartridges.in b/cartridges/cartridges.in
@@ -26,17 +26,22 @@ import signal
 import sys
 
 VERSION = "@VERSION@"
-PKGDATADIR = "@pkgdatadir@"
-LOCALEDIR = "@localedir@"
+
+if os.name == "nt":
+    PKGDATADIR = os.path.join(os.path.dirname(__file__), "..", "share", "cartridges")
+else:
+    PKGDATADIR = "@pkgdatadir@"
+    LOCALEDIR = "@localedir@"
 
 sys.path.insert(1, PKGDATADIR)
 signal.signal(signal.SIGINT, signal.SIG_DFL)
 
 if os.name != "nt":
     locale.bindtextdomain("cartridges", LOCALEDIR)
     locale.textdomain("cartridges")
-
-gettext.install("cartridges", LOCALEDIR)
+    gettext.install("cartridges", LOCALEDIR)
+else:
+    gettext.install("cartridges")
 
 if __name__ == "__main__":
     from gi.repository import Gio

diff --git a/cartridges/main.py b/cartridges/main.py
@@ -54,7 +54,6 @@
 from cartridges.store.managers.sgdb_manager import SgdbManager
 from cartridges.store.managers.steam_api_manager import SteamAPIManager
 from cartridges.store.store import Store
-from cartridges.utils.migrate_files_v1_to_v2 import migrate_files_v1_to_v2
 from cartridges.utils.run_executable import run_executable
 from cartridges.window import CartridgesWindow
 
@@ -94,9 +93,6 @@ def do_activate(self) -> None:  # pylint: disable=arguments-differ
         setup_logging()
         log_system_info()
 
-        if os.name == "nt":
-            migrate_files_v1_to_v2()
-
         # Set fallback icon-name
         Gtk.Window.set_default_icon_name(shared.APP_ID)
 

diff --git a/cartridges/utils/migrate_files_v1_to_v2.py b/cartridges/utils/migrate_files_v1_to_v2.py