Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: escaped curly-braces doesn't preserve in development mode #1913

Merged
merged 3 commits into from
Apr 30, 2024

Conversation

ninesunsabiu
Copy link
Contributor

Description

#1901

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 # (issue)

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)

Copy link

vercel bot commented Apr 10, 2024

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
js-lingui ✅ Ready (Inspect) Visit Preview 💬 Add feedback Apr 12, 2024 2:04pm

Copy link

github-actions bot commented Apr 10, 2024

size-limit report 📦

Path Size
./packages/core/dist/index.mjs 2.86 KB (0%)
./packages/detect-locale/dist/index.mjs 723 B (0%)
./packages/react/dist/index.mjs 1.65 KB (0%)
./packages/remote-loader/dist/index.mjs 7.26 KB (0%)

packages/core/src/i18n.ts Outdated Show resolved Hide resolved
packages/core/src/i18n.ts Outdated Show resolved Hide resolved
packages/core/src/i18n.test.ts Show resolved Hide resolved
@timofei-iatsenko
Copy link
Collaborator

Thanks! I left few comments. And please switch the base branch for this to the next.

@ninesunsabiu ninesunsabiu changed the base branch from main to next April 11, 2024 13:14
@ninesunsabiu ninesunsabiu changed the title fix: escaped curly-braces doesn't preserve in development mode WIP fix: escaped curly-braces doesn't preserve in development mode Apr 11, 2024
@ninesunsabiu
Copy link
Contributor Author

Thanks! I left few comments. And please switch the base branch for this to the next.

Should I resolve the conflict or create another pull request based on the next branch?

@timofei-iatsenko
Copy link
Collaborator

just rebase your latest commit in this branch on top of next and fix conflicts if any. Currently, you are trying to merge a main to a next thats why so many conflicts

@ninesunsabiu ninesunsabiu changed the title WIP fix: escaped curly-braces doesn't preserve in development mode fix: escaped curly-braces doesn't preserve in development mode Apr 11, 2024
@ninesunsabiu ninesunsabiu changed the title fix: escaped curly-braces doesn't preserve in development mode WIP: fix: escaped curly-braces doesn't preserve in development mode Apr 11, 2024
@ninesunsabiu ninesunsabiu changed the title WIP: fix: escaped curly-braces doesn't preserve in development mode fix: escaped curly-braces doesn't preserve in development mode Apr 11, 2024
@ninesunsabiu
Copy link
Contributor Author

I force change my fork branch from main to next (but it still called main) then cherry-pick my commits.

I'm not sure if what I'm doing is appropriate. GitHub doesn't allow me to change the base of the current pull request from ninesunsabiu:main to ninesunsabiu:next. 😂

@timofei-iatsenko
Copy link
Collaborator

@andrii-bodnar please re-run workkflows here

@andrii-bodnar andrii-bodnar linked an issue Apr 12, 2024 that may be closed by this pull request
@andrii-bodnar andrii-bodnar merged commit 592889a into lingui:next Apr 30, 2024
13 checks passed
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.

Escaped curly-braces doesn't preserve in development mode
3 participants