fix(i18n): restore voice settings strings on the memory stack - #348
Draft
daveh-beep wants to merge 5 commits into
Draft
daveh-beep wants to merge 5 commits into
daveh-beep wants to merge 5 commits into
Conversation
…ranch The memory review commit 5b894c9 overwrote the voice block in en and es settings.json with a divergent variant. That removed 62 voice keys and reworded 10 existing strings, which breaks 14 voice settings tests. Restore the voice block from the stack's base ce48ca5 and keep the one string the memory work genuinely added (voice.interruptionDescription). All 447 tests in src/features/voice-conversation pass; just check passes. Signed-off-by: David Hamilton <daveh@squareup.com>
daveh-beep
added a commit
that referenced
this pull request
Sep 24, 2026
Integrate main at 2f93fb3 after the separately attributable #348 voice catalog repair. Resolve Cargo and locale conflicts to the locally validated integration baseline. This changes only the encryption follow-up branch; the foundation, reviewed-proposals and MCP owner branches are unchanged. Signed-off-by: David Hamilton <daveh@squareup.com>
delkc
force-pushed
the
clay/memory-review
branch
from
September 24, 2026 20:50
5b894c9 to
6def764
Compare
This branch has not been deployed
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
2 participants
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.
Draft — implementation paused pending the remaining-work plan
This is a separate repair branch targeting #289, not main. No review is requested yet. It does not rewrite the memory stack branches.
Scope
Restore the English and Spanish voice settings blocks from the stack's common base, ce48ca5. Commit 5b894c9 removed 63 existing leaf keys and changed 9 existing values in each locale; it also added voice.interruptionDescription, which this patch preserves. The net loss was 62 leaf keys. Everything outside the voice blocks is unchanged.
This corrects the earlier diagnosis in #347: the 14 voice test failures are present in its stack base, but are not pre-existing failures on main. Updating test expectations would conceal the catalog regression.
Validation already completed
Integration plan
Keep this PR in draft. After the stack owner chooses how to incorporate the repair, propagate it through #290 and #347 and rerun the complete validation gate. No unrelated lockfile change is included.