From 483ecadedea8f94582a9ae506ee3e19839dda033 Mon Sep 17 00:00:00 2001
From: Johannes Mockenhaupt <git@jotomo.de>
Date: Wed, 7 Feb 2018 22:50:58 +0100
Subject: [PATCH] Fix dutch translation for Combo's last bolus, minor cleanup.

(cherry picked from commit c0cf06a)
---
 app/src/main/java/info/nightscout/utils/DateUtil.java | 4 ++--
 app/src/main/res/values-de/strings.xml                | 1 -
 app/src/main/res/values-es/strings.xml                | 1 -
 app/src/main/res/values-nl/strings.xml                | 1 -
 4 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/info/nightscout/utils/DateUtil.java b/app/src/main/java/info/nightscout/utils/DateUtil.java
index 1c3be368bf..102720ef1b 100644
--- a/app/src/main/java/info/nightscout/utils/DateUtil.java
+++ b/app/src/main/java/info/nightscout/utils/DateUtil.java
@@ -124,12 +124,12 @@ public class DateUtil {
 
     public static String minAgo(long time) {
         int mins = (int) ((System.currentTimeMillis() - time) / 1000 / 60);
-        return String.format(MainApp.sResources.getString(R.string.minago), mins);
+        return MainApp.gs(R.string.minago, mins);
     }
 
     public static String hourAgo(long time) {
         double hours = (System.currentTimeMillis() - time) / 1000d / 60 / 60;
-        return String.format(MainApp.sResources.getString(R.string.hoursago), hours);
+        return MainApp.gs(R.string.hoursago, hours);
     }
 
     private static LongSparseArray<String> timeStrings = new LongSparseArray<>();
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 2981f94cfe..e35e69cc38 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -722,7 +722,6 @@
     <string name="combo_pump_action_bolusing">Bolus (%.1f IE) wird abgegeben</string>
     <string name="alert_dialog_storage_permission_text">Bitte starte dein Telefon neu oder starte AndroidAPS in den System-Einstellungen neu. Andernfalls wird AndroidAPS nicht protokolliert (wichtig zum Nachverfolgen und Verifizieren, dass der Algorithmus korrekt funktioniert)</string>
     <string name="pump_tempbasal_label">TBR</string>
-    <string name="combo_last_bolus">%.1f %s (%s)</string>
     <string name="bolus_frequency_exceeded">Ein gleich großer Bolus wurde in den letzten zwei Minuten angefordert. Dies ist nicht zulässig, um ungewollte Doppelboli zu verhindern und vor eventuellen Bugs zu schützen.</string>
     <string name="combo_activity_reading_pump_history">Historie wird gelesen</string>
     <string name="combo_activity_setting_basal_profile">Basalratenprofil wird aktualisiert</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index cdc7f74175..e40add1e7c 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -750,7 +750,6 @@
     <string name="combo_pump_activity_label">Actividad</string>
     <string name="combo_no_pump_connection" formatted="false">Ninguna coneccnion por %d min</string>
     <string name="combo_tbr_remaining" formatted="false">%d%% (%d min restan)</string>
-    <string name="combo_last_bolus" formatted="false">%.1f U (%s, %s)</string>
     <string name="combo_pump_action_initializing">Iniciando</string>
     <string name="combo_pump_state_disconnected">Desconectado</string>
     <string name="combo_pump_state_suspended_due_to_error">Apagado por error</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 61bd323d73..9a5bd426ae 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -738,7 +738,6 @@
 	<string name="combo_pump_state_label">Status</string>
 	<string name="combo_no_pump_connection">Geen verbinding gedurende %d minuten</string>
     <string name="combo_tbr_remaining">%d%% (%d min resterend)</string>
-	<string name="combo_last_bolus">%.1f E (%s, %s)</string>
 	<string name="combo_pump_state_initializing">Initialiseren</string>
 	<string name="combo_pump_state_disconnected">Verbinding verbroken</string>
 	<string name="combo_error_bolus_recovery_progress">Herstel van verbroken verbindng</string>