From 9f946229bc5d7f21d43ef9268a704515dd211646 Mon Sep 17 00:00:00 2001
From: Johannes Mockenhaupt <git@jotomo.de>
Date: Wed, 22 Nov 2017 14:48:05 +0100
Subject: [PATCH] Slightly improve the dialogs.

---
 .../plugins/PumpCombo/ComboAlertHistoryDialog.java        | 6 +++---
 .../plugins/PumpCombo/ComboTddHistoryDialog.java          | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboAlertHistoryDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboAlertHistoryDialog.java
index f9b7c968f2..fc62e63000 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboAlertHistoryDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboAlertHistoryDialog.java
@@ -19,11 +19,11 @@ public class ComboAlertHistoryDialog extends DialogFragment {
         View layout = inflater.inflate(R.layout.combo_alert_history_fragment, container, false);
         TextView text = (TextView) layout.findViewById(R.id.combo_error_history_text);
         List<PumpAlert> errors = ComboPlugin.getPlugin().getPump().errorHistory;
-        StringBuilder sb = new StringBuilder();
-        DateFormat dateFormatter = DateFormat.getDateInstance();
         if (errors.isEmpty()) {
             text.setText(R.string.combo_empty_alert_history_note);
         } else {
+            StringBuilder sb = new StringBuilder();
+            DateFormat dateTimeFormatter = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT);
             boolean first = true;
             for (PumpAlert error : errors) {
                 if (first) {
@@ -31,7 +31,7 @@ public class ComboAlertHistoryDialog extends DialogFragment {
                 } else {
                     sb.append("\n");
                 }
-                sb.append(dateFormatter.format(error.timestamp));
+                sb.append(dateTimeFormatter.format(error.timestamp));
                 sb.append("  ");
                 sb.append(error.message);
                 if (error.warningCode != null) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboTddHistoryDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboTddHistoryDialog.java
index 4af521ff29..6bd94215cd 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboTddHistoryDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboTddHistoryDialog.java
@@ -9,6 +9,7 @@ import android.widget.TextView;
 
 import java.text.DateFormat;
 import java.util.List;
+import java.util.Locale;
 
 import de.jotomo.ruffy.spi.history.Tdd;
 import info.nightscout.androidaps.R;
@@ -19,12 +20,12 @@ public class ComboTddHistoryDialog extends DialogFragment {
         View layout = inflater.inflate(R.layout.combo_tdd_history_fragment, container, false);
         TextView text = (TextView) layout.findViewById(R.id.combo_tdd_history_text);
         List<Tdd> tdds = ComboPlugin.getPlugin().getPump().tddHistory;
-        StringBuilder sb = new StringBuilder();
-        DateFormat dateFormatter = DateFormat.getDateInstance();
         if (tdds.isEmpty()) {
             text.setText(R.string.combo_empty_tdd_history_note);
         } else {
             boolean first = true;
+            StringBuilder sb = new StringBuilder();
+            DateFormat dateFormatter = DateFormat.getDateInstance();
             for (Tdd tdd : tdds) {
                 if (first) {
                     first = false;
@@ -33,8 +34,7 @@ public class ComboTddHistoryDialog extends DialogFragment {
                 }
                 sb.append(dateFormatter.format(tdd.timestamp));
                 sb.append("  ");
-                // TODO i18n
-                sb.append(String.format("%.1f", tdd.total));
+                sb.append(String.format(Locale.getDefault(), "%3.1f", tdd.total));
                 sb.append(" U");
             }
             text.setText(sb.toString());