Skip to content

Commit e38f8dc

Browse files
committed
fixup! switch to TimeZone::getTZDataVersion()
1 parent ac11466 commit e38f8dc

2 files changed

Lines changed: 9 additions & 11 deletions

File tree

test/addons/icu-binding/binding.cc

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include <node.h>
2-
#include <unicode/ulocdata.h>
2+
#include <unicode/timezone.h>
33
#include <unicode/utypes.h>
44
#include <unicode/uversion.h>
55

@@ -15,15 +15,13 @@ inline void Initialize(v8::Local<v8::Object> exports,
1515
exports->Set(context, key, value).FromJust();
1616
}
1717
{
18-
UVersionInfo cldr_versions;
19-
UErrorCode cldr_status = U_ZERO_ERROR;
20-
ulocdata_getCLDRVersion(cldr_versions, &cldr_status);
21-
assert(U_SUCCESS(cldr_status));
22-
char cldr_version[U_MAX_VERSION_STRING_LENGTH];
23-
u_versionToString(cldr_versions, cldr_version);
24-
auto key = v8::String::NewFromUtf8(isolate, "cldrVersion");
25-
auto value = v8::String::NewFromUtf8(isolate, cldr_version);
26-
exports->Set(context, key, value).FromJust();
18+
UErrorCode tzdata_status = U_ZERO_ERROR;
19+
const char* tzdata_version = TimeZone::getTZDataVersion(tzdata_status);
20+
if (U_SUCCESS(tzdata_status) && tzdata_version != nullptr) {
21+
auto key = v8::String::NewFromUtf8(isolate, "tzdataVersion");
22+
auto value = v8::String::NewFromUtf8(isolate, tzdata_version);
23+
exports->Set(context, key, value).FromJust();
24+
}
2725
}
2826
}
2927

test/addons/icu-binding/test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ if (!common.hasIntl) {
77
}
88
const assert = require('assert');
99
const binding = require(`./build/${common.buildType}/binding`);
10-
assert.strictEqual(binding.cldrVersion, process.versions.cldr);
1110
assert.strictEqual(binding.icuVersion, process.versions.icu);
11+
assert.strictEqual(binding.tzdataVersion, process.versions.tz);

0 commit comments

Comments
 (0)