Skip to content

fix: really keep catalog extra from previous catalog#2479

Merged
andrii-bodnar merged 1 commit intolingui:mainfrom
ljani:fix-2398
Mar 18, 2026
Merged

fix: really keep catalog extra from previous catalog#2479
andrii-bodnar merged 1 commit intolingui:mainfrom
ljani:fix-2398

Conversation

@ljani
Copy link
Contributor

@ljani ljani commented Mar 17, 2026

25cfdde tries to keep flags, but it is incorrectly spreading extra, when it should not, causing flags to be lost.

Additionally, move extra after rest to ensure it is not overwritten. Not sure if this is needed, but the original commit hints it should be always preferred.

See also #2399.

Running the full test suite seems to fail on my machine, but the relevant tests pass.

Description

Types of changes

  • Bugfix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Documentation update
  • Examples update

Fixes #2398.

Checklist

  • I have read the CONTRIBUTING and CODE_OF_CONDUCT docs
  • I have added tests that prove my fix is effective or that my feature works
  • I have added the necessary documentation (if appropriate)

25cfdde tries to keep flags, but it is
incorrectly spreading extra, when it should not causing flags to be
lost.

Additionally, move extra after rest to ensure it is not overwritten.

Fixes lingui#2398.
@vercel
Copy link

vercel bot commented Mar 17, 2026

@ljani is attempting to deploy a commit to the Crowdin Team on Vercel.

A member of the Team first needs to authorize it.

@timofei-iatsenko
Copy link
Collaborator

😳 omg, may bad. Thanks for the fix

@codecov
Copy link

codecov bot commented Mar 18, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 81.21%. Comparing base (6bb8983) to head (84d6a24).
⚠️ Report is 264 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #2479      +/-   ##
==========================================
+ Coverage   77.05%   81.21%   +4.16%     
==========================================
  Files          84      104      +20     
  Lines        2157     2720     +563     
  Branches      555      725     +170     
==========================================
+ Hits         1662     2209     +547     
+ Misses        382      364      -18     
- Partials      113      147      +34     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@andrii-bodnar andrii-bodnar merged commit c939113 into lingui:main Mar 18, 2026
12 of 13 checks passed
@ljani ljani deleted the fix-2398 branch March 19, 2026 16:08
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.

PO file flags are lost when running extract

3 participants