Skip to content

Commit 213ab35

Browse files
targosjasnell
targos
authored and
jasnell
committed
deps: backport f5e924e from V8's upstream
Original commit message: Fix user options for fractional digits in Intl.NumberFormatter The patch in https://crrev.com/ddb5c2d999c5ee6e31c4a9599bb3ddb293cc3f49 moved all fractional digit settings to default values due to a coding error. These were not even correct default values, and users observed errors where percentages were written as "23.0%" instead of "23%". This patch fixes the setting propagation when appropriate and it changes the default max fractional digits of a percentage to 0, per spec. BUG=chromium:544122 R=mnita,jochen CC=hichris123,adamk LOG=Y Review URL: https://codereview.chromium.org/1420883002 Cr-Commit-Position: refs/heads/master@{#31468} PR-URL: #6275 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 43b2292 commit 213ab35

2 files changed

Lines changed: 54 additions & 5 deletions

File tree

‎deps/v8/src/i18n.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1101,14 +1101,15 @@ function initializeNumberFormat(numberFormat, locales, options) {
11011101

11021102
var mnfd = options['minimumFractionDigits'];
11031103
var mxfd = options['maximumFractionDigits'];
1104-
if (!IS_UNDEFINED(mnfd) || !internalOptions.style === 'currency') {
1104+
if (!IS_UNDEFINED(mnfd) || internalOptions.style !== 'currency') {
11051105
mnfd = getNumberOption(options, 'minimumFractionDigits', 0, 20, 0);
11061106
defineWEProperty(internalOptions, 'minimumFractionDigits', mnfd);
11071107
}
11081108

1109-
if (!IS_UNDEFINED(mxfd) || !internalOptions.style === 'currency') {
1109+
if (!IS_UNDEFINED(mxfd) || internalOptions.style !== 'currency') {
1110+
var min_mxfd = internalOptions.style === 'percent' ? 0 : 3;
11101111
mnfd = IS_UNDEFINED(mnfd) ? 0 : mnfd;
1111-
fallback_limit = (mnfd > 3) ? mnfd : 3;
1112+
fallback_limit = (mnfd > min_mxfd) ? mnfd : min_mxfd;
11121113
mxfd = getNumberOption(options, 'maximumFractionDigits', mnfd, 20, fallback_limit);
11131114
defineWEProperty(internalOptions, 'maximumFractionDigits', mxfd);
11141115
}

‎deps/v8/test/intl/number-format/check-minimum-fraction-digits.js‎

Lines changed: 50 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,56 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
// Make sure minimumFractionDigits is honored
5+
// Make sure minimumFractionDigits and maximumFractionDigits are honored
66

7-
var nf = new Intl.NumberFormat("en-us",{ useGrouping: false, minimumFractionDigits: 4});
7+
var nf = new Intl.NumberFormat("en-us", { useGrouping: false, minimumFractionDigits: 4, maximumFractionDigits: 8});
88

99
assertEquals("12345.6789", nf.format(12345.6789));
10+
assertEquals("12345.678912", nf.format(12345.678912));
11+
assertEquals("12345.6700", nf.format(12345.67));
12+
assertEquals("12345.67891234", nf.format(12345.6789123421));
13+
14+
nf = new Intl.NumberFormat("en-us", { useGrouping: false, minimumFractionDigits: 4, maximumFractionDigits: 8, style: 'percent'});
15+
16+
assertEquals("12345.6789%", nf.format(123.456789));
17+
assertEquals("12345.678912%", nf.format(123.45678912));
18+
assertEquals("12345.6700%", nf.format(123.4567));
19+
assertEquals("12345.67891234%", nf.format(123.456789123421));
20+
21+
nf = new Intl.NumberFormat('en', {minimumFractionDigits: 4, maximumFractionDigits: 8, style: 'currency', currency: 'USD'});
22+
23+
assertEquals("$54,306.404797", nf.format(54306.4047970));
24+
assertEquals("$54,306.4000", nf.format(54306.4));
25+
assertEquals("$54,306.40000001", nf.format(54306.400000011));
26+
27+
// Ensure that appropriate defaults exist when minimum and maximum are not specified
28+
29+
nf = new Intl.NumberFormat("en-us", { useGrouping: false });
30+
31+
assertEquals("12345.679", nf.format(12345.6789));
32+
assertEquals("12345.679", nf.format(12345.678912));
33+
assertEquals("12345.67", nf.format(12345.6700));
34+
assertEquals("12345", nf.format(12345));
35+
assertEquals("12345.679", nf.format(12345.6789123421));
36+
37+
nf = new Intl.NumberFormat("en-us", { useGrouping: false, style: 'percent'});
38+
39+
assertEquals("12346%", nf.format(123.456789));
40+
assertEquals("12346%", nf.format(123.45678912));
41+
assertEquals("12346%", nf.format(123.456700));
42+
assertEquals("12346%", nf.format(123.456789123421));
43+
assertEquals("12345%", nf.format(123.45));
44+
45+
// For currency, the minimum or the maximum can be overwritten individually
46+
47+
nf = new Intl.NumberFormat('en', {minimumFractionDigits: 0, style: 'currency', currency: 'USD'});
48+
49+
assertEquals("$54,306.4", nf.format(54306.4047970));
50+
assertEquals("$54,306.4", nf.format(54306.4));
51+
assertEquals("$54,306", nf.format(54306));
52+
53+
nf = new Intl.NumberFormat('en', {maximumFractionDigits: 3, style: 'currency', currency: 'USD'});
54+
55+
assertEquals("$54,306.405", nf.format(54306.4047970));
56+
assertEquals("$54,306.40", nf.format(54306.4));
57+
assertEquals("$54,306.00", nf.format(54306));

0 commit comments

Comments
 (0)