lingui major update

commafeed-client/.linguirc

@@ -48,10 +48,5 @@
     "sourceLocale": "en",
     "fallbackLocales": {
         "default": "en"
-    },
-    "extractBabelOptions": {
-        "presets": [
-            "@babel/preset-typescript"
-        ]
     }
 }

commafeed-client/package.json

@@ -19,9 +19,9 @@
   "dependencies": {
     "@emotion/react": "^11.10.5",
     "@fontsource/open-sans": "^4.5.14",
-    "@lingui/core": "^3.17.0",
+    "@lingui/core": "^4.0.0",
-    "@lingui/macro": "^3.17.0",
+    "@lingui/macro": "^4.0.0",
-    "@lingui/react": "^3.17.0",
+    "@lingui/react": "^4.0.0",
     "@mantine/core": "^5.10.3",
     "@mantine/form": "^5.10.3",
     "@mantine/hooks": "^5.10.3",
@@ -34,7 +34,6 @@
     "dayjs": "^1.11.7",
     "interweave": "^13.0.0",
     "lodash": "^4.17.21",
-    "make-plural": "^7.2.0",
     "mousetrap": "^1.6.5",
     "react": "^18.2.0",
     "react-async-hook": "^4.0.0",
@@ -52,7 +51,8 @@
     "websocket-heartbeat-js": "^1.1.1"
   },
   "devDependencies": {
-    "@lingui/cli": "^3.17.0",
+    "@lingui/cli": "^4.0.0",
+    "@lingui/vite-plugin": "^4.0.0",
     "@types/eslint": "^8.21.0",
     "@types/lodash": "^4.14.191",
     "@types/mousetrap": "^1.6.11",
@@ -64,6 +64,7 @@
     "@typescript-eslint/eslint-plugin": "^5.50.0",
     "@typescript-eslint/parser": "^5.50.0",
     "@vitejs/plugin-react": "^3.1.0",
+    "babel-plugin-macros": "^3.1.0",
     "eslint": "^8.33.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-config-airbnb-typescript": "^17.0.0",

commafeed-client/src/i18n.ts

@@ -29,37 +29,7 @@ import "dayjs/locale/sk"
 import "dayjs/locale/sv"
 import "dayjs/locale/tr"
 import "dayjs/locale/zh"
-import {
+
-    ar,
-    ca,
-    cs,
-    cy,
-    da,
-    de,
-    en,
-    es,
-    fa,
-    fi,
-    fr,
-    gl,
-    hu,
-    id,
-    it,
-    ja,
-    ko,
-    ms,
-    nb,
-    nl,
-    nn,
-    pl,
-    PluralCategory,
-    pt,
-    ru,
-    sk,
-    sv,
-    tr,
-    zh,
-} from "make-plural"
 import { useEffect } from "react"
 import { messages as arMessages } from "./locales/ar/messages"
 import { messages as caMessages } from "./locales/ca/messages"
@@ -94,48 +64,42 @@ interface Locale {
     key: string
     label: string
     messages: Messages
-    plurals?: (n: number | string, ord?: boolean) => PluralCategory
 }
 
 // add an object to the array to add a new locale
 // don't forget to also add it to the 'locales' array in .linguirc
 export const locales: Locale[] = [
-    { key: "ar", messages: arMessages, plurals: ar, label: "العربية" },
+    { key: "ar", messages: arMessages, label: "العربية" },
-    { key: "ca", messages: caMessages, plurals: ca, label: "Català" },
+    { key: "ca", messages: caMessages, label: "Català" },
-    { key: "cs", messages: csMessages, plurals: cs, label: "Čeština" },
+    { key: "cs", messages: csMessages, label: "Čeština" },
-    { key: "cy", messages: cyMessages, plurals: cy, label: "Cymraeg" },
+    { key: "cy", messages: cyMessages, label: "Cymraeg" },
-    { key: "da", messages: daMessages, plurals: da, label: "Danish" },
+    { key: "da", messages: daMessages, label: "Danish" },
-    { key: "de", messages: deMessages, plurals: de, label: "Deutsch" },
+    { key: "de", messages: deMessages, label: "Deutsch" },
-    { key: "en", messages: enMessages, plurals: en, label: "English" },
+    { key: "en", messages: enMessages, label: "English" },
-    { key: "es", messages: esMessages, plurals: es, label: "Español" },
+    { key: "es", messages: esMessages, label: "Español" },
-    { key: "fa", messages: faMessages, plurals: fa, label: "فارسی" },
+    { key: "fa", messages: faMessages, label: "فارسی" },
-    { key: "fi", messages: fiMessages, plurals: fi, label: "Suomi" },
+    { key: "fi", messages: fiMessages, label: "Suomi" },
-    { key: "fr", messages: frMessages, plurals: fr, label: "Français" },
+    { key: "fr", messages: frMessages, label: "Français" },
-    { key: "gl", messages: glMessages, plurals: gl, label: "Galician" },
+    { key: "gl", messages: glMessages, label: "Galician" },
-    { key: "hu", messages: huMessages, plurals: hu, label: "Magyar" },
+    { key: "hu", messages: huMessages, label: "Magyar" },
-    { key: "id", messages: idMessages, plurals: id, label: "Indonesian" },
+    { key: "id", messages: idMessages, label: "Indonesian" },
-    { key: "it", messages: itMessages, plurals: it, label: "Italiano" },
+    { key: "it", messages: itMessages, label: "Italiano" },
-    { key: "ja", messages: jaMessages, plurals: ja, label: "日本語" },
+    { key: "ja", messages: jaMessages, label: "日本語" },
-    { key: "ko", messages: koMessages, plurals: ko, label: "한국어" },
+    { key: "ko", messages: koMessages, label: "한국어" },
-    { key: "ms", messages: msMessages, plurals: ms, label: "Bahasa Malaysian" },
+    { key: "ms", messages: msMessages, label: "Bahasa Malaysian" },
-    { key: "nb", messages: nbMessages, plurals: nb, label: "Norsk (bokmål)" },
+    { key: "nb", messages: nbMessages, label: "Norsk (bokmål)" },
-    { key: "nl", messages: nlMessages, plurals: nl, label: "Nederlands" },
+    { key: "nl", messages: nlMessages, label: "Nederlands" },
-    { key: "nn", messages: nnMessages, plurals: nn, label: "Norsk (nynorsk)" },
+    { key: "nn", messages: nnMessages, label: "Norsk (nynorsk)" },
-    { key: "pl", messages: plMessages, plurals: pl, label: "Polski" },
+    { key: "pl", messages: plMessages, label: "Polski" },
-    { key: "pt", messages: ptMessages, plurals: pt, label: "Português" },
+    { key: "pt", messages: ptMessages, label: "Português" },
-    { key: "ru", messages: ruMessages, plurals: ru, label: "Русский" },
+    { key: "ru", messages: ruMessages, label: "Русский" },
-    { key: "sk", messages: skMessages, plurals: sk, label: "Slovenčina" },
+    { key: "sk", messages: skMessages, label: "Slovenčina" },
-    { key: "sv", messages: svMessages, plurals: sv, label: "Svenska" },
+    { key: "sv", messages: svMessages, label: "Svenska" },
-    { key: "tr", messages: trMessages, plurals: tr, label: "Türkçe" },
+    { key: "tr", messages: trMessages, label: "Türkçe" },
-    { key: "zh", messages: zhMessages, plurals: zh, label: "简体中文" },
+    { key: "zh", messages: zhMessages, label: "简体中文" },
 ]
 
 locales.forEach(l => {
-    i18n.loadLocaleData({
-        [l.key]: {
-            plurals: l.plurals,
-        },
-    })
     i18n.load({
         [l.key]: l.messages,
     })