AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[intl] Fix space between day and hour in Chinese locale

Browse Source 
Make sure there are space between day and hour in the pattern
when we alternate date pattern for the change of hour cycle.

Bug: chromium:1170305
Change-Id: I2714111dcdedeefafdb854d1684f301786273303
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2654002
Commit-Queue: Frank Tang <ftang@chromium.org>
Reviewed-by: Frank Tang <ftang@chromium.org>
Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
Cr-Commit-Position: refs/heads/master@{#72418}
This commit is contained in:
Frank Tang 2021-01-28 15:39:13 -08:00 committed by Commit Bot
parent 3e5552350b
commit f09c3831dd
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/objects/js-date-time-format.cc
View File

@ -1107,6 +1107,7 @@ icu::UnicodeString ReplaceHourCycleInPattern(icu::UnicodeString pattern,
}
bool replace = true;
icu::UnicodeString result;
char16_t last = u'\0';
for (int32_t i = 0; i < pattern.length(); i++) {
char16_t ch = pattern.charAt(i);
switch (ch) {
@ -1121,12 +1122,17 @@ icu::UnicodeString ReplaceHourCycleInPattern(icu::UnicodeString pattern,
case 'K':
V8_FALLTHROUGH;
case 'k':
// If the previous field is a day, add a space before the hour.
if (replace && last == u'd') {
result.append(' ');
}
result.append(replace ? replacement : ch);
break;
default:
result.append(ch);
break;
}
last = ch;
}
return result;
}

16
test/intl/regress-1170305.js Normal file
View File

@ -0,0 +1,16 @@
// Copyright 2021 the V8 project authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// Test in Chinese locale there is space between the day and hour field.
let opt = {year: 'numeric', month: '2-digit', day: '2-digit', hour: '2-digit',
minute: '2-digit', second: '2-digit', hour12: false, timeZone: "UTC"};
let d = new Date("2021-01-27T03:15:04Z");
["zh", "zh-CN", "zh-Hant", "zh-TW", "zh-Hans"].forEach(function(l) {
// Ensure both 27 (day) and 03 (hour) can be found in the string.
assertTrue(d.toLocaleString(l, opt).indexOf("27") >= 0);
assertTrue(d.toLocaleString(l, opt).indexOf("03") >= 0);
// Ensure there is no case that 27 (day) and 03 (hour) concat together.
assertEquals(-1, d.toLocaleString(l, opt).indexOf("2703"));
});