chore: sync next to main

.github/workflows/main-suite.yml

@@ -15,7 +15,7 @@ jobs:
  runs-on: ${{ matrix.os }}
  strategy:
  matrix:
- node: ["16", "18", "19", "20"]
+ node: ["20", "22"]
  os: [ubuntu-latest, windows-latest]
 
  steps:

README.md

@@ -12,13 +12,13 @@
 [![Join the community on Discord][Badge-Discord]][Discord]
 
 [**Documentation**][Documentation] · [**Quickstart**](#quickstart) · [**Example**](#example) · [**Support**](#support) · [**Contribute**](#contribute) · [**License**](#license)
+
 </div>
 
 > Internationalization is the design and development of a product, application or document content that enables easy localization for target audiences that vary in culture, region, or language.
 >
 > --- [ W3C Web Internationalization FAQ](https://www.w3.org/International/questions/qa-i18n)
 
-
 Lingui is an easy yet powerful internationalization framework for global projects.
 
 - **Clean and readable** - Keep your code clean and readable, while the library uses
@@ -76,14 +76,14 @@ If you're a react-intl user, check out [a comparison of react-intl and Lingui](h
 Short example how i18n looks with JSX:
 
 ```js
-import { Trans } from "@lingui/macro"
+import { Trans } from "@lingui/react/macro"
 
 function App() {
  return (
- <Trans id="msg.docs" /* id is optional */>
- Read the <a href="https://lingui.dev">documentation</a>
- for more info.
- </Trans>
+  <Trans id="msg.docs" /* id is optional */>
+  Read the <a href="https://lingui.dev">documentation</a>
+  for more info.
+  </Trans>
  )
 }
 ```
@@ -131,18 +131,15 @@ The project is licensed under the [MIT][License] license.
 [SetupVite]: https://lingui.dev/tutorials/setup-vite
 [RefCLI]: https://lingui.dev/ref/cli
 [Examples]: https:/lingui/js-lingui/tree/main/examples
-
 [SWCPlugin]: https://lingui.dev/ref/swc-plugin
 [VitePlugin]: https://lingui.dev/ref/vite-plugin
 [ESLintPlugin]: https://lingui.dev/ref/eslint-plugin
-
 [Badge-MainSuite-GithubCI]: https:/lingui/js-lingui/workflows/main-suite/badge.svg
 [Badge-ReleaseWorkflowTesting-GithubCI]: https:/lingui/js-lingui/workflows/release-workflow-test/badge.svg
 [Badge-Coverage]: https://img.shields.io/codecov/c/github/lingui/js-lingui/main.svg
 [Badge-PRWelcome]: https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square
 [Badge-Discord]: https://img.shields.io/discord/974702239358783608.svg?label=Discord&logo=Discord&colorB=7289da&style=flat-square
 [Contributors]: https:/lingui/js-lingui/graphs/contributors
-
 [Coverage]: https://codecov.io/gh/lingui/js-lingui
 [License]: https:/lingui/js-lingui/blob/main/LICENSE
 [Contributing]: https:/lingui/js-lingui/blob/main/CONTRIBUTING.md

examples/create-react-app/package.json

@@ -32,9 +32,8 @@
  ]
  },
  "devDependencies": {
- "@lingui/cli": "^4.1.2",
- "@lingui/loader": "^4.1.2",
- "@lingui/macro": "^4.1.2",
+ "@lingui/cli": "^4.11.2",
+ "@lingui/loader": "^4.11.2",
  "@testing-library/jest-dom": "^5.16.5",
  "@testing-library/react": "^14.0.0",
  "@testing-library/user-event": "^14.4.3",

examples/create-react-app/src/App.test.tsx

@@ -2,15 +2,14 @@ import React from "react"
 import { getByText, render, act } from "@testing-library/react"
 import { i18n } from "@lingui/core"
 import { I18nProvider } from "@lingui/react"
-
 import App from "./App"
 
 i18n.load({
  en: {
- ZXBDaP: "Language switcher example:",
+ "zg/nOF": "Language switcher example: ",
  },
  cs: {
- ZXBDaP: "Příklad přepínače jazyků:",
+ "zg/nOF": "Příklad přepínače jazyků: ",
  },
 })
 

examples/create-react-app/src/App.tsx

@@ -1,6 +1,6 @@
 import "./App.css"
 import React, { useState } from "react"
-import { Trans, Plural } from "@lingui/macro"
+import { Trans, Plural } from "@lingui/react/macro"
 
 import { locales, dynamicActivate } from "./i18n"
 import { useLingui } from "@lingui/react"

examples/create-react-app/src/locales/cs.po

@@ -11,38 +11,38 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
-#: src/App.tsx:31
+#: src/App.tsx:43
 msgid "{count, plural, zero {There are no books} one {There's one book} other {There are # books}}"
 msgstr "{count, plural, zero {Nejsou žádné knihy} one {Je tu jedna kniha} other {Existuje # knih}}"
 
-#: src/App.tsx:37
+#: src/App.tsx:50
 msgid "Date formatter example:"
 msgstr "Příklad formátovače data:"
 
-#: src/App.tsx:28
+#: src/App.tsx:40
 msgid "Decrement"
 msgstr "Úbytek"
 
-#: src/App.tsx:45
+#: src/App.tsx:59
 msgid "I have a balance of {0}"
 msgstr "Mám zůstatek {0}"
 
-#: src/App.tsx:25
+#: src/App.tsx:37
 msgid "Increment"
 msgstr "Přírůstek"
 
-#: src/App.tsx:14
-msgid "Language switcher example:"
-msgstr "Příklad přepínače jazyků:"
+#: src/App.tsx:19
+msgid "Language switcher example: "
+msgstr "Příklad přepínače jazyků: "
 
-#: src/App.tsx:43
+#: src/App.tsx:56
 msgid "Number formatter example:"
 msgstr "Příklad formátovače čísel:"
 
-#: src/App.tsx:22
-msgid "Plurals example:"
-msgstr "Příklad množného čísla:"
+#: src/App.tsx:33
+msgid "Plurals example: "
+msgstr "Příklad množného čísla: "
 
-#: src/App.tsx:39
+#: src/App.tsx:53
 msgid "Today is {0}"
 msgstr "Dnes je {0}"

examples/create-react-app/src/locales/en.po

@@ -13,38 +13,38 @@ msgstr ""
 "Language-Team: \n"
 "Plural-Forms: \n"
 
-#: src/App.tsx:31
+#: src/App.tsx:43
 msgid "{count, plural, zero {There are no books} one {There's one book} other {There are # books}}"
 msgstr "{count, plural, zero {There are no books} one {There's one book} other {There are # books}}"
 
-#: src/App.tsx:37
+#: src/App.tsx:50
 msgid "Date formatter example:"
 msgstr "Date formatter example:"
 
-#: src/App.tsx:28
+#: src/App.tsx:40
 msgid "Decrement"
 msgstr "Decrement"
 
-#: src/App.tsx:45
+#: src/App.tsx:59
 msgid "I have a balance of {0}"
 msgstr "I have a balance of {0}"
 
-#: src/App.tsx:25
+#: src/App.tsx:37
 msgid "Increment"
 msgstr "Increment"
 
-#: src/App.tsx:14
-msgid "Language switcher example:"
-msgstr "Language switcher example:"
+#: src/App.tsx:19
+msgid "Language switcher example: "
+msgstr "Language switcher example: "
 
-#: src/App.tsx:43
+#: src/App.tsx:56
 msgid "Number formatter example:"
 msgstr "Number formatter example:"
 
-#: src/App.tsx:22
-msgid "Plurals example:"
-msgstr "Plurals example:"
+#: src/App.tsx:33
+msgid "Plurals example: "
+msgstr "Plurals example: "
 
-#: src/App.tsx:39
+#: src/App.tsx:53
 msgid "Today is {0}"
 msgstr "Today is {0}"