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-30 00:04:45 +02:00
commit 98c6b1e655
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -254,14 +254,14 @@ public class OpeningHoursParser {
return s.substring(0, s.length() - 2); return s.substring(0, s.length() - 2);
} }
public String toLocalStringNoMonths() { public String toLocalString() {
StringBuilder s = new StringBuilder(); StringBuilder s = new StringBuilder();
if (rules.isEmpty()) { if (rules.isEmpty()) {
return ""; return "";
} }
for (OpeningHoursRule r : rules) { for (OpeningHoursRule r : rules) {
s.append(r.toLocalRuleString()).append(";"); s.append(r.toLocalRuleString()).append("; ");
} }
return s.substring(0, s.length() - 2); return s.substring(0, s.length() - 2);

2
OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/AmenityMenuBuilder.java
View file

@ -248,7 +248,7 @@ public class AmenityMenuBuilder extends MenuBuilder {
OpeningHoursParser.OpeningHours rs = OpeningHoursParser.parseOpenedHours(amenity.getOpeningHours()); OpeningHoursParser.OpeningHours rs = OpeningHoursParser.parseOpenedHours(amenity.getOpeningHours());
if (rs != null) { if (rs != null) {
vl = rs.toLocalStringNoMonths(); vl = rs.toLocalString();
Calendar inst = Calendar.getInstance(); Calendar inst = Calendar.getInstance();
inst.setTimeInMillis(System.currentTimeMillis()); inst.setTimeInMillis(System.currentTimeMillis());
boolean opened = rs.isOpenedForTime(inst); boolean opened = rs.isOpenedForTime(inst);