Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
e53a785725
1 changed files with 4 additions and 4 deletions
|
@ -154,18 +154,18 @@ public class OpeningHoursParser {
|
|||
for (OpeningHoursRule r : rules) {
|
||||
if (r.containsPreviousDay(cal) && r.containsMonth(cal)) {
|
||||
if (r.isOpenedForTime(cal, true)) {
|
||||
ruleOpen = r.toRuleString(true);
|
||||
ruleOpen = r.toLocalRuleString();
|
||||
} else {
|
||||
ruleClosed = r.toRuleString(true);
|
||||
ruleClosed = r.toLocalRuleString();
|
||||
}
|
||||
}
|
||||
}
|
||||
for (OpeningHoursRule r : rules) {
|
||||
if (r.containsDay(cal) && r.containsMonth(cal)) {
|
||||
if (r.isOpenedForTime(cal, false)) {
|
||||
ruleOpen = r.toRuleString(true);
|
||||
ruleOpen = r.toLocalRuleString();
|
||||
} else {
|
||||
ruleClosed = r.toRuleString(true);
|
||||
ruleClosed = r.toLocalRuleString();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue