From 0e5d7dfb9f6f2fae699de8096e712cff8aefdaa8 Mon Sep 17 00:00:00 2001
From: deepend <deepend@tilde.club>
Date: Thu, 19 Feb 2026 17:46:27 -0700
Subject: [PATCH] Updated the macOS CI staging steps (both arm64 and x86_64
 jobs) to stage locales under "$STAGE_PREFIX/share/locale/" by creating
 "$STAGE_PREFIX/share" and syncing from "$BREW_PREFIX/share/locale/" there,
 instead of using a top-level "$STAGE_PREFIX/locale" directory.

Updated the gtk-mac-bundler bundle translation roots for both gtk30 and zoitechat to ${prefix}/share/locale (from ${prefix}/locale).
---
 .github/workflows/macos-build.yml | 14 ++++----------
 osx/zoitechat.bundle              |  4 ++--
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/macos-build.yml b/.github/workflows/macos-build.yml
index 86b5c042..96c9a244 100644
--- a/.github/workflows/macos-build.yml
+++ b/.github/workflows/macos-build.yml
@@ -59,13 +59,10 @@ jobs:
           BREW_PREFIX="$(brew --prefix)"
           ENCHANT_PREFIX="$(brew --prefix enchant)"
 
-          mkdir -p "$STAGE_PREFIX/lib" "$STAGE_PREFIX/locale"
+          mkdir -p "$STAGE_PREFIX/lib" "$STAGE_PREFIX/share"
           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
+          rsync -a "$BREW_PREFIX/share/locale/" "$STAGE_PREFIX/share/locale/"
 
           mkdir -p "$STAGE_PREFIX/opt"
           rm -rf "$STAGE_PREFIX/opt/enchant"
@@ -147,13 +144,10 @@ jobs:
           BREW_PREFIX="$(brew --prefix)"
           ENCHANT_PREFIX="$(brew --prefix enchant)"
 
-          mkdir -p "$STAGE_PREFIX/lib" "$STAGE_PREFIX/locale"
+          mkdir -p "$STAGE_PREFIX/lib" "$STAGE_PREFIX/share"
           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
+          rsync -a "$BREW_PREFIX/share/locale/" "$STAGE_PREFIX/share/locale/"
 
           mkdir -p "$STAGE_PREFIX/opt"
           rm -rf "$STAGE_PREFIX/opt/enchant"
diff --git a/osx/zoitechat.bundle b/osx/zoitechat.bundle
index 5ceb6019..87e47859 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
   </binary>
   <translations name="gtk30">
-    ${prefix}/locale
+    ${prefix}/share/locale
   </translations>
   <translations name="zoitechat">
-    ${prefix}/locale
+    ${prefix}/share/locale
   </translations>
 
   <data dest="${bundle}/Contents/Resources">