diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index a0cf9a7..84505ab 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -23,6 +23,7 @@ jobs: meson setup _build ninja -C _build install pacman --noconfirm -Rs mingw-w64-ucrt-x86_64-python-pip mingw-w64-ucrt-x86_64-desktop-file-utils mingw-w64-ucrt-x86_64-meson git + find /ucrt64/share/locale/ -type f ! -name "*cartridges.mo" -delete - name: "Inno Setup" run: iscc ".\.windows\Cartridges.iss" - name: "Upload Artifact" diff --git a/.windows/Cartridges.iss b/.windows/Cartridges.iss index b785dd9..9454d35 100644 --- a/.windows/Cartridges.iss +++ b/.windows/Cartridges.iss @@ -13,7 +13,7 @@ AppPublisher={#MyAppPublisher} AppPublisherURL={#MyAppURL} AppSupportURL=https://github.com/kra-mo/cartridges/issues AppUpdatesURL={#MyAppURL} -DefaultDirName={autopf}\{#MyAppName} +DefaultDirName={autopf64}\{#MyAppName} DisableProgramGroupPage=yes LicenseFile=..\LICENSE PrivilegesRequiredOverridesAllowed=dialog @@ -43,9 +43,10 @@ Source: "D:\a\_temp\msys64\ucrt64\lib\girepository-1.0\*"; DestDir: "{app}\lib\g Source: "D:\a\_temp\msys64\ucrt64\lib\python3.10\*"; DestDir: "{app}\lib\python3.10"; Excludes: "__pycache__"; Flags: recursesubdirs ignoreversion Source: "D:\a\_temp\msys64\ucrt64\share\cartridges\*"; DestDir: "{app}\share\cartridges"; Excludes: "__pycache__"; Flags: recursesubdirs ignoreversion -Source: "D:\a\_temp\msys64\ucrt64\share\icons\*"; DestDir: "{app}\share\icons"; Excludes: "cursors\*"; Flags: recursesubdirs ignoreversion +Source: "D:\a\_temp\msys64\ucrt64\share\icons\*"; DestDir: "{app}\share\icons"; Excludes: "*.png,cursors\*"; Flags: recursesubdirs ignoreversion Source: "D:\a\_temp\msys64\ucrt64\share\glib-2.0\*"; DestDir: "{app}\share\glib-2.0"; Flags: recursesubdirs ignoreversion Source: "D:\a\_temp\msys64\ucrt64\share\gtk-4.0\*"; DestDir: "{app}\share\gtk-4.0"; Flags: recursesubdirs ignoreversion +Source: "D:\a\_temp\msys64\ucrt64\share\locale\*"; DestDir: "{app}\share\locale"; Flags: recursesubdirs ignoreversion Source: "icon.ico"; DestDir: "{app}"; Flags: recursesubdirs ignoreversion diff --git a/src/cartridges.in b/src/cartridges.in index ad31d7a..a5be237 100755 --- a/src/cartridges.in +++ b/src/cartridges.in @@ -27,6 +27,11 @@ import gettext VERSION = "@VERSION@" if os.name == "nt": + from ctypes import windll + + os.environ["LANGUAGE"] = locale.windows_locale[ + windll.kernel32.GetUserDefaultUILanguage() + ] pkgdatadir = os.path.join(os.path.dirname(__file__), "..", "share", "cartridges") localedir = os.path.join(os.path.dirname(__file__), "..", "share", "locale") else: