Skip to content

Update full cardset package branch - #1

Merged
joeraz merged 21 commits into
full-cardset-package-build-2from
master
Jul 19, 2026
Merged

Update full cardset package branch#1
joeraz merged 21 commits into
full-cardset-package-build-2from
master

Conversation

@joeraz

@joeraz joeraz commented Jul 19, 2026

Copy link
Copy Markdown
Owner

No description provided.

joeraz and others added 21 commits June 21, 2026 10:07
Bumps [actions/checkout](https://github.com/actions/checkout) from 6 to 7.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v6...v7)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '7'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Fixes the duplicate msgid the same way, but also answers joeraz's
question about telling the two Medium strings apart: cardset size now
uses pgettext("size", "Medium"), so it's a separate translatable
string from the Kivy speed menu's Medium instead of sharing one.

pgettext is a small manual implementation (mygettext.py) rather than
the stdlib gettext.pgettext(), which only exists on 3.8+ and CI still
tests 3.7. Same context-separator trick Django's pgettext() uses
internally. xgettext needs --keyword=pgettext:1c,2 to pick these up,
added to the Makefile.

Added the new msgctxt entry by hand to pysol.pot and all six
language po files rather than running make pot, since a full
regeneration produces a large unrelated diff on my machine (different
xgettext version reformats every location comment). Left it
untranslated for now.
CI downloaded python.org's Intel-only installer (macosx10.9.pkg) even
on the arm64 runner, so Rosetta translated the whole build and shipped
an x86_64-only .app that needs Rosetta 2 on Apple Silicon Macs. Switch
to the macos11.pkg universal2 installer, bump the deprecated macos-14
runner to macos-15, and add a lipo check after packaging that fails
the build if the app or its pygame-ce extension aren't actually
universal2.
* Block card input while paused on Android/Kivy

Pause froze the elapsed-time counter but never stopped touch input,
so cards could still be dragged and moves counted while paused,
letting a run finish with a 0.00 time. LImageItem now checks
game.pause before handling touch down/up.

* fixes
@joeraz
joeraz merged commit 886ea95 into full-cardset-package-build-2 Jul 19, 2026
1 check was pending
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants