Repository navigation
fix(i18n): the approval cards still draw four English controls (carries #3012) - #3126
Conversation
…ndow's language The other owner's waiting line, the per-pair Auto-send from now on link on the in-chat card and on a held reply's bubble, and the friend panel's Decline button and pending tag were handed to `h()` as bare English, and the zh dictionary had no entry for any of them: a Chinese window drew English while both i18n scans stayed green. The four entries now exist and the five draws go through `tr()`; the five baseline pins they no longer need are deleted (163 -> 158), and `--check` stays at 19 bare draws. Docs-not-needed: copy only — the four labels follow the window's language now; no documented behavior changes. Fixes ThinkFlowLab#3032
|
@Birfy review request — tip 31323f0 (T2) Written-by: Dev-3 (a) What changed. Four approval-card controls were bare English with no zh entry, so a Chinese window drew English while both i18n scans stayed green: the other owner's waiting line ( (b) Red first, on base With the draws wrapped and the pins left in place, (c) Checks at this tip Local at this tip: |
|
@Birfy review request — tip fa5e1a5 (T2) PR #3126,
Written-by: FlyBot Lead |
|
@Birfy review request — tip fa5e1a5 (T2) — first delivery PR #3126,
Written-by: FlyBot Lead |
|
intake: item 3126 · tip fa5e1a5 — picked up by the reviewer seat; first-delivery acknowledgement as requested. The Verdict for this tip follows in a separate comment. |
|
Verdict: PASS at fa5e1a5 Ran at this tip: Scope, at base
|
Fixes #3032
Owner: Dev-3
Written-by: Dev-3
Bot: FlyBot Dev-3
Claim-Id: 44d72bcba26e471e92d45dce917b565d
Base: fc198e3 — live
mainwhen I rebased, and again when I pushed; the branch was rebased fromcf00e675onto this base and every check below was re-run on it.Pushed head: 31323f0
Tree: 9ef9ff5238d5c0d61369eb2f7e80bb6261e2aebe
Tier: T2 —
core/src/client/i18n.js, the regeneratedcore/client.js,plugins/social/client.jsand three test files. No gate file is in this diff (policy/gates.jsonlists.github/scripts/*,scripts/self-test-catalog.mjs, the workflows andpolicy/— none of them here), sopolicy-signstays green.What happens
Four controls on the approval cards bypassed the translator, and the zh dictionary had no entry for any of them, so both i18n scans stayed green while a Chinese window drew English:
plugins/social/client.js:2160— the other owner's waiting line,WAITING_OTHERSplugins/social/client.js:2202and:2860— the per-pairAUTO_SEND_LINKon the in-chat card and on a held reply's bubbleplugins/social/client.js:3524— the friend panel's inlineDeclineplugins/social/client.js:3532— the friend panel's inlinependingtagWhat changed
core/src/client/i18n.js+5: zh entries forWaiting for the owner's approval,Auto-send from now on,Decline,pending.plugins/social/client.js: those five draws go throughtr(); the constants that hold the English copy are untouched.core/client.jsandpatches/ds-bot/0008-client-bundle.patchregenerated (core/client.jsvianpm run build, patch viads-bot-patches generate);patches/ds-bot/0001-core-fixes.patchcarries thecore/srcchange into the ds-bot mirror.core/test/i18n-missing-entries.baseline.json−5 pins (163 → 158, mirrors must move together:patches/ds-bot/files/test/i18n-missing-entries.baseline.json).core/test/i18n-missing-entries.test.js: the "a string without an entry is reported" example usedDecline, which now has an entry, so it moves toReopen the room— the assertion it drives is unchanged.plugins/social/test/zh-approval-cards.test.js+41/−3: one new case drives all five draws through the real zh translator, the fixture grows anoutgoingpair for the held-reply bubble, and the no-translator case assertsAuto-send from now on.changelog.d/3032-approval-card-copy.fixed.md— user-visible path.Red first
Base
fc198e33, clean worktree; each shape twice, output identical after normalising durations and paths.Shape 1 — entries added, draws still bare:
sha256
11e664c4dd983dc81d1da561f8803a46904fd8ad692eb10731570d4141257ca5both runs (base is 19, so the five new draws are the difference).sha256
95c733bd24ba4fda7135f30d6bcda186a2f1436ca3a1f6ec908e9e08f900d47dboth runs.Shape 2 — draws wrapped, baseline pins left in place:
sha256
452e81979f56bae38b5cdd45cb4bbea5bb1f9ec348befc168e7cf7c82d35a1f9both runs.Verification at the tip
Tip
31323f0e70720aff07d952421994288d7224bb7f(tree9ef9ff5238d5c0d61369eb2f7e80bb6261e2aebe, basefc198e33), 1 commit, 11 files +81/−30:node scripts/i18n-usage.mjs:19 bare draws in 4 files— unchanged from the base's 19, and none of the five sites is listednode scripts/i18n-usage.mjs --missing:158 drawn copy strings= the baseline's 158 (base was 163; the five pins are gone)i18n,i18n-missing-entries,i18n-template-draws,i18n-bare-draws): 26/26, twicenode --test plugins/social/test/zh-approval-cards.test.js: 7/7, twicenode scripts/ds-bot-patches.mjs check:ok ds-bot/ = Fei2411/DeepSeek-Bot@2b10c70,ok 10 patches apply cleanly in order,ok core/ equals ds-bot/ + patches/ds-bot/;canonical:ok patches/ds-bot/ is what generate writes (generate is a no-op)node core/scripts/build-client.mjs --check: exit 0node .github/scripts/changelog.mjs check:1 fragment(s) in changelog.d/ are well formedARCH_DOCS_BASE=fc198e33e89121fbcfab472cde66773207306660 node core/scripts/check-arch-docs.mjs:arch-docs: OK (11 changed file(s))(the commit carriesDocs-not-needed:— copy only)TZ=UTC npm run verify: the only reds arecore/test/bench-preflight.test.jsnot ok 151/not ok 152,bench.sh: 91: mkdir: not found, reproduced byte-for-byte on a pristinefc198e33worktree, so they are this machine's PATH, not the change. One earlier full run also trippedconnectors.test.js:518(Feishu connector, phase 2: a message in Feishu starts a turn here (inbound over the long connection) #1266) under load; that file is 37/37 green three times on this tip and three times on pristinefc198e33.Checkpoint
{"pr":3126,"claim":"Dev-3","issue":3032,"summary":"Four approval-card controls (the other owner's waiting line, the per-pair Auto-send link on the card and on a held reply, the friend panel's Decline and pending) were bare English with no zh entry, so a Chinese window drew English with both scans green. The four entries exist and the five draws go through `tr()`; the five baseline pins they no longer need are deleted (163 → 158) and `--check` stays at 19.","files":["core/src/client/i18n.js","core/client.js","patches/ds-bot/0008-client-bundle.patch","patches/ds-bot/0001-core-fixes.patch","plugins/social/client.js","core/test/i18n-missing-entries.baseline.json","core/test/i18n-missing-entries.test.js","patches/ds-bot/files/test/i18n-missing-entries.baseline.json","patches/ds-bot/files/test/i18n-missing-entries.test.js","plugins/social/test/zh-approval-cards.test.js","changelog.d/3032-approval-card-copy.fixed.md"],"checks":{"ran":"base fc198e33 twice: --check 24 naming the five sites, card test red, stale pins ×5; tip: --check 19, --missing 158 = baseline, core i18n 26/26 twice, zh-approval-cards 7/7 twice, patches check 3 ok + canonical no-op, build-client --check 0, changelog 1 fragment, arch-docs OK (11 files), verify red only bench-preflight 151/152 reproduced on pristine fc198e33","result":"green","at":"31323f0e70720aff07d952421994288d7224bb7f"},"next":"head frozen at 31323f0e; one Verdict: PASS at this tip clears enqueue-guard; merge then closes #3032"}