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.

Sign up for GitHub

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 L10n: messages-compiled.json are not compiled automatically by vite #114

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix L10n: messages-compiled.json are not compiled automatically by vite #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dc62b71
Fix messages compilation
jermy-c Jun 30, 2024
83ca9f0
Fix lingui build error in /e2
jermy-c Jun 30, 2024
3d44b37
Make new lines after every plugin
jermy-c Jun 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions app/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ dist
dist-ssr
public/olm.wasm
*.local
# Temp workaround for bug #112
l10n/locales/*/messages-compiled.json

# Editor directories and files
.vscode/*
Expand Down
40 changes: 20 additions & 20 deletions app/l10n/l10n.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,27 @@ import { derived } from 'svelte/store';

import { sourceLocale } from './list';

import { messages as en } from './locales/en/messages-compiled.json';
import { messages as de } from './locales/de/messages-compiled.json';
import { messages as fr } from './locales/fr/messages-compiled.json';
import { messages as it } from './locales/it/messages-compiled.json';
import { messages as es } from './locales/es/messages-compiled.json';
import { messages as pt } from './locales/pt/messages-compiled.json';
import { messages as pl } from './locales/pl/messages-compiled.json';
import { messages as ja } from './locales/ja/messages-compiled.json';
import { messages as zh } from './locales/zh/messages-compiled.json';
import { messages as en } from './locales/en/messages.json?lingui';
import { messages as de } from './locales/de/messages.json?lingui';
import { messages as fr } from './locales/fr/messages.json?lingui';
import { messages as it } from './locales/it/messages.json?lingui';
import { messages as es } from './locales/es/messages.json?lingui';
import { messages as pt } from './locales/pt/messages.json?lingui';
import { messages as pl } from './locales/pl/messages.json?lingui';
import { messages as ja } from './locales/ja/messages.json?lingui';
import { messages as zh } from './locales/zh/messages.json?lingui';

import { messages as ar } from './locales/ar/messages-compiled.json';
import { messages as cs } from './locales/cs/messages-compiled.json';
import { messages as da } from './locales/da/messages-compiled.json';
import { messages as el } from './locales/el/messages-compiled.json';
import { messages as fi } from './locales/fi/messages-compiled.json';
import { messages as nl } from './locales/nl/messages-compiled.json';
import { messages as no } from './locales/no/messages-compiled.json';
import { messages as ro } from './locales/ro/messages-compiled.json';
import { messages as ru } from './locales/ru/messages-compiled.json';
import { messages as sv } from './locales/sv/messages-compiled.json';
import { messages as uk } from './locales/uk/messages-compiled.json';
import { messages as ar } from './locales/ar/messages.json?lingui';
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it possible to keep the 'messages.compiled.json' (preferably with . instead of -) instead of the ?lingui query? I think that would be safer, avoiding confusion, and might also work better with the installed version of the app.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It doesn't seem possible, in the source code it searches for .po or ?lingui. And there isn't a way to change that.
https://github.com/lingui/js-lingui/blob/0f6661799acfb62c4d169cacc8f6867278263f0e/packages/vite-plugin/src/index.ts#L11

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😆 🤣 🙄

import { messages as cs } from './locales/cs/messages.json?lingui';
import { messages as da } from './locales/da/messages.json?lingui';
import { messages as el } from './locales/el/messages.json?lingui';
import { messages as fi } from './locales/fi/messages.json?lingui';
import { messages as nl } from './locales/nl/messages.json?lingui';
import { messages as no } from './locales/no/messages.json?lingui';
import { messages as ro } from './locales/ro/messages.json?lingui';
import { messages as ru } from './locales/ru/messages.json?lingui';
import { messages as sv } from './locales/sv/messages.json?lingui';
import { messages as uk } from './locales/uk/messages.json?lingui';

/** Map of lang code to messages.
* Lang codes: <https://www.wikiwand.com/en/List_of_ISO_639_language_codes> */
Expand Down
5 changes: 2 additions & 3 deletions app/lingui.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@
import { jstsExtractor, svelteExtractor } from 'svelte-i18n-lingui/extractor';
import {formatter} from "@lingui/format-json";
import { locales, sourceLocale } from './l10n/list';
import { resolve } from 'path';

export default {
locales: locales,
sourceLocale: sourceLocale,
catalogs: [
{
path: 'l10n/locales/{locale}/messages',
path: resolve(__dirname, 'l10n/locales/{locale}/messages'),
include: [
"frontend/",
"logic/",
]
}
],
format: formatter({style: 'minimal'}),
catalogsMergePath: 'l10n/locales/{locale}/messages-compiled',
compileNamespace: 'json',
extractors: [jstsExtractor, svelteExtractor],
};
4 changes: 2 additions & 2 deletions app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"private": true,
"version": "0.5.0",
"scripts": {
"dev": "npm run l10n:compile && vite",
"build": "npm run l10n:compile && vite build",
"dev": "vite",
"build": "vite build",
"preview": "vite preview",
"test": "vitest",
"check": "svelte-check --tsconfig ./tsconfig.json",
Expand Down
9 changes: 7 additions & 2 deletions e2/electron.vite.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { defineConfig, externalizeDepsPlugin } from 'electron-vite'
import { nodePolyfills } from "vite-plugin-node-polyfills";
import { svelte } from '@sveltejs/vite-plugin-svelte'
import { lingui } from '@lingui/vite-plugin';

export default defineConfig({
main: {
Expand All @@ -12,6 +13,10 @@ export default defineConfig({
plugins: [externalizeDepsPlugin()]
},
renderer: {
plugins: [nodePolyfills({include: ['buffer'], globals: {global: false, process: false}}), svelte()]
plugins: [
nodePolyfills({include: ['buffer'], globals: {global: false, process: false}}),
svelte(),
lingui({configPath: "../app/lingui.config.ts"}),
]
}
})
})
1 change: 1 addition & 0 deletions e2/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"@electron-toolkit/eslint-config-prettier": "^1.0.1",
"@electron-toolkit/eslint-config-ts": "^1.0.0",
"@electron-toolkit/tsconfig": "^1.0.1",
"@lingui/vite-plugin": "^4.11.1",
"@sveltejs/vite-plugin-svelte": "^3.0.1",
"@types/node": "^18.17.5",
"electron": "^25.6.0",
Expand Down