intl-messageformat 8.3.12 → 8.3.16
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +35 -0
- package/dist/formatters.d.ts.map +1 -1
- package/dist/formatters.js +1 -1
- package/dist/formatters.js.map +1 -1
- package/dist/umd/intl-messageformat.js +1 -1
- package/dist/umd/intl-messageformat.js.map +1 -1
- package/dist/umd/intl-messageformat.min.js +1 -1
- package/dist/umd/intl-messageformat.min.js.map +1 -1
- package/lib/formatters.d.ts.map +1 -1
- package/lib/formatters.js +1 -1
- package/lib/formatters.js.map +1 -1
- package/package.json +10 -10
- package/src/formatters.ts +2 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,41 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [8.3.16](https://github.com/formatjs/formatjs/compare/intl-messageformat@8.3.15...intl-messageformat@8.3.16) (2020-05-25)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package intl-messageformat
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
## [8.3.15](https://github.com/formatjs/formatjs/compare/intl-messageformat@8.3.14...intl-messageformat@8.3.15) (2020-05-23)
|
|
15
|
+
|
|
16
|
+
**Note:** Version bump only for package intl-messageformat
|
|
17
|
+
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
## [8.3.14](https://github.com/formatjs/formatjs/compare/intl-messageformat@8.3.13...intl-messageformat@8.3.14) (2020-05-23)
|
|
23
|
+
|
|
24
|
+
**Note:** Version bump only for package intl-messageformat
|
|
25
|
+
|
|
26
|
+
|
|
27
|
+
|
|
28
|
+
|
|
29
|
+
|
|
30
|
+
## [8.3.13](https://github.com/formatjs/formatjs/compare/intl-messageformat@8.3.12...intl-messageformat@8.3.13) (2020-05-21)
|
|
31
|
+
|
|
32
|
+
|
|
33
|
+
### Bug Fixes
|
|
34
|
+
|
|
35
|
+
* **intl-messageformat:** fix rendering tag inside plural, fix [#1680](https://github.com/formatjs/formatjs/issues/1680) ([dd4f6c6](https://github.com/formatjs/formatjs/commit/dd4f6c626055688b8b596b164f0836e9ea65fb1e))
|
|
36
|
+
|
|
37
|
+
|
|
38
|
+
|
|
39
|
+
|
|
40
|
+
|
|
6
41
|
## [8.3.12](https://github.com/formatjs/formatjs/compare/intl-messageformat@8.3.11...intl-messageformat@8.3.12) (2020-05-21)
|
|
7
42
|
|
|
8
43
|
**Note:** Version bump only for package intl-messageformat
|
package/dist/formatters.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"formatters.d.ts","sourceRoot":"","sources":["../src/formatters.ts"],"names":[],"mappings":"AAAA,OAAO,EAYL,oBAAoB,EAGrB,MAAM,2BAA2B,CAAC;AASnC,MAAM,WAAW,OAAO;IACtB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC;IACjD,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAC;IACjD,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAC;CAClD;AAED,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IAC1C,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;IAC9C,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;CAC/C;AAED,MAAM,WAAW,UAAU;IACzB,eAAe,CACb,GAAG,IAAI,EAAE,qBAAqB,CAAC,OAAO,IAAI,CAAC,YAAY,CAAC,GACvD,IAAI,CAAC,YAAY,CAAC;IACrB,iBAAiB,CACf,GAAG,IAAI,EAAE,qBAAqB,CAAC,OAAO,IAAI,CAAC,cAAc,CAAC,GACzD,IAAI,CAAC,cAAc,CAAC;IACvB,cAAc,CACZ,GAAG,IAAI,EAAE,qBAAqB,CAAC,OAAO,IAAI,CAAC,WAAW,CAAC,GACtD,IAAI,CAAC,WAAW,CAAC;CACrB;AAED,0BAAkB,SAAS;IACzB,OAAO,IAAA;IACP,MAAM,IAAA;CACP;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,SAAS,CAAC,OAAO,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,UAAU,CAAC,CAAC,GAAG,GAAG;IACjC,IAAI,EAAE,SAAS,CAAC,MAAM,CAAC;IACvB,KAAK,EAAE,CAAC,CAAC;CACV;AAED,oBAAY,iBAAiB,CAAC,CAAC,IAAI,WAAW,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;AAE/D,oBAAY,aAAa,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,GAAG,IAAI,CAAC;AA8BhF,wBAAgB,aAAa,CAAC,CAAC,EAC7B,GAAG,EAAE,oBAAoB,EAAE,EAC3B,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,EAC1B,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,GAAG,CAAC,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC,EAClE,kBAAkB,CAAC,EAAE,MAAM,EAE3B,eAAe,CAAC,EAAE,MAAM,GACvB,iBAAiB,CAAC,CAAC,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"formatters.d.ts","sourceRoot":"","sources":["../src/formatters.ts"],"names":[],"mappings":"AAAA,OAAO,EAYL,oBAAoB,EAGrB,MAAM,2BAA2B,CAAC;AASnC,MAAM,WAAW,OAAO;IACtB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC;IACjD,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAC;IACjD,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAC;CAClD;AAED,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IAC1C,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;IAC9C,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;CAC/C;AAED,MAAM,WAAW,UAAU;IACzB,eAAe,CACb,GAAG,IAAI,EAAE,qBAAqB,CAAC,OAAO,IAAI,CAAC,YAAY,CAAC,GACvD,IAAI,CAAC,YAAY,CAAC;IACrB,iBAAiB,CACf,GAAG,IAAI,EAAE,qBAAqB,CAAC,OAAO,IAAI,CAAC,cAAc,CAAC,GACzD,IAAI,CAAC,cAAc,CAAC;IACvB,cAAc,CACZ,GAAG,IAAI,EAAE,qBAAqB,CAAC,OAAO,IAAI,CAAC,WAAW,CAAC,GACtD,IAAI,CAAC,WAAW,CAAC;CACrB;AAED,0BAAkB,SAAS;IACzB,OAAO,IAAA;IACP,MAAM,IAAA;CACP;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,SAAS,CAAC,OAAO,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,UAAU,CAAC,CAAC,GAAG,GAAG;IACjC,IAAI,EAAE,SAAS,CAAC,MAAM,CAAC;IACvB,KAAK,EAAE,CAAC,CAAC;CACV;AAED,oBAAY,iBAAiB,CAAC,CAAC,IAAI,WAAW,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;AAE/D,oBAAY,aAAa,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,GAAG,IAAI,CAAC;AA8BhF,wBAAgB,aAAa,CAAC,CAAC,EAC7B,GAAG,EAAE,oBAAoB,EAAE,EAC3B,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,EAC1B,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,GAAG,CAAC,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC,EAClE,kBAAkB,CAAC,EAAE,MAAM,EAE3B,eAAe,CAAC,EAAE,MAAM,GACvB,iBAAiB,CAAC,CAAC,CAAC,EAAE,CA0LxB;AAED,oBAAY,kBAAkB,CAAC,CAAC,EAAE,CAAC,GAAG,MAAM,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,IAAI,CAClE,GAAG,IAAI,EAAE,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,KACvB,CAAC,CAAC"}
|
package/dist/formatters.js
CHANGED
|
@@ -132,7 +132,7 @@ originalMessage) {
|
|
|
132
132
|
if (!isFormatXMLElementFn(formatFn)) {
|
|
133
133
|
throw new error_1.InvalidValueTypeError(value_1, 'function', originalMessage);
|
|
134
134
|
}
|
|
135
|
-
var parts = formatToParts(children, locales, formatters, formats, values);
|
|
135
|
+
var parts = formatToParts(children, locales, formatters, formats, values, currentPluralValue);
|
|
136
136
|
var chunks = formatFn.apply(void 0, parts.map(function (p) { return p.value; }));
|
|
137
137
|
if (!Array.isArray(chunks)) {
|
|
138
138
|
chunks = [chunks];
|
package/dist/formatters.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"formatters.js","sourceRoot":"","sources":["../src/formatters.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"formatters.js","sourceRoot":"","sources":["../src/formatters.ts"],"names":[],"mappings":"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"}
|
|
@@ -3688,7 +3688,7 @@
|
|
|
3688
3688
|
if (!isFormatXMLElementFn(formatFn)) {
|
|
3689
3689
|
throw new InvalidValueTypeError(value_1, 'function', originalMessage);
|
|
3690
3690
|
}
|
|
3691
|
-
var parts = formatToParts(children, locales, formatters, formats, values);
|
|
3691
|
+
var parts = formatToParts(children, locales, formatters, formats, values, currentPluralValue);
|
|
3692
3692
|
var chunks = formatFn.apply(void 0, parts.map(function (p) { return p.value; }));
|
|
3693
3693
|
if (!Array.isArray(chunks)) {
|
|
3694
3694
|
chunks = [chunks];
|