Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Europe/LondonなどのUTC offsetが0のタイムゾーンの時にstartOf()やendOf()で時間がズレるバグを修正 #1

Merged
merged 2 commits into from
Dec 16, 2024
Merged
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
2 changes: 1 addition & 1 deletion locale.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{"key":"af","name":"Afrikaans"},{"key":"am","name":"Amharic"},{"key":"ar-kw","name":"Arabic (Kuwait)"},{"key":"ar-ly","name":"Arabic (Lybia)"},{"key":"ar-dz","name":"Arabic (Algeria)"},{"key":"ar-tn","name":" Arabic (Tunisia)"},{"key":"ar-sa","name":"Arabic (Saudi Arabia)"},{"key":"ar-ma","name":"Arabic (Morocco)"},{"key":"ar-iq","name":" Arabic (Iraq)"},{"key":"ar","name":"Arabic"},{"key":"az","name":"Azerbaijani"},{"key":"bg","name":"Bulgarian"},{"key":"bi","name":"Bislama"},{"key":"bm","name":"Bambara"},{"key":"be","name":"Belarusian"},{"key":"br","name":"Breton"},{"key":"bn-bd","name":"Bengali (Bangladesh)"},{"key":"ca","name":"Catalan"},{"key":"cs","name":"Czech"},{"key":"bs","name":"Bosnian"},{"key":"bn","name":"Bengali"},{"key":"cy","name":"Welsh"},{"key":"cv","name":"Chuvash"},{"key":"bo","name":"Tibetan"},{"key":"da","name":"Danish"},{"key":"de-ch","name":"German (Switzerland)"},{"key":"dv","name":"Maldivian"},{"key":"de-at","name":"German (Austria)"},{"key":"el","name":"Greek"},{"key":"en-au","name":"English (Australia)"},{"key":"de","name":"German"},{"key":"en-ca","name":"English (Canada)"},{"key":"en-ie","name":"English (Ireland)"},{"key":"en-in","name":"English (India)"},{"key":"en-il","name":"English (Israel)"},{"key":"en-nz","name":"English (New Zealand)"},{"key":"en-gb","name":"English (United Kingdom)"},{"key":"en-sg","name":"English (Singapore)"},{"key":"en-tt","name":"English (Trinidad & Tobago)"},{"key":"es-mx","name":"Spanish (Mexico)"},{"key":"es-us","name":"Spanish (United States)"},{"key":"eo","name":"Esperanto"},{"key":"es-pr","name":"Spanish (Puerto Rico)"},{"key":"es","name":"Spanish"},{"key":"en","name":"English"},{"key":"es-do","name":"Spanish (Dominican Republic)"},{"key":"fi","name":"Finnish"},{"key":"fr-ca","name":"French (Canada)"},{"key":"fr-ch","name":"French (Switzerland)"},{"key":"et","name":"Estonian"},{"key":"eu","name":"Basque"},{"key":"fa","name":"Persian"},{"key":"fr","name":"French"},{"key":"gd","name":"Scottish Gaelic"},{"key":"fy","name":"Frisian"},{"key":"gom-latn","name":"Konkani Latin script"},{"key":"gu","name":"Gujarati"},{"key":"he","name":"Hebrew"},{"key":"ga","name":"Irish or Irish Gaelic"},{"key":"hi","name":"Hindi"},{"key":"gl","name":"Galician"},{"key":"hy-am","name":"Armenian"},{"key":"hu","name":"Hungarian"},{"key":"fo","name":"Faroese"},{"key":"is","name":"Icelandic"},{"key":"hr","name":"Croatian"},{"key":"ht","name":"Haitian Creole (Haiti)"},{"key":"it-ch","name":"Italian (Switzerland)"},{"key":"id","name":"Indonesian"},{"key":"kk","name":"Kazakh"},{"key":"jv","name":"Javanese"},{"key":"it","name":"Italian"},{"key":"kn","name":"Kannada"},{"key":"km","name":"Cambodian"},{"key":"ku","name":"Kurdish"},{"key":"lb","name":"Luxembourgish"},{"key":"ky","name":"Kyrgyz"},{"key":"lo","name":"Lao"},{"key":"ka","name":"Georgian"},{"key":"mi","name":"Maori"},{"key":"ko","name":"Korean"},{"key":"lt","name":"Lithuanian"},{"key":"mn","name":"Mongolian"},{"key":"ml","name":"Malayalam"},{"key":"mk","name":"Macedonian"},{"key":"ms-my","name":"Malay"},{"key":"ms","name":"Malay"},{"key":"mt","name":"Maltese (Malta)"},{"key":"nb","name":"Norwegian Bokmål"},{"key":"nl-be","name":"Dutch (Belgium)"},{"key":"ja","name":"Japanese"},{"key":"ne","name":"Nepalese"},{"key":"me","name":"Montenegrin"},{"key":"nl","name":"Dutch"},{"key":"oc-lnc","name":"Occitan, lengadocian dialecte"},{"key":"pl","name":"Polish"},{"key":"mr","name":"Marathi"},{"key":"lv","name":"Latvian"},{"key":"rw","name":"Kinyarwanda (Rwanda)"},{"key":"pa-in","name":"Punjabi (India)"},{"key":"pt","name":"Portuguese"},{"key":"ro","name":"Romanian"},{"key":"nn","name":"Nynorsk"},{"key":"ru","name":"Russian"},{"key":"sd","name":"Sindhi"},{"key":"se","name":"Northern Sami"},{"key":"sl","name":"Slovenian"},{"key":"sq","name":"Albanian"},{"key":"my","name":"Burmese"},{"key":"rn","name":"Kirundi"},{"key":"sk","name":"Slovak"},{"key":"sr","name":"Serbian"},{"key":"ss","name":"siSwati"},{"key":"si","name":"Sinhalese"},{"key":"sv-fi","name":"Finland Swedish"},{"key":"sw","name":"Swahili"},{"key":"sv","name":"Swedish"},{"key":"ta","name":"Tamil"},{"key":"te","name":"Telugu"},{"key":"tet","name":"Tetun Dili (East Timor)"},{"key":"th","name":"Thai"},{"key":"tg","name":"Tajik"},{"key":"tlh","name":"Klingon"},{"key":"pt-br","name":"Portuguese (Brazil)"},{"key":"tzm-latn","name":"Central Atlas Tamazight Latin"},{"key":"tl-ph","name":"Tagalog (Philippines)"},{"key":"tzm","name":"Central Atlas Tamazight"},{"key":"sr-cyrl","name":"Serbian Cyrillic"},{"key":"tr","name":"Turkish"},{"key":"ug-cn","name":"Uyghur (China)"},{"key":"uz","name":"Uzbek"},{"key":"uz-latn","name":"Uzbek Latin"},{"key":"ur","name":"Urdu"},{"key":"yo","name":"Yoruba Nigeria"},{"key":"x-pseudo","name":"Pseudo"},{"key":"zh-cn","name":"Chinese (China)"},{"key":"zh-hk","name":"Chinese (Hong Kong)"},{"key":"zh-tw","name":"Chinese (Taiwan)"},{"key":"zh","name":"Chinese"},{"key":"vi","name":"Vietnamese"},{"key":"uk","name":"Ukrainian"},{"key":"tk","name":"Turkmen"},{"key":"tzl","name":"Talossan"}]
[{"key":"af","name":"Afrikaans"},{"key":"am","name":"Amharic"},{"key":"ar-dz","name":"Arabic (Algeria)"},{"key":"ar-iq","name":" Arabic (Iraq)"},{"key":"ar-sa","name":"Arabic (Saudi Arabia)"},{"key":"ar-ly","name":"Arabic (Lybia)"},{"key":"ar-ma","name":"Arabic (Morocco)"},{"key":"ar","name":"Arabic"},{"key":"ar-tn","name":" Arabic (Tunisia)"},{"key":"az","name":"Azerbaijani"},{"key":"bg","name":"Bulgarian"},{"key":"be","name":"Belarusian"},{"key":"bi","name":"Bislama"},{"key":"bm","name":"Bambara"},{"key":"bn-bd","name":"Bengali (Bangladesh)"},{"key":"bn","name":"Bengali"},{"key":"bo","name":"Tibetan"},{"key":"br","name":"Breton"},{"key":"bs","name":"Bosnian"},{"key":"cs","name":"Czech"},{"key":"ar-kw","name":"Arabic (Kuwait)"},{"key":"ca","name":"Catalan"},{"key":"cv","name":"Chuvash"},{"key":"cy","name":"Welsh"},{"key":"da","name":"Danish"},{"key":"de-at","name":"German (Austria)"},{"key":"de-ch","name":"German (Switzerland)"},{"key":"dv","name":"Maldivian"},{"key":"de","name":"German"},{"key":"en-au","name":"English (Australia)"},{"key":"en-ca","name":"English (Canada)"},{"key":"en-gb","name":"English (United Kingdom)"},{"key":"en","name":"English"},{"key":"en-ie","name":"English (Ireland)"},{"key":"en-il","name":"English (Israel)"},{"key":"en-in","name":"English (India)"},{"key":"en-nz","name":"English (New Zealand)"},{"key":"en-sg","name":"English (Singapore)"},{"key":"en-tt","name":"English (Trinidad & Tobago)"},{"key":"eo","name":"Esperanto"},{"key":"es-mx","name":"Spanish (Mexico)"},{"key":"el","name":"Greek"},{"key":"es-do","name":"Spanish (Dominican Republic)"},{"key":"es-pr","name":"Spanish (Puerto Rico)"},{"key":"es","name":"Spanish"},{"key":"es-us","name":"Spanish (United States)"},{"key":"eu","name":"Basque"},{"key":"fr-ca","name":"French (Canada)"},{"key":"fo","name":"Faroese"},{"key":"et","name":"Estonian"},{"key":"fr-ch","name":"French (Switzerland)"},{"key":"fa","name":"Persian"},{"key":"fi","name":"Finnish"},{"key":"fr","name":"French"},{"key":"ga","name":"Irish or Irish Gaelic"},{"key":"fy","name":"Frisian"},{"key":"gl","name":"Galician"},{"key":"gu","name":"Gujarati"},{"key":"gd","name":"Scottish Gaelic"},{"key":"hi","name":"Hindi"},{"key":"he","name":"Hebrew"},{"key":"hr","name":"Croatian"},{"key":"gom-latn","name":"Konkani Latin script"},{"key":"ht","name":"Haitian Creole (Haiti)"},{"key":"hy-am","name":"Armenian"},{"key":"is","name":"Icelandic"},{"key":"id","name":"Indonesian"},{"key":"it-ch","name":"Italian (Switzerland)"},{"key":"hu","name":"Hungarian"},{"key":"ja","name":"Japanese"},{"key":"it","name":"Italian"},{"key":"ka","name":"Georgian"},{"key":"kk","name":"Kazakh"},{"key":"kn","name":"Kannada"},{"key":"km","name":"Cambodian"},{"key":"ko","name":"Korean"},{"key":"jv","name":"Javanese"},{"key":"ku","name":"Kurdish"},{"key":"ky","name":"Kyrgyz"},{"key":"lt","name":"Lithuanian"},{"key":"lo","name":"Lao"},{"key":"me","name":"Montenegrin"},{"key":"mi","name":"Maori"},{"key":"mk","name":"Macedonian"},{"key":"ml","name":"Malayalam"},{"key":"mn","name":"Mongolian"},{"key":"mr","name":"Marathi"},{"key":"lv","name":"Latvian"},{"key":"mt","name":"Maltese (Malta)"},{"key":"nb","name":"Norwegian Bokmål"},{"key":"ne","name":"Nepalese"},{"key":"nl-be","name":"Dutch (Belgium)"},{"key":"nl","name":"Dutch"},{"key":"nn","name":"Nynorsk"},{"key":"ms","name":"Malay"},{"key":"my","name":"Burmese"},{"key":"oc-lnc","name":"Occitan, lengadocian dialecte"},{"key":"pa-in","name":"Punjabi (India)"},{"key":"ms-my","name":"Malay"},{"key":"pl","name":"Polish"},{"key":"pt-br","name":"Portuguese (Brazil)"},{"key":"pt","name":"Portuguese"},{"key":"rn","name":"Kirundi"},{"key":"ro","name":"Romanian"},{"key":"ru","name":"Russian"},{"key":"lb","name":"Luxembourgish"},{"key":"sd","name":"Sindhi"},{"key":"sq","name":"Albanian"},{"key":"sr-cyrl","name":"Serbian Cyrillic"},{"key":"si","name":"Sinhalese"},{"key":"sk","name":"Slovak"},{"key":"sr","name":"Serbian"},{"key":"rw","name":"Kinyarwanda (Rwanda)"},{"key":"ss","name":"siSwati"},{"key":"sv-fi","name":"Finland Swedish"},{"key":"sw","name":"Swahili"},{"key":"sv","name":"Swedish"},{"key":"ta","name":"Tamil"},{"key":"te","name":"Telugu"},{"key":"se","name":"Northern Sami"},{"key":"tet","name":"Tetun Dili (East Timor)"},{"key":"tg","name":"Tajik"},{"key":"tlh","name":"Klingon"},{"key":"th","name":"Thai"},{"key":"tr","name":"Turkish"},{"key":"tk","name":"Turkmen"},{"key":"tzl","name":"Talossan"},{"key":"tzm-latn","name":"Central Atlas Tamazight Latin"},{"key":"ug-cn","name":"Uyghur (China)"},{"key":"uk","name":"Ukrainian"},{"key":"ur","name":"Urdu"},{"key":"tzm","name":"Central Atlas Tamazight"},{"key":"uz-latn","name":"Uzbek Latin"},{"key":"uz","name":"Uzbek"},{"key":"vi","name":"Vietnamese"},{"key":"x-pseudo","name":"Pseudo"},{"key":"yo","name":"Yoruba Nigeria"},{"key":"zh-tw","name":"Chinese (Taiwan)"},{"key":"zh","name":"Chinese"},{"key":"zh-cn","name":"Chinese (China)"},{"key":"tl-ph","name":"Tagalog (Philippines)"},{"key":"sl","name":"Slovenian"},{"key":"zh-hk","name":"Chinese (Hong Kong)"}]
2 changes: 1 addition & 1 deletion plugin/timezone.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion plugin/utc.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/plugin/timezone/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ export default (o, c, d) => {
const target = date.toLocaleString('en-US', { timeZone: timezone })
const diff = Math.round((date - new Date(target)) / 1000 / 60)
let ins = d(target, { locale: this.$L }).$set(MS, this.$ms)
.utcOffset((-Math.round(date.getTimezoneOffset() / 15) * 15) - diff, true)
.utcOffset((-Math.round(date.getTimezoneOffset() / 15) * 15) - diff, true, timezone !== 'UTC')
if (keepLocalTime) {
const newOffset = ins.utcOffset()
ins = ins.add(oldOffset - newOffset, MIN)
Expand Down Expand Up @@ -135,7 +135,7 @@ export default (o, c, d) => {
}
const localTs = d.utc(input, parseFormat).valueOf()
const [targetTs, targetOffset] = fixOffset(localTs, previousOffset, timezone)
const ins = d(targetTs).utcOffset(targetOffset)
const ins = d(targetTs).utcOffset(targetOffset, false, timezone !== 'UTC')
ins.$x.$timezone = timezone
return ins
}
Expand Down
Loading
Loading