File tree Expand file tree Collapse file tree 1 file changed +4
-4
lines changed Expand file tree Collapse file tree 1 file changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -350,7 +350,7 @@ internal class RecurringZoneRules(
350
350
var offset = offsetAtYearStart
351
351
for (rule in rulesForYear(approximateYear)) {
352
352
if (instant < rule.transitionDateTime) {
353
- return offset
353
+ return rule.offsetBefore
354
354
}
355
355
offset = rule.offsetAfter
356
356
}
@@ -371,14 +371,14 @@ internal class RecurringZoneRules(
371
371
val ldtBefore = rule.transitionDateTime.toLocalDateTime(rule.offsetBefore)
372
372
val ldtAfter = rule.transitionDateTime.toLocalDateTime(rule.offsetAfter)
373
373
return if (localDateTime < ldtBefore && localDateTime < ldtAfter) {
374
- Regular (offset )
374
+ Regular (rule.offsetBefore )
375
375
} else if (localDateTime > ldtBefore && localDateTime >= ldtAfter) {
376
376
offset = rule.offsetAfter
377
377
continue
378
378
} else if (ldtAfter < ldtBefore) {
379
- Overlap (rule.transitionDateTime, offset , rule.offsetAfter)
379
+ Overlap (rule.transitionDateTime, rule.offsetBefore , rule.offsetAfter)
380
380
} else {
381
- Gap (rule.transitionDateTime, offset , rule.offsetAfter)
381
+ Gap (rule.transitionDateTime, rule.offsetBefore , rule.offsetAfter)
382
382
}
383
383
}
384
384
return Regular (offset)
You can’t perform that action at this time.
0 commit comments