Merge pull request #37 from NightscoutFoundation/tzachi-Datefromat

Fix use of android.text.format.DateFormat.format 'kk' represents the hours and not 'HH'.
NightscoutFoundation · Nov 14, 2016 · 61a692b · 61a692b
2 parents 43419f0 + 0406516
commit 61a692b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Models/JoH.java b/app/src/main/java/com/eveningoutpost/dexdrip/Models/JoH.java
@@ -444,11 +444,11 @@ public static String hourMinuteString() {
     }
 
     public static String hourMinuteString(long timestamp) {
-        return android.text.format.DateFormat.format("HH:mm", timestamp).toString();
+        return android.text.format.DateFormat.format("kk:mm", timestamp).toString();
     }
 
     public static String dateTimeText(long timestamp) {
-        return android.text.format.DateFormat.format("yyyy-MM-dd HH:mm:ss", timestamp).toString();
+        return android.text.format.DateFormat.format("yyyy-MM-dd kk:mm:ss", timestamp).toString();
     }
 
     public static String dateText(long timestamp) {