Repository navigation
Read the join dialog in the window's language (#3114) - #3226
Merged
Merged
Conversation
The join/create a room dialog (FaceToFaceGroup) drew its Bot picker name, the
six-digit field's two refusals, the link and scan rows, the nobody step's way
out and the copy tables those rows read as bare English in a zh window. Each
draw now goes through the plugin's own tr(), named template params replace the
`${}` holes, and core/src/client/i18n.js gains the 37 zh keys.
Fixes #3224.
Docs-not-needed: same screen, same layout and the same host calls; only its copy
now goes through tr() and the dictionary gains keys. No owned-path behaviour,
data shape or API changed, so docs/subsystems/social.md and core-client.md stay
as they are.
Birfy
force-pushed
the
dev/3114-face-join-zh
branch
from
November 19, 2026 15:20
d9e01e0 to
3c5c5d7
Compare
Collaborator
Author
|
Verdict: PASS at 3c5c5d7 Ran at this tip: Review points at this tip.
The |
This was referenced Nov 19, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Written-by: Dev
Fixes #3224
Part of #3114
Owner: Dev
Reviewer: Reviewer
Docs-not-needed: same screen, same layout and the same host calls; only its copy now goes through
tr()and the dictionary gains keys.What changed
The join / create a face-to-face room dialog (
FaceToFaceGroup,plugins/social/client.js:1457) drew English in a zh window. Each position now goes through the plugin's owntr(), with named template params ({code},{who},{name}) instead of${}:Your Bots), theLoading your Bots…line, and the six-digit field's two refusals (Enter a 6-digit number.,Choose which of your Bots join.);Joining with that link…,Looking up that room…,Scanned a group link.,Scanned an invite link.,Scanned {code}., theScanned {code}. Pick a Bot to join.follow-up,This group is already in your sidebar., theWaiting for {who} …knock line,Asked to join {name}. …, and the two "could not join" fallbacks);LOCAL_REFUSAL_COPY(10),FACE_SCAN_COPY(5),INVITE_UNSUPPORTEDat its three draw points, andINVITE_LINK_COPY.Two details worth a line. The who/name fallbacks (
the group's owner,the group,A group on another FlyBot) are translated too, and thejoinLocalplaceholder-name comparison asks fortr('A group on another FlyBot'), so a zh window falls back to那个群instead of quoting the placeholder back. The two apostrophes the dictionary spells with’are written as that character at the call sites: the missing-entries scan reads the source literal, so\u2019did not match its key — that was the only rednpm run verifyfound in this change beyond the ratchet lines below.Behaviour is untouched: the same host endpoints, no
data-flybotand no CSS changed.The three baselines lose the 36 pins those draws held — 31 missing + 4 template + 1 bare-draw (
plugins/social/client.js:Your Bots) — and the live totals go14 / 18 / 86→13 / 14 / 55(plugins/social/client.js:missing pins 56 → 25). This branch is based onmain21c70ef362(#3225, cut 23), which is what gives the 14 / 18 / 86 start.Scope against the triage spec (#3114 cut 24)
The nine hand-written paths are the spec's. Three things were measured differently from the spec and are reported as such:
core/src/client/requiresnpm run build(core/client.js) and, becausecore/moved,ds-bot-patches.mjs generate; CI enforces both (build-client.mjs --check,ds-bot-patches.mjs check/canonical). That adds seven generated paths:core/client.js,patches/ds-bot/0001-core-fixes.patch,patches/ds-bot/0008-client-bundle.patchand the fourpatches/ds-bot/files/test/…mirrors.sharing-page-i18n.test.js:148:add-friend-i18n.test.js:119andfriend-settings-i18n.test.js:152(both assert[13, 14, 55]now), andinvite-joined.test.js:50(theWaiting for {who}line is atr()key now, not a${}template). That is 12 hand-written files / 19 files in the diff.createGate(loadRules(.github/agent/risk-rules.json)).judge(<this diff>): T3, 354 changed lines in 12 non-generated files, reasoncore/src/client/i18n.js: /https?:\/\/(?!localhost|…)/— a dictionary key quoteshttps://…/r/…. T3 is expected for this cut and is accepted; nothing was removed to lower it.Checks (all at this tip)
node --test plugins/social/test/face-join-i18n.test.js→4 / 4 / 0; red first on the unmodified implementation with only the test added →4 / 1 / 3.40 / 40 / 0; the ten i18n/affected test files (includingi18n-plugins-missing-zh,add-friend,friend-settings,invite-joined) →59 / 59 / 0.plugins/social:740 / 740 / 0;core:3354tests,3353pass,1skipped (pre-existing),0fail.TZ=UTC npm run verify→ rc 0 (arch-docs OK, 19 changed files).node core/scripts/build-client.mjs --check,node scripts/ds-bot-patches.mjs checkandcanonical,.github/scripts/changelog.mjs check,.github/scripts/check-mojibake.mjs --check— all clean.Not run: the smoke test — no
index.jsorsrc/host/change. Note for a local re-run:TMPDIRmust not containdsh(part-archive.test.jsreads such a path as DeepSeek Harness data), and/tmphere is a 128 MB tmpfs, so these numbers were taken withTMPDIR=/data/tmp.Ran
Ran at this tip:
Checkpoint
{
"pr": 3226,
"claim": "Dev",
"issue": 3224,
"summary": "The join / create a face-to-face room dialog drew its Bot picker name, the six-digit field's two refusals, the link and scan rows with their status lines, and the four copy tables those rows read as English in a zh window. Each draw now goes through the plugin's tr() with named template params, and core/src/client/i18n.js gains the 37 zh keys. The same host calls, data-flybot hooks and CSS are used, so behaviour is unchanged. The three baselines lose 36 pins (31 missing, 4 template, 1 bare draw): 14/18/86 to 13/14/55.",
"files": [
"plugins/social/client.js",
"core/src/client/i18n.js",
"core/client.js",
"plugins/social/test/face-join-i18n.test.js",
"plugins/social/test/sharing-page-i18n.test.js",
"core/test/i18n-missing-entries.baseline.json",
"core/test/i18n-template-draws.baseline.json",
"core/test/i18n-plugins.baseline.json",
"changelog.d/3114-face-join-i18n.fixed.md",
"patches/ds-bot/0001-core-fixes.patch"
],
"checks": {
"ran": "TZ=UTC npm run verify (rc 0); new test 4/4/0 (red 4/1/3); social 740/740/0; core 3354 tests 0 fail",
"result": "green",
"at": "3c5c5d76087e9b15d6d9ae32175641db2d893a91"
},
"next": "Reviewer: PASS at this tip (T3), then enqueue through the merge queue."
}