From 7a926c4b223c8be46a1defab4a86104d617eaaf9 Mon Sep 17 00:00:00 2001 From: Kristóf Marussy Date: Sun, 3 Apr 2022 18:56:00 +0200 Subject: refactor: Use i18next for language resolution MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Due to https://github.com/i18next/i18next/issues/1564 we still have to implement our own language resolution, but we can rely on resolvedLanguage to determine which language to pass through to the renderer. We will use the language detected by chromium as the system locale, so there is no need to use os-locale for detection any more. We use i18next in the main process do resolve the language, then set the resolve (not requested!) language in the renderer process to avoid doing resolution twice. This avoids the need in the renderer process to know the list of supported languages. We set the language and the writing direction in HTML in the renderer. Signed-off-by: Kristóf Marussy --- yarn.lock | 26 -------------------------- 1 file changed, 26 deletions(-) (limited to 'yarn.lock') diff --git a/yarn.lock b/yarn.lock index 768f3c0..5a844c8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1297,7 +1297,6 @@ __metadata: mobx-state-tree: ^5.1.3 ms: ^2.1.3 nanoid: ^3.3.2 - os-locale: ^6.0.2 os-name: ^5.0.1 slug: ^5.3.0 source-map-support: ^0.5.21 @@ -5220,13 +5219,6 @@ __metadata: languageName: node linkType: hard -"invert-kv@npm:^3.0.0": - version: 3.0.1 - resolution: "invert-kv@npm:3.0.1" - checksum: 782c44c97f8b693006f5ba0995301754bf68d2160ec98fc34d96b266e2c28cc0c91d86c341ca058fe993bc3dd91f104f776a40f04b6c75254a9a1a0d716ac814 - languageName: node - linkType: hard - "ip@npm:^1.1.5": version: 1.1.5 resolution: "ip@npm:1.1.5" @@ -6429,15 +6421,6 @@ __metadata: languageName: node linkType: hard -"lcid@npm:^3.1.1": - version: 3.1.1 - resolution: "lcid@npm:3.1.1" - dependencies: - invert-kv: ^3.0.0 - checksum: 7ebab7a2696a3cc6c6c9f25d957ef81dd2a8a2f48b7e2a9185e4bbcfc36d70cb633acf5fa5c9508f3d30badf23a303b1b6afe0bba8f0bb7d353d0f5d59c9ec1b - languageName: node - linkType: hard - "leven@npm:^3.1.0": version: 3.1.0 resolution: "leven@npm:3.1.0" @@ -7164,15 +7147,6 @@ __metadata: languageName: node linkType: hard -"os-locale@npm:^6.0.2": - version: 6.0.2 - resolution: "os-locale@npm:6.0.2" - dependencies: - lcid: ^3.1.1 - checksum: 812d73334c8773b971bf7fd257b84d2ce7b85d5d2184370f2875fe0e51451f530d6f7c272de1faa0b9ff02d0d10dafd665b6425ed85489271705ab5738691a43 - languageName: node - linkType: hard - "os-name@npm:^5.0.1": version: 5.0.1 resolution: "os-name@npm:5.0.1" -- cgit v1.2.3-54-g00ecf