Skip to content

Commit

Permalink
Merged @adgrace pull request #410
Browse files Browse the repository at this point in the history
  • Loading branch information
ellenaua committed Feb 21, 2020
1 parent 6c2d379 commit a09033a
Show file tree
Hide file tree
Showing 522 changed files with 3,212 additions and 2,217 deletions.
508 changes: 378 additions & 130 deletions builds/moment-timezone-with-data-10-year-range.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion builds/moment-timezone-with-data-10-year-range.min.js

Large diffs are not rendered by default.

890 changes: 569 additions & 321 deletions builds/moment-timezone-with-data-1970-2030.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion builds/moment-timezone-with-data-1970-2030.min.js

Large diffs are not rendered by default.

540 changes: 394 additions & 146 deletions builds/moment-timezone-with-data-2012-2022.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion builds/moment-timezone-with-data-2012-2022.min.js

Large diffs are not rendered by default.

942 changes: 595 additions & 347 deletions builds/moment-timezone-with-data.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion builds/moment-timezone-with-data.min.js

Large diffs are not rendered by default.

622 changes: 311 additions & 311 deletions data/packed/latest.json

Large diffs are not rendered by default.

27 changes: 15 additions & 12 deletions moment-timezone-utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,11 @@
return '';
}
if (number < 1000) {
return '|' + number;
return number;
}
var exponent = String(number | 0).length - 2;
var precision = Math.round(number / Math.pow(10, exponent));
return '|' + precision + 'e' + exponent;
return precision + 'e' + exponent;
}

function packCountries (countries) {
Expand All @@ -152,11 +152,11 @@
function pack (source) {
validatePackData(source);
return [
source.name,
packAbbrsAndOffsets(source),
packUntils(source.untils),
packPopulation(source.population),
packCountries(source.countries)
source.name, // 0 - timezone name
packAbbrsAndOffsets(source), // 1 - abbrs, 2 - offsets, 3 - indices
packUntils(source.untils), // 4 - untils
packPopulation(source.population), // 5 - population
packCountries(source.countries) // 6 - countries
].join('|');
}

Expand Down Expand Up @@ -237,8 +237,7 @@
return {
version : source.version,
zones : zones,
links : links.sort(),
countries : source.countries
links : links.sort()
};
}

Expand Down Expand Up @@ -290,7 +289,8 @@
abbrs : slice.apply(source.abbrs, indices),
untils : untils,
offsets : slice.apply(source.offsets, indices),
population : source.population
population : source.population,
countries : source.countries
};
}

Expand All @@ -311,14 +311,17 @@
output = createLinks({
zones : outputZones,
links : input.links.slice(),
version : input.version,
countries : []
version : input.version
}, groupLeaders);

for (i = 0; i < output.zones.length; i++) {
output.zones[i] = pack(output.zones[i]);
}

output.countries = input.countries.map(function (unpacked) {
return packCountry(unpacked);
});

return output;
}

Expand Down
2 changes: 1 addition & 1 deletion moment-timezone.js
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
offsets = data[2].split(' '),
indices = data[3].split(''),
untils = data[4].split(' '),
countries = data[7];
countries = data[6];

arrayToInt(offsets);
arrayToInt(indices);
Expand Down
2 changes: 1 addition & 1 deletion tasks/data-pack.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ module.exports = function (grunt) {
return tz.pack(unpacked);
});

