Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2016-08-13 14:49:43 +02:00
commit e53a785725
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
OsmAnd-java/src/net/osmand/util/OpeningHoursParser.java
View file

@ -154,18 +154,18 @@ public class OpeningHoursParser {
for (OpeningHoursRule r : rules) { for (OpeningHoursRule r : rules) {
if (r.containsPreviousDay(cal) && r.containsMonth(cal)) { if (r.containsPreviousDay(cal) && r.containsMonth(cal)) {
if (r.isOpenedForTime(cal, true)) { if (r.isOpenedForTime(cal, true)) {
ruleOpen = r.toRuleString(true); ruleOpen = r.toLocalRuleString();
} else { } else {
ruleClosed = r.toRuleString(true); ruleClosed = r.toLocalRuleString();
} }
} }
} }
for (OpeningHoursRule r : rules) { for (OpeningHoursRule r : rules) {
if (r.containsDay(cal) && r.containsMonth(cal)) { if (r.containsDay(cal) && r.containsMonth(cal)) {
if (r.isOpenedForTime(cal, false)) { if (r.isOpenedForTime(cal, false)) {
ruleOpen = r.toRuleString(true); ruleOpen = r.toLocalRuleString();
} else { } else {
ruleClosed = r.toRuleString(true); ruleClosed = r.toLocalRuleString();
} }
} }
} }