Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 24 additions & 15 deletions ghost/admin/mirage/fixtures/timezones.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ export default [
label: '(GMT -9:00) Alaska'
},
{
name: 'America/Tijuana',
label: '(GMT -8:00) Chihuahua, La Paz, Mazatlan'
},
name: 'America/Mazatlan',
label: '(GMT -7:00) La Paz, Mazatlan'
},
{
name: 'America/Los_Angeles',
label: '(GMT -8:00) Pacific Time (US & Canada); Tijuana'
Expand All @@ -27,6 +27,10 @@ export default [
name: 'America/Denver',
label: '(GMT -7:00) Mountain Time (US & Canada)'
},
{
name: 'America/Chihuahua',
label: '(GMT -6:00) Chihuahua'
},
{
name: 'America/Costa_Rica',
label: '(GMT -6:00) Central America'
Expand Down Expand Up @@ -57,11 +61,11 @@ export default [
},
{
name: 'America/Caracas',
label: '(GMT -4:00) Caracas, La Paz'
label: '(GMT -4:00) Caracas, La Paz, Georgetown'
},
{
name: 'America/Halifax',
label: '(GMT -4:00) Atlantic Time (Canada); Brasilia, Greenland'
label: '(GMT -4:00) Atlantic Time (Canada); Greenland'
},
{
name: 'America/Santiago',
Expand All @@ -73,7 +77,7 @@ export default [
},
{
name: 'America/Argentina/Buenos_Aires',
label: '(GMT -3:00) Buenos Aires, Georgetown'
label: '(GMT -3:00) Buenos Aires, Brasilia'
},
{
name: 'America/Noronha',
Expand Down Expand Up @@ -175,6 +179,10 @@ export default [
name: 'Asia/Kabul',
label: '(GMT +4:30) Kabul'
},
{
name: 'Asia/Almaty',
label: '(GMT +5:00) Almaty, Astana'
},
{
name: 'Asia/Karachi',
label: '(GMT +5:00) Islamabad, Karachi, Tashkent'
Expand All @@ -185,39 +193,40 @@ export default [
},
{
name: 'Asia/Kolkata',
label: '(GMT +5:30) Chennai, Calcutta, Mumbai, New Delhi'
label: '(GMT +5:30) Chennai, Kolkata, Mumbai, New Delhi'
},
{
name: 'Asia/Kathmandu',
label: '(GMT +5:45) Katmandu'
name: 'Asia/Colombo',
label: '(GMT +5:30) Colombo, Sri Jayawardenepura'
},
{
name: 'Asia/Almaty',
label: '(GMT +6:00) Almaty, Novosibirsk'
name: 'Asia/Kathmandu',
label: '(GMT +5:45) Kathmandu'
},

{
name: 'Asia/Dhaka',
label: '(GMT +6:00) Astana, Dhaka, Sri Jayawardenepura'
label: '(GMT +6:00) Dhaka'
},
{
name: 'Asia/Rangoon',
label: '(GMT +6:30) Rangoon'
label: '(GMT +6:30) Yangon (Rangoon)'
},
{
name: 'Asia/Bangkok',
label: '(GMT +7:00) Bangkok, Hanoi, Jakarta'
},
{
name: 'Asia/Krasnoyarsk',
label: '(GMT +7:00) Krasnoyarsk'
label: '(GMT +7:00) Krasnoyarsk,Novosibirsk'
},
{
name: 'Asia/Hong_Kong',
label: '(GMT +8:00) Beijing, Chongqing, Hong Kong, Urumqi'
},
{
name: 'Asia/Irkutsk',
label: '(GMT +8:00) Irkutsk, Ulaan Bataar'
label: '(GMT +8:00) Irkutsk, Ulaanbaatar'
},
{
name: 'Asia/Singapore',
Expand Down
2 changes: 1 addition & 1 deletion ghost/admin/tests/integration/services/config-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ describe('Integration: Service: config-manager', function () {
const injection = this.owner.lookup('config:main');
const timezones = injection.availableTimezones;

expect(timezones.length).to.equal(67);
expect(timezones.length).to.equal(70);
expect(timezones[0].name).to.equal('Pacific/Pago_Pago');
expect(timezones[0].label).to.equal('(GMT -11:00) Midway Island, Samoa');
expect(timezones[1].name).to.equal('Pacific/Honolulu');
Expand Down
Loading