[PR #1388] [MERGED] fix: improve lingui configuration #1601

New issue

Closed

opened 2026-02-26 19:33:57 +03:00 by kerem · 0 comments

kerem commented

2026-02-26 19:33:57 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/documenso/documenso/pull/1388
Author: @dguyen
Created: 10/8/2024
Status: ✅ Merged
Merged: 10/9/2024
Merged by: @Mythie

Base: main ← Head: fix/improve-lingui-configuration

📝 Commits (6)

a900495 fix: improve lingui configuration
2f4506e chore: update dockerfile
4a124c0 Merge branch 'main' into fix/improve-lingui-configuration
d56f322 fix: file extension
882522b fix: file extension
f5ec9e7 Merge branch 'main' into fix/improve-lingui-configuration

📊 Changes

18 files changed (+22 additions, -64 deletions)

View changed files

➖ .github/workflows/translations-extract.yml (+0 -38)
📝 .github/workflows/translations-upload.yml (+2 -4)
📝 .husky/pre-commit (+0 -5)
📝 apps/marketing/package.json (+1 -1)
📝 apps/web/package.json (+1 -1)
📝 docker/Dockerfile (+2 -0)
📝 packages/lib/client-only/providers/i18n.server.tsx (+4 -3)
➕ packages/lib/translations/.gitignore (+4 -0)
➖ packages/lib/translations/de/marketing.js (+0 -1)
➖ packages/lib/translations/de/web.js (+0 -1)
➖ packages/lib/translations/en/marketing.js (+0 -1)
➖ packages/lib/translations/en/web.js (+0 -1)
➖ packages/lib/translations/fr/marketing.js (+0 -1)
➖ packages/lib/translations/fr/web.js (+0 -1)
➖ packages/lib/translations/ro/marketing.js (+0 -1)
➖ packages/lib/translations/ro/web.js (+0 -1)
📝 packages/lib/utils/i18n.ts (+4 -3)
📝 turbo.json (+4 -1)

📄 Description

Description

Currently merge conflicts arise due to the compiled JS and PO translation files.

This PR is a rework on how we handle extracting and compiling translations to streamline PRs and merging branches.

Changes Made

Remove compiled translation files from being committed
Extract and compile translations only on build
Extract will still occur when commits land on main to sync and pull new translations with Crowdin

Summary by CodeRabbit

New Features
- Introduced new tasks for translation extraction and compilation in the build process.
Bug Fixes
- Streamlined translation extraction and compilation workflows to improve efficiency.
Chores
- Removed outdated translation extraction commands from pre-commit hooks.
- Added a new .gitignore file to manage ignored files in translations.
Documentation
- Updated dynamic import paths for translations based on environment and context.
Revert
- Removed multiple translation files for various languages, affecting localized content availability.

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/documenso/documenso/pull/1388 **Author:** [@dguyen](https://github.com/dguyen) **Created:** 10/8/2024 **Status:** ✅ Merged **Merged:** 10/9/2024 **Merged by:** [@Mythie](https://github.com/Mythie) **Base:** `main` ← **Head:** `fix/improve-lingui-configuration` --- ### 📝 Commits (6) - [`a900495`](https://github.com/documenso/documenso/commit/a9004959dcdedab0282c84d7a18fd6bb765f4272) fix: improve lingui configuration - [`2f4506e`](https://github.com/documenso/documenso/commit/2f4506eb0ef36518a708f005a98007624168cda3) chore: update dockerfile - [`4a124c0`](https://github.com/documenso/documenso/commit/4a124c09c13fe7eb6ca79fc9e90a27ea74c45c10) Merge branch 'main' into fix/improve-lingui-configuration - [`d56f322`](https://github.com/documenso/documenso/commit/d56f32217b110b2fcc40d4b099fef382bc0fd620) fix: file extension - [`882522b`](https://github.com/documenso/documenso/commit/882522bba9c371bd8d23bf800470b7debf84c589) fix: file extension - [`f5ec9e7`](https://github.com/documenso/documenso/commit/f5ec9e791728278e7d9e7cbe1429f023978b0b84) Merge branch 'main' into fix/improve-lingui-configuration ### 📊 Changes **18 files changed** (+22 additions, -64 deletions) <details> <summary>View changed files</summary> ➖ `.github/workflows/translations-extract.yml` (+0 -38) 📝 `.github/workflows/translations-upload.yml` (+2 -4) 📝 `.husky/pre-commit` (+0 -5) 📝 `apps/marketing/package.json` (+1 -1) 📝 `apps/web/package.json` (+1 -1) 📝 `docker/Dockerfile` (+2 -0) 📝 `packages/lib/client-only/providers/i18n.server.tsx` (+4 -3) ➕ `packages/lib/translations/.gitignore` (+4 -0) ➖ `packages/lib/translations/de/marketing.js` (+0 -1) ➖ `packages/lib/translations/de/web.js` (+0 -1) ➖ `packages/lib/translations/en/marketing.js` (+0 -1) ➖ `packages/lib/translations/en/web.js` (+0 -1) ➖ `packages/lib/translations/fr/marketing.js` (+0 -1) ➖ `packages/lib/translations/fr/web.js` (+0 -1) ➖ `packages/lib/translations/ro/marketing.js` (+0 -1) ➖ `packages/lib/translations/ro/web.js` (+0 -1) 📝 `packages/lib/utils/i18n.ts` (+4 -3) 📝 `turbo.json` (+4 -1) </details> ### 📄 Description ## Description Currently merge conflicts arise due to the compiled JS and PO translation files. This PR is a rework on how we handle extracting and compiling translations to streamline PRs and merging branches. ## Changes Made - Remove compiled translation files from being committed - Extract and compile translations only on build - Extract will still occur when commits land on main to sync and pull new translations with Crowdin  ## Summary by CodeRabbit - **New Features** - Introduced new tasks for translation extraction and compilation in the build process. - **Bug Fixes** - Streamlined translation extraction and compilation workflows to improve efficiency. - **Chores** - Removed outdated translation extraction commands from pre-commit hooks. - Added a new `.gitignore` file to manage ignored files in translations. - **Documentation** - Updated dynamic import paths for translations based on environment and context. - **Revert** - Removed multiple translation files for various languages, affecting localized content availability.  --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>