Repository navigation
fix: restore the build by giving the Antigravity limit strings a French value - #219
Merged
Merged
Conversation
…ch value `t()` gained a French parameter, and the Antigravity limit-group strings landed from a branch that predated it, so `main` stopped compiling: three calls still pass four arguments. The two branches merged cleanly because the conflict is semantic, not textual — neither side edited the same line, and the pull request's checks had run against a base without the French column. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
cte13
pushed a commit
to cte13/PokeTokenBar-iOS
that referenced
this pull request
Aug 23, 2026
Brings in upstream features and integrates them with the fork's iOS/OpenCode Go work: - Antigravity 2.0 / IDE official rate-limit tracking (chattymin#210, chattymin#219, chattymin#220) - French (fr) UI language (chattymin#185) — added fr strings to fork-only labels - Per-provider additional scan folders (chattymin#177/chattymin#187) - Account-labeled official limits (chattymin#199), swift.org Swift 6.3 toolchains (chattymin#216), claude-fable-5 pricing (chattymin#198) Conflicts resolved in Localization, UsageStore, PopoverView, and their tests by keeping both the fork's OpenCode Go limits and upstream's Antigravity limits, and by giving fork-only localized labels their French values. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
lukemonaghan
pushed a commit
to lukemonaghan/PokeTokenBar
that referenced
this pull request
Aug 24, 2026
…ch value (chattymin#219) `t()` gained a French parameter, and the Antigravity limit-group strings landed from a branch that predated it, so `main` stopped compiling: three calls still pass four arguments. The two branches merged cleanly because the conflict is semantic, not textual — neither side edited the same line, and the pull request's checks had run against a base without the French column. Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
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.
Summary
maindoes not compile.t()takes a French argument now, and three Antigravitylimit strings still pass four:
The two changes never touched the same line, so git merged them without a conflict and
the branch reported clean. Its checks had run against a base that had no French column,
and nothing rebuilt the combined tree before it landed. Textual mergeability is not
build compatibility when one side widens a shared signature.
Changes
French for the three strings, matching the vocabulary already used elsewhere in the file
(
Limitealso appears inLimite atteinte,Limite de dépense personnelle):antigravityGeminiGroupantigravityThirdPartyGroupantigravityWindowfallbackNo behaviour change beyond the missing translations.
Type of change
Checklist
swift buildandswift testpass locally — 766 tests, 9 skipped, 0 failures