From ec875e0709047cb7c89fddd5b5f7a39218dce229 Mon Sep 17 00:00:00 2001 From: deepend Date: Thu, 19 Feb 2026 17:35:13 -0700 Subject: [PATCH] Updated macOS bundle translation sources to use ${prefix}/locale for both GTK and ZoiteChat catalogs, preventing the bad .../ocale/...-style resolution path caused by prefix/path mismatch during bundling. Updated both CI macOS staging jobs (arm64 and x86_64) to copy app-installed locale catalogs from $STAGE_PREFIX/share/locale into $STAGE_PREFIX/locale when present, so zoitechat.mo is available to gtk-mac-bundler in the staged tree. --- .github/workflows/macos-build.yml | 6 ++++++ osx/zoitechat.bundle | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/macos-build.yml b/.github/workflows/macos-build.yml index 4ed1241c..86b5c042 100644 --- a/.github/workflows/macos-build.yml +++ b/.github/workflows/macos-build.yml @@ -63,6 +63,9 @@ jobs: rsync -a "$BREW_PREFIX/lib/gtk-3.0" "$STAGE_PREFIX/lib/" rsync -a "$BREW_PREFIX/lib/gdk-pixbuf-2.0" "$STAGE_PREFIX/lib/" rsync -a "$BREW_PREFIX/share/locale/" "$STAGE_PREFIX/locale/" + if [ -d "$STAGE_PREFIX/share/locale" ]; then + rsync -a "$STAGE_PREFIX/share/locale/" "$STAGE_PREFIX/locale/" + fi mkdir -p "$STAGE_PREFIX/opt" rm -rf "$STAGE_PREFIX/opt/enchant" @@ -148,6 +151,9 @@ jobs: rsync -a "$BREW_PREFIX/lib/gtk-3.0" "$STAGE_PREFIX/lib/" rsync -a "$BREW_PREFIX/lib/gdk-pixbuf-2.0" "$STAGE_PREFIX/lib/" rsync -a "$BREW_PREFIX/share/locale/" "$STAGE_PREFIX/locale/" + if [ -d "$STAGE_PREFIX/share/locale" ]; then + rsync -a "$STAGE_PREFIX/share/locale/" "$STAGE_PREFIX/locale/" + fi mkdir -p "$STAGE_PREFIX/opt" rm -rf "$STAGE_PREFIX/opt/enchant" diff --git a/osx/zoitechat.bundle b/osx/zoitechat.bundle index 87e47859..5ceb6019 100644 --- a/osx/zoitechat.bundle +++ b/osx/zoitechat.bundle @@ -50,10 +50,10 @@ ${prefix}/lib/gdk-pixbuf-2.0/${pkg:gdk-pixbuf-2.0:gdk_pixbuf_binary_version}/loaders/*.so - ${prefix}/share/locale + ${prefix}/locale - ${prefix}/share/locale + ${prefix}/locale