Skip to content

build(server): advance aw-server-rust pin so the Android app ships the 16-locale frontend - #377

Merged
ErikBjare merged 2 commits into
ActivityWatch:masterfrom
TimeToBuildBob:feat/advance-server-pin-locale-tranche
Oct 26, 2026
Merged

ErikBjare merged 2 commits into
ActivityWatch:masterfrom
TimeToBuildBob:feat/advance-server-pin-locale-tranche

Conversation

@TimeToBuildBob

@TimeToBuildBob TimeToBuildBob commented Oct 21, 2026 •

Copy link
Copy Markdown
Contributor

Why

The Android app builds its web UI from the aw-server-rust gitlink, which in
turn pins aw-webui:

Makefile:15  WEBUI_SRCDIR := aw-server-rust/aw-webui
Makefile:290 make --directory=aw-server-rust/aw-webui build

The current pin is 69e0ac4d, whose aw-webui pin is d6e9d707 — the old
six-language registry (en, uk, de, ru, zh-CN, sv). The Play Store
review that started the locale work asked for Arabic, and the frontend now has
16 registered languages (Arabic, Urdu, Swahili, Bengali, Indonesian,
Japanese, Hindi, French, Spanish, Brazilian Portuguese …) at the verified
frontend revision d7d45cda.

Change

Advance only the aw-server-rust submodule pointer, 69e0ac4d →
96c64e58 (the ActivityWatch/aw-server-rust#829 merge commit on master; same tree as the PR head 8c15470). No Gradle, Kotlin, Rust or resource changes.

8c15470 is the reviewed head of [ActivityWatch/aw-server-rust#829], whose
aw-webui pin is d7d45cda. That aw-server-rust revision passed its own CI
(Android, macOS, Windows, Ubuntu, clippy, format) with this exact pin.

Status

ActivityWatch/aw-server-rust#829 merged 2026-10-26 as 96c64e58, a descendant of the current pin 69e0ac4d (4 ahead, 0 behind). The pin now points at that master commit, so this PR is ready.

Verification

  • aw-webui at d7d45cda: locale key/placeholder/order checks pass, 16
    registered + picker locales, 1,127 Jest tests pass (21 skipped), production
    webpack build passes, and isolated real-browser checks covered every picker
    selection, server/localStorage persistence and reload, plus Arabic/Urdu
    direction switching at 1280px and 390px
    (Complete i18n suite aw-webui#1137)
  • The Android APK build and an installed-WebView check are not verified
    here; CI on this PR is the build check. Play Store availability is not
    claimed by this PR
  • Translations are machine-drafted and not native-reviewed

…cale frontend

The aw-android build consumes the aw-server-rust gitlink, which in turn pins
aw-webui. The current pin 69e0ac4d carries aw-webui d6e9d707 (six locales).
Advance to 8c15470 (ActivityWatch/aw-server-rust#829), whose aw-webui pin is
d7d45cda with all 16 registered languages (including Arabic, Urdu, Swahili)
and the single sorted endonym map.

Git-Session-Id: c98a97d0-b160-44e5-8d84-e327e8d7a8b3
@greptile-apps

greptile-apps Bot commented Oct 21, 2026 •

Copy link
Copy Markdown

RetriggerView in GreptileConfidence Score: 5/5

[Medium impact] The pin update appears safe to merge; no blocking issue was found.

Summary

Updates the aw-server-rust submodule pin to 96c64e5.

  • The Android app bundles the web UI with 16 registered languages.

Reviews (2) · Last reviewed commit: "build(server): re-point aw-server-rust p..." · Reviewed by Greptile

@TimeToBuildBob

Copy link
Copy Markdown
Contributor Author

Keeping this draft until ActivityWatch/aw-server-rust#829 merges; that dependency is still open. Greptile found no blocking issue (5/5), and the Android server build is still running. No pin change or CI rerun is needed now.

@TimeToBuildBob

Copy link
Copy Markdown
Contributor Author

CI evidence on this head: `Build aw-server-rust` passed (8m49s) and `Test` passed (3m26s).

That job is the one that matters here: it checks out the pinned `aw-server-rust` submodule and runs `make --directory=aw-server-rust/aw-webui build` (`Makefile:290`), so it proves both that the `8c15470` submodule fetch resolves and that the 16-locale frontend (aw-webui `d7d45cda`) compiles in the Android build. Greptile is 5/5 with no findings.

Still outstanding, and unchanged: the remaining CI jobs (E2E, release-variant smoke), an installed-WebView check on a real device, and a published Play Store build — none of which this PR claims.

…n master

Same tree as 8c15470 (the PR head); the merged commit is on aw-server-rust master.

Git-Session-Id: b82641f6-9b06-44c8-85ad-3332b944a626
@TimeToBuildBob
TimeToBuildBob marked this pull request as ready for review October 26, 2026 17:11
@TimeToBuildBob

Copy link
Copy Markdown
Contributor Author

ActivityWatch/aw-server-rust#829 merged as 96c64e58. Re-pointed the gitlink to it (3a702bd; identical tree to the old 8c15470 head, tree 2a26dcb4) and marked this ready. The pin is now an aw-server-rust master commit carrying aw-webui d7d45cda (16 locales). CI on the new head will be the Android build check; the installed-WebView check and Play Store availability remain unverified.

@TimeToBuildBob

TimeToBuildBob commented Oct 26, 2026 •

Copy link
Copy Markdown
Contributor Author

🤖 AI code review

Not reviewed

Confidence N/A

Not scored — this diff moves a submodule pointer and contains no source to assess. Treat it as not reviewed, not as approved.

ℹ️ Submodule pointer change only — not reviewed.

This diff moves a submodule SHA and contains no source changes, so there is nothing here for me to assess. Whether the bump is safe depends on the submodule's commit range, which this diff does not include. Treat this as not reviewed, not as approved.

Reviewed 3a702bda73e6 · panel: codex:gpt-6.1-sol · subscription engine · 13s · about this reviewer

Maintainer commands

@TimeToBuildBob review (own line) — fresh review · @TimeToBuildBob fix — a worker acts on the findings. Once per comment; 👀 = received.

@ErikBjare
ErikBjare merged commit bb63460 into ActivityWatch:master Oct 26, 2026
7 checks passed
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.

2 participants