lingui · May 14, 2024 · May 14, 2024 · May 16, 2024 · May 16, 2024 · May 17, 2024
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.11.0](https://github.com/lingui/js-lingui/compare/v4.10.1...v4.11.0) (2024-05-17)
+
+### Bug Fixes
+
+- default message extraction ([#1936](https://github.com/lingui/js-lingui/issues/1936)) ([8f1ddd7](https://github.com/lingui/js-lingui/commit/8f1ddd787b79510b112b87c21d4a23b875722edc))
+- exclude .scss files from extract-experimental build ([#1935](https://github.com/lingui/js-lingui/issues/1935)) ([d01fa96](https://github.com/lingui/js-lingui/commit/d01fa969622605e40f417a85b98bce1f88771445))
+- **message-utils:** correctly handle multi-digit complex argument cases ([#1937](https://github.com/lingui/js-lingui/issues/1937)) ([47a0dde](https://github.com/lingui/js-lingui/commit/47a0dded190fa990ea21239a464073348209b8f0))
+
+### Features
+
+- **format-po:** configure header attributes in PO file formatter ([#1934](https://github.com/lingui/js-lingui/issues/1934)) ([d90f778](https://github.com/lingui/js-lingui/commit/d90f77813381e8a74dc9e16662a3ce384c683493))
+
 ## [4.10.1](https://github.com/lingui/js-lingui/compare/v4.10.0...v4.10.1) (2024-05-03)
 
 ### Bug Fixes

diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "4.10.1",
+  "version": "4.11.0",
   "packages": ["packages/*"],
   "npmClient": "yarn",
   "useWorkspaces": true,

diff --git a/packages/babel-plugin-extract-messages/CHANGELOG.md b/packages/babel-plugin-extract-messages/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.11.0](https://github.com/lingui/js-lingui/compare/v4.10.1...v4.11.0) (2024-05-17)
+
+**Note:** Version bump only for package @lingui/babel-plugin-extract-messages
+
 ## [4.10.1](https://github.com/lingui/js-lingui/compare/v4.10.0...v4.10.1) (2024-05-03)
 
 **Note:** Version bump only for package @lingui/babel-plugin-extract-messages

diff --git a/packages/babel-plugin-extract-messages/package.json b/packages/babel-plugin-extract-messages/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@lingui/babel-plugin-extract-messages",
-  "version": "4.10.1",
+  "version": "4.11.0",
   "description": "Babel plugin for collecting messages from source code for internationalization",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",

diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
@@ -3,6 +3,13 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.11.0](https://github.com/lingui/js-lingui/compare/v4.10.1...v4.11.0) (2024-05-17)
+
+### Bug Fixes
+
+- default message extraction ([#1936](https://github.com/lingui/js-lingui/issues/1936)) ([8f1ddd7](https://github.com/lingui/js-lingui/commit/8f1ddd787b79510b112b87c21d4a23b875722edc))
+- exclude .scss files from extract-experimental build ([#1935](https://github.com/lingui/js-lingui/issues/1935)) ([d01fa96](https://github.com/lingui/js-lingui/commit/d01fa969622605e40f417a85b98bce1f88771445))
+
 ## [4.10.1](https://github.com/lingui/js-lingui/compare/v4.10.0...v4.10.1) (2024-05-03)
 
 **Note:** Version bump only for package @lingui/cli

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@lingui/cli",
-  "version": "4.10.1",
+  "version": "4.11.0",
   "description": "CLI for working wit message catalogs",
   "keywords": [
     "cli",
@@ -53,11 +53,11 @@
     "@babel/parser": "^7.21.2",
     "@babel/runtime": "^7.21.0",
     "@babel/types": "^7.21.2",
-    "@lingui/babel-plugin-extract-messages": "4.10.1",
-    "@lingui/conf": "4.10.1",
-    "@lingui/core": "4.10.1",
-    "@lingui/format-po": "4.10.1",
-    "@lingui/message-utils": "4.10.1",
+    "@lingui/babel-plugin-extract-messages": "4.11.0",
+    "@lingui/conf": "4.11.0",
+    "@lingui/core": "4.11.0",
+    "@lingui/format-po": "4.11.0",
+    "@lingui/message-utils": "4.11.0",
     "babel-plugin-macros": "^3.0.1",
     "chalk": "^4.1.0",
     "chokidar": "3.5.1",
@@ -80,7 +80,7 @@
   },
   "devDependencies": {
     "@lingui/jest-mocks": "*",
-    "@lingui/macro": "4.10.1",
+    "@lingui/macro": "4.11.0",
     "@types/convert-source-map": "^2.0.0",
     "@types/glob": "^8.1.0",
     "@types/micromatch": "^4.0.1",

diff --git a/packages/cli/src/api/catalog/extractFromFiles.ts b/packages/cli/src/api/catalog/extractFromFiles.ts
@@ -3,11 +3,11 @@ import type {
   ExtractorType,
   LinguiConfigNormalized,
 } from "@lingui/conf"
-import extract from "../extractors"
-import path from "path"
 import chalk from "chalk"
+import path from "path"
+import extract from "../extractors"
+import { ExtractedCatalogType, MessageOrigin } from "../types"
 import { prettyOrigin } from "../utils"
-import { MessageOrigin, ExtractedCatalogType } from "../types"
 
 export async function extractFromFiles(
   paths: string[],
@@ -50,6 +50,7 @@ export async function extractFromFiles(
 
         messages[next.id] = {
           ...prev,
+          message: prev.message ?? next.message,
           comments: next.comment
             ? [...prev.comments, next.comment]
             : prev.comments,

diff --git a/packages/cli/src/extract-experimental/bundleSource.ts b/packages/cli/src/extract-experimental/bundleSource.ts
@@ -32,6 +32,7 @@ export async function bundleSource(
     "png",
     "css",
     "sass",
+    "scss",
     "less",
     "jpg",
   ]

diff --git a/packages/cli/test/extract-po-format/expected/en.po b/packages/cli/test/extract-po-format/expected/en.po
@@ -7,6 +7,12 @@ msgstr ""
 "X-Generator: @lingui/cli\n"
 "Language: en\n"
 
+#. js-lingui-explicit-id
+#: fixtures/file-a.ts:22
+#: fixtures/file-a.ts:23
+msgid "addToCart"
+msgstr "Add To Cart"
+
 #. this is a comment
 #: fixtures/file-b.tsx:6
 msgid "Hello this is JSX Translation"

diff --git a/packages/cli/test/extract-po-format/expected/pl.po b/packages/cli/test/extract-po-format/expected/pl.po
@@ -7,6 +7,12 @@ msgstr ""
 "X-Generator: @lingui/cli\n"
 "Language: pl\n"
 
+#. js-lingui-explicit-id
+#: fixtures/file-a.ts:22
+#: fixtures/file-a.ts:23
+msgid "addToCart"
+msgstr ""
+
 #. this is a comment
 #: fixtures/file-b.tsx:6
 msgid "Hello this is JSX Translation"

diff --git a/packages/cli/test/extract-po-format/fixtures/file-a.ts b/packages/cli/test/extract-po-format/fixtures/file-a.ts
@@ -1,5 +1,5 @@
-import { defineMessage, t } from "@lingui/macro"
 import { i18n } from "@lingui/core"
+import { defineMessage, t } from "@lingui/macro"
 
 const msg = t`Hello world`
 
@@ -18,3 +18,6 @@ const msgDescriptor = defineMessage({
 })
 
 i18n._(msgDescriptor)
+
+i18n._("addToCart")
+i18n._({id: "addToCart", message: "Add To Cart"})
diff --git a/packages/cli/test/index.test.ts b/packages/cli/test/index.test.ts
@@ -69,8 +69,8 @@ describe("E2E Extractor Test", () => {
         ┌─────────────┬─────────────┬─────────┐
         │ Language    │ Total count │ Missing │
         ├─────────────┼─────────────┼─────────┤
-        │ en (source) │      7      │    -    │
-        │ pl          │      7      │    7    │
+        │ en (source) │      8      │    -    │
+        │ pl          │      8      │    8    │
         └─────────────┴─────────────┴─────────┘
 
         (use "yarn extract" to update catalogs with new messages)

diff --git a/packages/conf/CHANGELOG.md b/packages/conf/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.11.0](https://github.com/lingui/js-lingui/compare/v4.10.1...v4.11.0) (2024-05-17)
+
+**Note:** Version bump only for package @lingui/conf
+
 ## [4.10.1](https://github.com/lingui/js-lingui/compare/v4.10.0...v4.10.1) (2024-05-03)
 
 **Note:** Version bump only for package @lingui/conf

diff --git a/packages/conf/package.json b/packages/conf/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@lingui/conf",
-  "version": "4.10.1",
+  "version": "4.11.0",
   "sideEffects": false,
   "description": "Get lingui configuration from package.json",
   "keywords": [

diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.11.0](https://github.com/lingui/js-lingui/compare/v4.10.1...v4.11.0) (2024-05-17)
+
+### Bug Fixes
+
+- **message-utils:** correctly handle multi-digit complex argument cases ([#1937](https://github.com/lingui/js-lingui/issues/1937)) ([47a0dde](https://github.com/lingui/js-lingui/commit/47a0dded190fa990ea21239a464073348209b8f0))
+
 ## [4.10.1](https://github.com/lingui/js-lingui/compare/v4.10.0...v4.10.1) (2024-05-03)
 
 ### Bug Fixes

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@lingui/core",
-  "version": "4.10.1",
+  "version": "4.11.0",
   "sideEffects": false,
   "description": "I18n tools for javascript",
   "main": "./dist/index.cjs",
@@ -54,7 +54,7 @@
   ],
   "dependencies": {
     "@babel/runtime": "^7.20.13",
-    "@lingui/message-utils": "4.10.1",
+    "@lingui/message-utils": "4.11.0",
     "unraw": "^3.0.0"
   },
   "devDependencies": {

diff --git a/packages/core/src/interpolate.test.ts b/packages/core/src/interpolate.test.ts
@@ -39,10 +39,12 @@ describe("interpolate", () => {
 
   it("should interpolate plurals", () => {
     const plural = prepare(
-      "{value, plural, one {{value} Book} other {# Books}}"
+      "{value, plural, one {{value} Book} =4 {Four books} =99 { Books with problems } other {# Books}}"
     )
     expect(plural({ value: 1 })).toEqual("1 Book")
     expect(plural({ value: 2 })).toEqual("2 Books")
+    expect(plural({ value: 4 })).toEqual("Four books")
+    expect(plural({ value: 99 })).toEqual("Books with problems")
 
     const offset = prepare(
       "{value, plural, offset:1 =0 {No Books} one {# Book} other {# Books}}"

diff --git a/packages/detect-locale/CHANGELOG.md b/packages/detect-locale/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.11.0](https://github.com/lingui/js-lingui/compare/v4.10.1...v4.11.0) (2024-05-17)
+
+**Note:** Version bump only for package @lingui/detect-locale
+
 ## [4.10.1](https://github.com/lingui/js-lingui/compare/v4.10.0...v4.10.1) (2024-05-03)
 
 **Note:** Version bump only for package @lingui/detect-locale

diff --git a/packages/detect-locale/package.json b/packages/detect-locale/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@lingui/detect-locale",
-  "version": "4.10.1",
+  "version": "4.11.0",
   "sideEffects": false,
   "description": "@Lingui package to help you find the correct browser/server locale",
   "main": "./dist/index.cjs",

diff --git a/packages/extractor-vue/CHANGELOG.md b/packages/extractor-vue/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.11.0](https://github.com/lingui/js-lingui/compare/v4.10.1...v4.11.0) (2024-05-17)
+
+**Note:** Version bump only for package @lingui/extractor-vue
+
 ## [4.10.1](https://github.com/lingui/js-lingui/compare/v4.10.0...v4.10.1) (2024-05-03)
 
 **Note:** Version bump only for package @lingui/extractor-vue

diff --git a/packages/extractor-vue/package.json b/packages/extractor-vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@lingui/extractor-vue",
-  "version": "4.10.1",
+  "version": "4.11.0",
   "description": "Custom Vue.js extractor to be used with the CLI tool",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
@@ -38,12 +38,12 @@
     "/dist"
   ],
   "dependencies": {
-    "@lingui/cli": "4.10.1",
-    "@lingui/conf": "4.10.1",
+    "@lingui/cli": "4.11.0",
+    "@lingui/conf": "4.11.0",
     "@vue/compiler-sfc": "^3.2.47"
   },
   "devDependencies": {
-    "@lingui/babel-plugin-extract-messages": "4.10.1",
+    "@lingui/babel-plugin-extract-messages": "4.11.0",
     "unbuild": "2.0.0"
   }
 }
diff --git a/packages/format-csv/CHANGELOG.md b/packages/format-csv/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.11.0](https://github.com/lingui/js-lingui/compare/v4.10.1...v4.11.0) (2024-05-17)
+
+**Note:** Version bump only for package @lingui/format-csv
+
 ## [4.10.1](https://github.com/lingui/js-lingui/compare/v4.10.0...v4.10.1) (2024-05-03)
 
 **Note:** Version bump only for package @lingui/format-csv

diff --git a/packages/format-csv/package.json b/packages/format-csv/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@lingui/format-csv",
-  "version": "4.10.1",
+  "version": "4.11.0",
   "description": "CSV format for Lingui Catalogs",
   "main": "./dist/csv.cjs",
   "module": "./dist/csv.mjs",
@@ -39,7 +39,7 @@
     "dist/"
   ],
   "dependencies": {
-    "@lingui/conf": "4.10.1",
+    "@lingui/conf": "4.11.0",
     "papaparse": "^5.4.0"
   },
   "devDependencies": {

diff --git a/packages/format-json/CHANGELOG.md b/packages/format-json/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.11.0](https://github.com/lingui/js-lingui/compare/v4.10.1...v4.11.0) (2024-05-17)
+
+**Note:** Version bump only for package @lingui/format-json
+
 ## [4.10.1](https://github.com/lingui/js-lingui/compare/v4.10.0...v4.10.1) (2024-05-03)
 
 **Note:** Version bump only for package @lingui/format-json

diff --git a/packages/format-json/package.json b/packages/format-json/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@lingui/format-json",
-  "version": "4.10.1",
+  "version": "4.11.0",
   "description": "JSON format for Lingui Catalogs",
   "main": "./dist/json.cjs",
   "module": "./dist/json.mjs",
@@ -39,7 +39,7 @@
     "dist/"
   ],
   "dependencies": {
-    "@lingui/conf": "4.10.1",
+    "@lingui/conf": "4.11.0",
     "ramda": "^0.28.0"
   },
   "devDependencies": {

diff --git a/packages/format-po-gettext/CHANGELOG.md b/packages/format-po-gettext/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.11.0](https://github.com/lingui/js-lingui/compare/v4.10.1...v4.11.0) (2024-05-17)
+
+**Note:** Version bump only for package @lingui/format-po-gettext
+
 ## [4.10.1](https://github.com/lingui/js-lingui/compare/v4.10.0...v4.10.1) (2024-05-03)
 
 **Note:** Version bump only for package @lingui/format-po-gettext

diff --git a/packages/format-po-gettext/package.json b/packages/format-po-gettext/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@lingui/format-po-gettext",
-  "version": "4.10.1",
+  "version": "4.11.0",
   "description": "Gettext PO format with gettext-style plurals for Lingui Catalogs",
   "main": "./dist/po-gettext.cjs",
   "module": "./dist/po-gettext.mjs",
@@ -41,9 +41,9 @@
     "dist/"
   ],
   "dependencies": {
-    "@lingui/conf": "4.10.1",
-    "@lingui/format-po": "4.10.1",
-    "@lingui/message-utils": "4.10.1",
+    "@lingui/conf": "4.11.0",
+    "@lingui/format-po": "4.11.0",
+    "@lingui/message-utils": "4.11.0",
     "@messageformat/parser": "^5.0.0",
     "node-gettext": "^3.0.0",
     "plurals-cldr": "^2.0.1",

diff --git a/packages/format-po/CHANGELOG.md b/packages/format-po/CHANGELOG.md
@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.11.0](https://github.com/lingui/js-lingui/compare/v4.10.1...v4.11.0) (2024-05-17)
+
+### Features
+
+- **format-po:** configure header attributes in PO file formatter ([#1934](https://github.com/lingui/js-lingui/issues/1934)) ([d90f778](https://github.com/lingui/js-lingui/commit/d90f77813381e8a74dc9e16662a3ce384c683493))
+
 ## [4.10.1](https://github.com/lingui/js-lingui/compare/v4.10.0...v4.10.1) (2024-05-03)
 
 **Note:** Version bump only for package @lingui/format-po
-Original file line number
+Diff line change
@@ @@ -32,6 +32,7 @@ export async function bundleSource( @@
         "png",
         "css",
         "sass",
+        "scss",
         "less",
         "jpg",
       ]