diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java index f1bd80e207..9688ac10de 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java @@ -417,7 +417,7 @@ public class ComboPlugin implements PluginBase, PumpInterface, ConstraintsInterf Bolus lastKnownBolus = pump.lastBolus; try { - pump.activity = MainApp.sResources.getString(R.string.combo_pump_action_bolusing); + pump.activity = MainApp.sResources.getString(R.string.combo_pump_action_bolusing, detailedBolusInfo.insulin); MainApp.bus().post(new EventComboPumpUpdateGUI()); // refresh pump data @@ -538,7 +538,8 @@ public class ComboPlugin implements PluginBase, PumpInterface, ConstraintsInterf } int finalAdjustedPercent = adjustedPercent; - CommandResult commandResult = runCommand(MainApp.sResources.getString(R.string.combo_pump_action_setting_tbr), 3, () -> ruffyScripter.setTbr(finalAdjustedPercent, durationInMinutes)); + CommandResult commandResult = runCommand(MainApp.sResources.getString(R.string.combo_pump_action_setting_tbr, percent, durationInMinutes), + 3, () -> ruffyScripter.setTbr(finalAdjustedPercent, durationInMinutes)); if (!commandResult.success) { return new PumpEnactResult().success(false).enacted(false); } diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 6934f628ea..638e633fa9 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -691,6 +691,6 @@ Statistiken Bolusabgabe wird vorbereitet TBR wird abgebrochen - TBR wird gesetzt - Bolus wird abgegeben + TBR wird gesetzt (%d%% / %d min) + Bolus (%.1f E) wird abgegeben diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d4d5701117..8f982ccd4f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -779,8 +779,8 @@ Running Checking pump history Cancelling TBR - Setting TBR - Bolusing + Setting TBR (%d%% / %d min) + Bolusing (%.1f U) Refreshing raise_urgent_alarms_as_android_notification Use system notifications for alerts