Merge branch 'master' into dev

This commit is contained in:
2019-11-16 23:00:26 -06:00
6 changed files with 31 additions and 11 deletions

View File

@@ -119,7 +119,7 @@ public class HabitsCSVExporter
{
String sane = sanitizeFilename(h.getName());
String habitDirName =
String.format("%03d %s", allHabits.indexOf(h) + 1, sane);
String.format(Locale.US, "%03d %s", allHabits.indexOf(h) + 1, sane);
habitDirName = habitDirName.trim() + "/";
new File(exportDirName + habitDirName).mkdirs();
@@ -202,7 +202,7 @@ public class HabitsCSVExporter
checksWriter.write(String.valueOf(checkmarks.get(j)[i]));
checksWriter.write(DELIMITER);
String score =
String.format("%.4f", ((float) scores.get(j)[i]));
String.format(Locale.US, "%.4f", ((float) scores.get(j)[i]));
scoresWriter.write(score);
scoresWriter.write(DELIMITER);
}

View File

@@ -172,7 +172,7 @@ public abstract class ScoreList implements Iterable<Score>
for (Score s : this)
{
String timestamp = dateFormat.format(s.getTimestamp().getUnixTime());
String score = String.format((Locale)null, "%.4f", s.getValue());
String score = String.format(Locale.US, "%.4f", s.getValue());
out.write(String.format("%s,%s\n", timestamp, score));
}
}