output.countries = output.countries.map(function (unpacked) {
output.countries = unpacked.countries.map(function (unpacked) {
return tz.packCountry(unpacked);
});

Expand Down
4 changes: 2 additions & 2 deletions tests/zones/africa/abidjan.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ var helpers = require("../../helpers/helpers");

exports["Africa/Abidjan"] = {

"guess:by:offset" : helpers.makeTestGuess("Africa/Abidjan", { offset: true, expect: "Etc/UTC" }),
"guess:by:offset" : helpers.makeTestGuess("Africa/Abidjan", { offset: true }),

"guess:by:abbr" : helpers.makeTestGuess("Africa/Abidjan", { abbr: true, expect: "Etc/UTC" }),
"guess:by:abbr" : helpers.makeTestGuess("Africa/Abidjan", { abbr: true }),

"1912" : helpers.makeTestYear("Africa/Abidjan", [
["1912-01-01T00:16:07+00:00", "23:59:59", "LMT", 968 / 60],
Expand Down
4 changes: 2 additions & 2 deletions tests/zones/africa/accra.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ var helpers = require("../../helpers/helpers");

exports["Africa/Accra"] = {

"guess:by:offset" : helpers.makeTestGuess("Africa/Accra", { offset: true, expect: "Etc/UTC" }),
"guess:by:offset" : helpers.makeTestGuess("Africa/Accra", { offset: true, expect: "Africa/Abidjan" }),

"guess:by:abbr" : helpers.makeTestGuess("Africa/Accra", { abbr: true, expect: "Etc/UTC" }),
"guess:by:abbr" : helpers.makeTestGuess("Africa/Accra", { abbr: true, expect: "Africa/Abidjan" }),

"1918" : helpers.makeTestYear("Africa/Accra", [
["1918-01-01T00:00:51+00:00", "23:59:59", "LMT", 52 / 60],
Expand Down
2 changes: 1 addition & 1 deletion tests/zones/africa/addis_ababa.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ var helpers = require("../../helpers/helpers");

exports["Africa/Addis_Ababa"] = {

"guess:by:offset" : helpers.makeTestGuess("Africa/Addis_Ababa", { offset: true, expect: "Europe/Simferopol" }),
"guess:by:offset" : helpers.makeTestGuess("Africa/Addis_Ababa", { offset: true, expect: "Europe/Moscow" }),

"guess:by:abbr" : helpers.makeTestGuess("Africa/Addis_Ababa", { abbr: true, expect: "Africa/Nairobi" }),

Expand Down
4 changes: 2 additions & 2 deletions tests/zones/africa/algiers.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ var helpers = require("../../helpers/helpers");

exports["Africa/Algiers"] = {

"guess:by:offset" : helpers.makeTestGuess("Africa/Algiers", { offset: true, expect: "Etc/GMT-1" }),
"guess:by:offset" : helpers.makeTestGuess("Africa/Algiers", { offset: true, expect: "Africa/Lagos" }),

"guess:by:abbr" : helpers.makeTestGuess("Africa/Algiers", { abbr: true, expect: "Africa/Tunis" }),
"guess:by:abbr" : helpers.makeTestGuess("Africa/Algiers", { abbr: true }),

"1911" : helpers.makeTestYear("Africa/Algiers", [
["1911-03-10T23:50:38+00:00", "23:59:59", "PMT", -561 / 60],
Expand Down
2 changes: 1 addition & 1 deletion tests/zones/africa/asmara.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ var helpers = require("../../helpers/helpers");

exports["Africa/Asmara"] = {

"guess:by:offset" : helpers.makeTestGuess("Africa/Asmara", { offset: true, expect: "Europe/Simferopol" }),
"guess:by:offset" : helpers.makeTestGuess("Africa/Asmara", { offset: true, expect: "Europe/Moscow" }),

"guess:by:abbr" : helpers.makeTestGuess("Africa/Asmara", { abbr: true, expect: "Africa/Nairobi" }),

Expand Down
2 changes: 1 addition & 1 deletion tests/zones/africa/asmera.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ var helpers = require("../../helpers/helpers");

exports["Africa/Asmera"] = {

"guess:by:offset" : helpers.makeTestGuess("Africa/Asmera", { offset: true, expect: "Europe/Simferopol" }),
"guess:by:offset" : helpers.makeTestGuess("Africa/Asmera", { offset: true, expect: "Europe/Moscow" }),

"guess:by:abbr" : helpers.makeTestGuess("Africa/Asmera", { abbr: true, expect: "Africa/Nairobi" }),

Expand Down
4 changes: 2 additions & 2 deletions tests/zones/africa/bamako.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ var helpers = require("../../helpers/helpers");

exports["Africa/Bamako"] = {

"guess:by:offset" : helpers.makeTestGuess("Africa/Bamako", { offset: true, expect: "Etc/UTC" }),
"guess:by:offset" : helpers.makeTestGuess("Africa/Bamako", { offset: true, expect: "Africa/Abidjan" }),

"guess:by:abbr" : helpers.makeTestGuess("Africa/Bamako", { abbr: true, expect: "Etc/UTC" }),
"guess:by:abbr" : helpers.makeTestGuess("Africa/Bamako", { abbr: true, expect: "Africa/Abidjan" }),

"1912" : helpers.makeTestYear("Africa/Bamako", [
["1912-01-01T00:16:07+00:00", "23:59:59", "LMT", 968 / 60],
Expand Down
4 changes: 2 additions & 2 deletions tests/zones/africa/bangui.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ var helpers = require("../../helpers/helpers");

exports["Africa/Bangui"] = {

"guess:by:offset" : helpers.makeTestGuess("Africa/Bangui", { offset: true, expect: "Etc/GMT-1" }),
"guess:by:offset" : helpers.makeTestGuess("Africa/Bangui", { offset: true, expect: "Africa/Lagos" }),

"guess:by:abbr" : helpers.makeTestGuess("Africa/Bangui", { abbr: true, expect: "Africa/Ndjamena" }),
"guess:by:abbr" : helpers.makeTestGuess("Africa/Bangui", { abbr: true, expect: "Africa/Lagos" }),

"1919" : helpers.makeTestYear("Africa/Bangui", [
["1919-08-31T23:46:23+00:00", "23:59:59", "LMT", -816 / 60],
Expand Down
4 changes: 2 additions & 2 deletions tests/zones/africa/banjul.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ var helpers = require("../../helpers/helpers");

exports["Africa/Banjul"] = {

"guess:by:offset" : helpers.makeTestGuess("Africa/Banjul", { offset: true, expect: "Etc/UTC" }),
"guess:by:offset" : helpers.makeTestGuess("Africa/Banjul", { offset: true, expect: "Africa/Abidjan" }),

"guess:by:abbr" : helpers.makeTestGuess("Africa/Banjul", { abbr: true, expect: "Etc/UTC" }),
"guess:by:abbr" : helpers.makeTestGuess("Africa/Banjul", { abbr: true, expect: "Africa/Abidjan" }),

"1912" : helpers.makeTestYear("Africa/Banjul", [
["1912-01-01T00:16:07+00:00", "23:59:59", "LMT", 968 / 60],
Expand Down
4 changes: 2 additions & 2 deletions tests/zones/africa/bissau.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ var helpers = require("../../helpers/helpers");

exports["Africa/Bissau"] = {

"guess:by:offset" : helpers.makeTestGuess("Africa/Bissau", { offset: true, expect: "Etc/UTC" }),
"guess:by:offset" : helpers.makeTestGuess("Africa/Bissau", { offset: true, expect: "Africa/Abidjan" }),

"guess:by:abbr" : helpers.makeTestGuess("Africa/Bissau", { abbr: true, expect: "Etc/UTC" }),
"guess:by:abbr" : helpers.makeTestGuess("Africa/Bissau", { abbr: true, expect: "Africa/Abidjan" }),

"1912" : helpers.makeTestYear("Africa/Bissau", [
["1912-01-01T00:59:59+00:00", "23:57:39", "LMT", 3740 / 60],
Expand Down
4 changes: 2 additions & 2 deletions tests/zones/africa/blantyre.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ var helpers = require("../../helpers/helpers");

exports["Africa/Blantyre"] = {

"guess:by:offset" : helpers.makeTestGuess("Africa/Blantyre", { offset: true, expect: "Europe/Kaliningrad" }),
"guess:by:offset" : helpers.makeTestGuess("Africa/Blantyre", { offset: true, expect: "Africa/Cairo" }),

"guess:by:abbr" : helpers.makeTestGuess("Africa/Blantyre", { abbr: true, expect: "Africa/Windhoek" }),
"guess:by:abbr" : helpers.makeTestGuess("Africa/Blantyre", { abbr: true, expect: "Africa/Khartoum" }),

"1903" : helpers.makeTestYear("Africa/Blantyre", [
["1903-02-28T21:49:39+00:00", "23:59:59", "LMT", -7820 / 60],
Expand Down
4 changes: 2 additions & 2 deletions tests/zones/africa/brazzaville.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ var helpers = require("../../helpers/helpers");

exports["Africa/Brazzaville"] = {

"guess:by:offset" : helpers.makeTestGuess("Africa/Brazzaville", { offset: true, expect: "Etc/GMT-1" }),
"guess:by:offset" : helpers.makeTestGuess("Africa/Brazzaville", { offset: true, expect: "Africa/Lagos" }),

"guess:by:abbr" : helpers.makeTestGuess("Africa/Brazzaville", { abbr: true, expect: "Africa/Ndjamena" }),
"guess:by:abbr" : helpers.makeTestGuess("Africa/Brazzaville", { abbr: true, expect: "Africa/Lagos" }),

"1919" : helpers.makeTestYear("Africa/Brazzaville", [
["1919-08-31T23:46:23+00:00", "23:59:59", "LMT", -816 / 60],
Expand Down
4 changes: 2 additions & 2 deletions tests/zones/africa/bujumbura.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ var helpers = require("../../helpers/helpers");

exports["Africa/Bujumbura"] = {

"guess:by:offset" : helpers.makeTestGuess("Africa/Bujumbura", { offset: true, expect: "Europe/Kaliningrad" }),
"guess:by:offset" : helpers.makeTestGuess("Africa/Bujumbura", { offset: true, expect: "Africa/Cairo" }),

"guess:by:abbr" : helpers.makeTestGuess("Africa/Bujumbura", { abbr: true, expect: "Africa/Windhoek" }),
"guess:by:abbr" : helpers.makeTestGuess("Africa/Bujumbura", { abbr: true, expect: "Africa/Khartoum" }),

"1903" : helpers.makeTestYear("Africa/Bujumbura", [
["1903-02-28T21:49:39+00:00", "23:59:59", "LMT", -7820 / 60],
Expand Down
4 changes: 2 additions & 2 deletions tests/zones/africa/cairo.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ var helpers = require("../../helpers/helpers");

exports["Africa/Cairo"] = {

"guess:by:offset" : helpers.makeTestGuess("Africa/Cairo", { offset: true, expect: "Europe/Kaliningrad" }),
"guess:by:offset" : helpers.makeTestGuess("Africa/Cairo", { offset: true }),

"guess:by:abbr" : helpers.makeTestGuess("Africa/Cairo", { abbr: true, expect: "Europe/Kaliningrad" }),
"guess:by:abbr" : helpers.makeTestGuess("Africa/Cairo", { abbr: true }),

"1940" : helpers.makeTestYear("Africa/Cairo", [
["1940-07-14T21:59:59+00:00", "23:59:59", "EET", -120],
Expand Down
4 changes: 2 additions & 2 deletions tests/zones/africa/casablanca.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ var helpers = require("../../helpers/helpers");

exports["Africa/Casablanca"] = {

"guess:by:offset" : helpers.makeTestGuess("Africa/Casablanca", { offset: true, expect: "Africa/El_Aaiun" }),
"guess:by:offset" : helpers.makeTestGuess("Africa/Casablanca", { offset: true }),

"guess:by:abbr" : helpers.makeTestGuess("Africa/Casablanca", { abbr: true, expect: "Africa/El_Aaiun" }),
"guess:by:abbr" : helpers.makeTestGuess("Africa/Casablanca", { abbr: true }),

"1913" : helpers.makeTestYear("Africa/Casablanca", [
["1913-10-26T00:30:19+00:00", "23:59:59", "LMT", 1820 / 60],
Expand Down
4 changes: 2 additions & 2 deletions tests/zones/africa/ceuta.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ var helpers = require("../../helpers/helpers");

exports["Africa/Ceuta"] = {

"guess:by:offset" : helpers.makeTestGuess("Africa/Ceuta", { offset: true, expect: "MET" }),
"guess:by:offset" : helpers.makeTestGuess("Africa/Ceuta", { offset: true, expect: "Europe/Paris" }),

"guess:by:abbr" : helpers.makeTestGuess("Africa/Ceuta", { abbr: true, expect: "Europe/Zurich" }),
"guess:by:abbr" : helpers.makeTestGuess("Africa/Ceuta", { abbr: true, expect: "Europe/Paris" }),

"1918" : helpers.makeTestYear("Africa/Ceuta", [
["1918-05-06T22:59:59+00:00", "22:59:59", "WET", 0],
Expand Down
4 changes: 2 additions & 2 deletions tests/zones/africa/conakry.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ var helpers = require("../../helpers/helpers");

exports["Africa/Conakry"] = {

"guess:by:offset" : helpers.makeTestGuess("Africa/Conakry", { offset: true, expect: "Etc/UTC" }),
"guess:by:offset" : helpers.makeTestGuess("Africa/Conakry", { offset: true, expect: "Africa/Abidjan" }),

"guess:by:abbr" : helpers.makeTestGuess("Africa/Conakry", { abbr: true, expect: "Etc/UTC" }),
"guess:by:abbr" : helpers.makeTestGuess("Africa/Conakry", { abbr: true, expect: "Africa/Abidjan" }),

"1912" : helpers.makeTestYear("Africa/Conakry", [
["1912-01-01T00:16:07+00:00", "23:59:59", "LMT", 968 / 60],
Expand Down
4 changes: 2 additions & 2 deletions tests/zones/africa/dakar.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ var helpers = require("../../helpers/helpers");

exports["Africa/Dakar"] = {

"guess:by:offset" : helpers.makeTestGuess("Africa/Dakar", { offset: true, expect: "Etc/UTC" }),
"guess:by:offset" : helpers.makeTestGuess("Africa/Dakar", { offset: true, expect: "Africa/Abidjan" }),

"guess:by:abbr" : helpers.makeTestGuess("Africa/Dakar", { abbr: true, expect: "Etc/UTC" }),
"guess:by:abbr" : helpers.makeTestGuess("Africa/Dakar", { abbr: true, expect: "Africa/Abidjan" }),

"1912" : helpers.makeTestYear("Africa/Dakar", [
["1912-01-01T00:16:07+00:00", "23:59:59", "LMT", 968 / 60],
Expand Down
2 changes: 1 addition & 1 deletion tests/zones/africa/dar_es_salaam.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ var helpers = require("../../helpers/helpers");

exports["Africa/Dar_es_Salaam"] = {

"guess:by:offset" : helpers.makeTestGuess("Africa/Dar_es_Salaam", { offset: true, expect: "Europe/Simferopol" }),
"guess:by:offset" : helpers.makeTestGuess("Africa/Dar_es_Salaam", { offset: true, expect: "Europe/Moscow" }),

"guess:by:abbr" : helpers.makeTestGuess("Africa/Dar_es_Salaam", { abbr: true, expect: "Africa/Nairobi" }),

Expand Down
2 changes: 1 addition & 1 deletion tests/zones/africa/djibouti.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ var helpers = require("../../helpers/helpers");

exports["Africa/Djibouti"] = {

"guess:by:offset" : helpers.makeTestGuess("Africa/Djibouti", { offset: true, expect: "Europe/Simferopol" }),
"guess:by:offset" : helpers.makeTestGuess("Africa/Djibouti", { offset: true, expect: "Europe/Moscow" }),

"guess:by:abbr" : helpers.makeTestGuess("Africa/Djibouti", { abbr: true, expect: "Africa/Nairobi" }),

Expand Down
4 changes: 2 additions & 2 deletions tests/zones/africa/douala.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ var helpers = require("../../helpers/helpers");

exports["Africa/Douala"] = {

"guess:by:offset" : helpers.makeTestGuess("Africa/Douala", { offset: true, expect: "Etc/GMT-1" }),
"guess:by:offset" : helpers.makeTestGuess("Africa/Douala", { offset: true, expect: "Africa/Lagos" }),

"guess:by:abbr" : helpers.makeTestGuess("Africa/Douala", { abbr: true, expect: "Africa/Ndjamena" }),
"guess:by:abbr" : helpers.makeTestGuess("Africa/Douala", { abbr: true, expect: "Africa/Lagos" }),

"1919" : helpers.makeTestYear("Africa/Douala", [
["1919-08-31T23:46:23+00:00", "23:59:59", "LMT", -816 / 60],
Expand Down
4 changes: 2 additions & 2 deletions tests/zones/africa/el_aaiun.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ var helpers = require("../../helpers/helpers");

exports["Africa/El_Aaiun"] = {

"guess:by:offset" : helpers.makeTestGuess("Africa/El_Aaiun", { offset: true }),
"guess:by:offset" : helpers.makeTestGuess("Africa/El_Aaiun", { offset: true, expect: "Africa/Casablanca" }),

"guess:by:abbr" : helpers.makeTestGuess("Africa/El_Aaiun", { abbr: true }),
"guess:by:abbr" : helpers.makeTestGuess("Africa/El_Aaiun", { abbr: true, expect: "Africa/Casablanca" }),

"1934" : helpers.makeTestYear("Africa/El_Aaiun", [
["1934-01-01T00:52:47+00:00", "23:59:59", "LMT", 3168 / 60],
Expand Down
4 changes: 2 additions & 2 deletions tests/zones/africa/freetown.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ var helpers = require("../../helpers/helpers");

exports["Africa/Freetown"] = {

"guess:by:offset" : helpers.makeTestGuess("Africa/Freetown", { offset: true, expect: "Etc/UTC" }),
"guess:by:offset" : helpers.makeTestGuess("Africa/Freetown", { offset: true, expect: "Africa/Abidjan" }),

"guess:by:abbr" : helpers.makeTestGuess("Africa/Freetown", { abbr: true, expect: "Etc/UTC" }),
"guess:by:abbr" : helpers.makeTestGuess("Africa/Freetown", { abbr: true, expect: "Africa/Abidjan" }),

"1912" : helpers.makeTestYear("Africa/Freetown", [
["1912-01-01T00:16:07+00:00", "23:59:59", "LMT", 968 / 60],
Expand Down
4 changes: 2 additions & 2 deletions tests/zones/africa/gaborone.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ var helpers = require("../../helpers/helpers");

exports["Africa/Gaborone"] = {

"guess:by:offset" : helpers.makeTestGuess("Africa/Gaborone", { offset: true, expect: "Europe/Kaliningrad" }),
"guess:by:offset" : helpers.makeTestGuess("Africa/Gaborone", { offset: true, expect: "Africa/Cairo" }),

"guess:by:abbr" : helpers.makeTestGuess("Africa/Gaborone", { abbr: true, expect: "Africa/Windhoek" }),
"guess:by:abbr" : helpers.makeTestGuess("Africa/Gaborone", { abbr: true, expect: "Africa/Khartoum" }),

"1903" : helpers.makeTestYear("Africa/Gaborone", [
["1903-02-28T21:49:39+00:00", "23:59:59", "LMT", -7820 / 60],
Expand Down
4 changes: 2 additions & 2 deletions tests/zones/africa/harare.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ var helpers = require("../../helpers/helpers");

exports["Africa/Harare"] = {

"guess:by:offset" : helpers.makeTestGuess("Africa/Harare", { offset: true, expect: "Europe/Kaliningrad" }),
"guess:by:offset" : helpers.makeTestGuess("Africa/Harare", { offset: true, expect: "Africa/Cairo" }),

"guess:by:abbr" : helpers.makeTestGuess("Africa/Harare", { abbr: true, expect: "Africa/Windhoek" }),
"guess:by:abbr" : helpers.makeTestGuess("Africa/Harare", { abbr: true, expect: "Africa/Khartoum" }),

"1903" : helpers.makeTestYear("Africa/Harare", [
["1903-02-28T21:49:39+00:00", "23:59:59", "LMT", -7820 / 60],
Expand Down
2 changes: 1 addition & 1 deletion tests/zones/africa/johannesburg.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ var helpers = require("../../helpers/helpers");

exports["Africa/Johannesburg"] = {

"guess:by:offset" : helpers.makeTestGuess("Africa/Johannesburg", { offset: true, expect: "Europe/Kaliningrad" }),
"guess:by:offset" : helpers.makeTestGuess("Africa/Johannesburg", { offset: true, expect: "Africa/Cairo" }),

"guess:by:abbr" : helpers.makeTestGuess("Africa/Johannesburg", { abbr: true }),

Expand Down
2 changes: 1 addition & 1 deletion tests/zones/africa/juba.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ var helpers = require("../../helpers/helpers");

exports["Africa/Juba"] = {

"guess:by:offset" : helpers.makeTestGuess("Africa/Juba", { offset: true, expect: "Europe/Simferopol" }),
"guess:by:offset" : helpers.makeTestGuess("Africa/Juba", { offset: true, expect: "Europe/Moscow" }),

"guess:by:abbr" : helpers.makeTestGuess("Africa/Juba", { abbr: true, expect: "Africa/Nairobi" }),

Expand Down
Loading

0 comments on commit a09033a

Please sign in to comment.