Skip to content

Commit 83c5e74

Browse files
ehoogerbeetsehoogerbeets
authored
Merge pull request #396 from iLib-js/development
Merge to master to publish v14.15.1
2 parents e23f73a + d951d48 commit 83c5e74

File tree

10 files changed

+124
-90
lines changed

10 files changed

+124
-90
lines changed

‎build.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515

16-
version=14.15.0
16+
version=14.15.1

‎docs/ReleaseNotes.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
Release Notes for Version 14
22
============================
33

4+
Build 024
5+
-------
6+
Published as version 14.15.1
7+
New Features:
8+
9+
Bug Fixes:
10+
* Fixed isomorphic test failures by adding a value check
411

512
Build 023
613
-------

‎js/lib/IString.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -694,6 +694,7 @@ IString.prototype = {
694694
if (typeof(Intl) !== 'undefined') {
695695
if (ilib._getPlatform() === 'nodejs') {
696696
var version = process.versions["node"];
697+
if (!version) return false;
697698
var majorVersion = version.split(".")[0];
698699
if (Number(majorVersion) >= 10 && (Intl.PluralRules.supportedLocalesOf(locale.getSpec()).length > 0)) {
699700
return true;

‎js/test/date/testdatefmt.js‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3998,10 +3998,14 @@ module.exports.testdatefmt = {
39983998
var result = DateFmt.isIntlDateTimeAvailable("ko-KR");
39993999

40004000
if(ilib._getPlatform() === "nodejs") {
4001-
var version = process.versions["node"];
4002-
var majorVersion = version.split(".")[0];
4003-
if (majorVersion == "8" || majorVersion == "10" || majorVersion == "12") {
4004-
test.equal(result, false);
4001+
var cldrVersion = Number(process.versions["cldr"]);
4002+
var nodeMajorVersion = process.versions["node"].split(".")[0];
4003+
if (cldrVersion < 38) {
4004+
if (nodeMajorVersion === "14") {
4005+
test.equal(result, true);
4006+
} else {
4007+
test.equal(result, false);
4008+
}
40054009
} else {
40064010
test.equal(result, true);
40074011
}

‎js/test/date/testdatefmt_en_GB.js‎

Lines changed: 62 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -145,12 +145,20 @@ module.exports.testdatefmt_en_GB = {
145145
});
146146

147147
if(ilib._getPlatform() === "nodejs"){
148-
var version = process.versions["node"];
149-
var majorVersion = version.split(".")[0];
150-
if (majorVersion == "8" || majorVersion == "10") {
148+
var cldrVersion = Number(process.versions["cldr"]);
149+
var nodeMajorVersion = process.versions["node"].split(".")[0];
150+
if (cldrVersion < 36) {
151151
test.equal(fmt.format(date), "9/29/2011");
152-
} else if (majorVersion == "12") {
153-
test.equal(fmt.format(date), "9/29/11");
152+
} else if (cldrVersion < 38) {
153+
/*
154+
* Both node v12.16.1 and v14.16.1 say the cldr version is 37.0.
155+
* But it returns a different result.
156+
*/
157+
if (nodeMajorVersion === "14") {
158+
test.equal(fmt.format(date), "29/09/2011");
159+
} else {
160+
test.equal(fmt.format(date), "9/29/11");
161+
}
154162
} else {
155163
test.equal(fmt.format(date), "29/09/2011");
156164
}
@@ -181,20 +189,23 @@ module.exports.testdatefmt_en_GB = {
181189
});
182190

183191
if(ilib._getPlatform() === "nodejs"){
184-
var version = process.versions["node"];
185-
var majorVersion = version.split(".")[0];
192+
var cldrVersion = Number(process.versions["cldr"]);
193+
var nodeMajorVersion = process.versions["node"].split(".")[0];
186194
//console.log("version: " + version + " majorVersion: " + majorVersion);
187-
if (majorVersion == "8" || majorVersion == "10") {
195+
if (cldrVersion < 36) {
188196
test.equal(fmt.format(date), "9/29/2011");
189-
} else if (majorVersion == "12") {
190-
test.equal(fmt.format(date), "Sep 29, 2011");
191-
} else if (version == "14.18.2"){
197+
} else if(cldrVersion < 38) {
198+
if (nodeMajorVersion === "14") {
199+
test.equal(fmt.format(date), "29 Sep 2011");
200+
} else {
201+
test.equal(fmt.format(date), "Sep 29, 2011");
202+
}
203+
} else if(cldrVersion < 39){
192204
test.equal(fmt.format(date), "29 Sept 2011");
193-
}
194-
else if (majorVersion == "16"){
205+
} else if(cldrVersion < 41){
195206
test.equal(fmt.format(date), "29 Sept 2011");
196207
} else {
197-
test.equal(fmt.format(date), "29 Sep 2011");
208+
test.equal(fmt.format(date), "29 Sep 2011");
198209
}
199210
} else {
200211
test.equal(fmt.format(date), "29 Sept 2011");
@@ -222,12 +233,17 @@ module.exports.testdatefmt_en_GB = {
222233
});
223234

224235
if(ilib._getPlatform() === "nodejs"){
225-
var version = process.versions["node"];
226-
var majorVersion = version.split(".")[0];
227-
if (majorVersion == "8" || majorVersion == "10") {
236+
var cldrVersion = Number(process.versions["cldr"]);
237+
var nodeMajorVersion = process.versions["node"].split(".")[0];
238+
if (cldrVersion < 36) {
228239
test.equal(fmt.format(date), "9/29/2011");
229-
} else if (majorVersion == "12") {
230-
test.equal(fmt.format(date), "September 29, 2011");
240+
} else if (cldrVersion < 38) {
241+
if (nodeMajorVersion === "14") {
242+
test.equal(fmt.format(date), "29 September 2011");
243+
} else {
244+
test.equal(fmt.format(date), "September 29, 2011");
245+
}
246+
231247
} else {
232248
test.equal(fmt.format(date), "29 September 2011");
233249
}
@@ -283,12 +299,16 @@ module.exports.testdatefmt_en_GB = {
283299

284300

285301
if(ilib._getPlatform() === "nodejs"){
286-
var version = process.versions["node"];
287-
var majorVersion = version.split(".")[0];
288-
if (majorVersion == "8" || majorVersion == "10") {
302+
var cldrVersion = Number(process.versions["cldr"]);
303+
var nodeMajorVersion = process.versions["node"].split(".")[0];
304+
if (cldrVersion < 36) {
289305
test.equal(fmt.format(date), "9/29/2011");
290-
} else if (majorVersion == "12") {
291-
test.equal(fmt.format(date), "Thursday, September 29, 2011");
306+
} else if (cldrVersion < 38) {
307+
if (nodeMajorVersion === "14") {
308+
test.equal(fmt.format(date), "Thursday, 29 September 2011");
309+
} else {
310+
test.equal(fmt.format(date), "Thursday, September 29, 2011");
311+
}
292312
} else {
293313
test.equal(fmt.format(date), "Thursday, 29 September 2011");
294314
}
@@ -1294,12 +1314,16 @@ module.exports.testdatefmt_en_GB = {
12941314
});
12951315

12961316
if(ilib._getPlatform() === "nodejs") {
1297-
var version = process.versions["node"];
1298-
var majorVersion = version.split(".")[0];
1299-
if (majorVersion == "8" || majorVersion == "10") {
1317+
var cldrVersion = Number(process.versions["cldr"]);
1318+
var nodeMajorVersion = process.versions["node"].split(".")[0];
1319+
if (cldrVersion < 36) {
13001320
test.equal(fmt.format(date), "9/29/2011");
1301-
} else if (majorVersion == "12") {
1302-
test.equal(fmt.format(date), "1:45 PM");
1321+
} else if (cldrVersion < 38) {
1322+
if (nodeMajorVersion === "14") {
1323+
test.equal(fmt.format(date), "13:45");
1324+
} else {
1325+
test.equal(fmt.format(date), "1:45 PM");
1326+
}
13031327
} else {
13041328
test.equal(fmt.format(date), "13:45");
13051329
}
@@ -1329,19 +1353,22 @@ module.exports.testdatefmt_en_GB = {
13291353
});
13301354

13311355
if(ilib._getPlatform() === "nodejs"){
1332-
var version = process.versions["node"];
1333-
var majorVersion = version.split(".")[0];
1334-
if (majorVersion == "8" || majorVersion == "10") {
1356+
var cldrVersion = Number(process.versions["cldr"]);
1357+
var nodeMajorVersion = process.versions["node"].split(".")[0];
1358+
if (cldrVersion < 36) {
13351359
test.equal(fmt.format(date), "9/29/2011");
1336-
} else if (majorVersion == "12") {
1337-
test.equal(fmt.format(date), "1:45:10 PM");
1360+
} else if (cldrVersion < 38) {
1361+
if (nodeMajorVersion === "14") {
1362+
test.equal(fmt.format(date), "13:45:10");
1363+
} else {
1364+
test.equal(fmt.format(date), "1:45:10 PM");
1365+
}
13381366
} else {
13391367
test.equal(fmt.format(date), "13:45:10");
13401368
}
13411369
} else {
13421370
test.equal(fmt.format(date), "13:45:10");
13431371
}
1344-
13451372
test.done();
13461373
},
13471374

‎js/test/date/testdatefmtasync.js‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -322,9 +322,8 @@ module.exports.testdatefmtasync = {
322322
var date = new Date(2022, 4, 29);
323323

324324
if(ilib._getPlatform() === "nodejs"){
325-
var version = process.versions["node"];
326-
var majorVersion = version.split(".")[0];
327-
if (majorVersion == 8 || majorVersion == 10){
325+
var cldrVersion = Number(process.versions["cldr"]);
326+
if (cldrVersion < 36){
328327
test.equal(fmt.format(date), "5/29/2022");
329328
} else {
330329
test.equal(fmt.format(date), "May 29, 2022");
@@ -420,15 +419,12 @@ module.exports.testdatefmtasync = {
420419
sync: false,
421420
onLoad: function(fmt){
422421
if(ilib._getPlatform() === "nodejs"){
423-
var version = process.versions["node"];
424-
var majorVersion = version.split(".")[0];
425-
//console.log("version: " + version);
426-
if(majorVersion == "8" || majorVersion == "10"){
422+
var cldrVersion = Number(process.versions["cldr"]);
423+
if(cldrVersion < 36){
427424
test.equal(fmt.format(date), "9/29/2022");
428425
} else {
429426
test.equal(fmt.format(date), "September 29, 2022");
430427
}
431-
432428
} else {
433429
test.equal(fmt.format(date), "September 29, 2022");
434430
}

0 commit comments

Comments
 (0)