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

Merge pull request #8948 from osmandapp/fix_8593

Browse source 
Fix_8593
This commit is contained in:
max-klaus 2020-05-13 18:49:49 +03:00 committed by GitHub
commit cbf80da2c6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1024,10 +1024,14 @@ public class OpeningHoursParser {
@Override
public String toRuleString() {
return toRuleString(daysStr, monthsStr);
return toRuleString(false);
}
private String toRuleString(String[] dayNames, String[] monthNames) {
private String toRuleString(boolean useLocalization) {
String[] dayNames = useLocalization ? localDaysStr : daysStr;
String[] monthNames = useLocalization ? localMothsStr : monthsStr;
String offStr = useLocalization ? additionalStrings.get("off") : "off";
StringBuilder b = new StringBuilder(25);
boolean allMonths = true;
for (int i = 0; i < months.length; i++) {
@ -1160,7 +1164,7 @@ public class OpeningHoursParser {
b.append("24/7 ");
}
if (off) {
b.append(additionalStrings.get("off"));
b.append(offStr);
}
} else {
if (isOpened24_7()) {
@ -1182,7 +1186,7 @@ public class OpeningHoursParser {
formatTime(enHour, enTime, b);
}
if (off) {
b.append(" ").append(additionalStrings.get("off"));
b.append(" ").append(offStr);
}
}
}
@ -1238,7 +1242,7 @@ public class OpeningHoursParser {
@Override
public String toLocalRuleString() {
return toRuleString(localDaysStr, localMothsStr);
return toRuleString(true);
}
@Override