diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/DanaR/DanaRFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/DanaR/DanaRFragment.java index 4ec54cb37e..63186fc4db 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/DanaR/DanaRFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/DanaR/DanaRFragment.java @@ -200,7 +200,7 @@ public class DanaRFragment extends Fragment implements FragmentBase { if (DanaRPlugin.getDanaRPump().lastConnection.getTime() != 0) { Long agoMsec = new Date().getTime() - DanaRPlugin.getDanaRPump().lastConnection.getTime(); int agoMin = (int) (agoMsec / 60d / 1000d); - lastConnectionView.setText(formatTime.format(DanaRPlugin.getDanaRPump().lastConnection) + " (" + agoMin + " " + MainApp.sResources.getString(R.string.minago) + ")"); + lastConnectionView.setText(formatTime.format(DanaRPlugin.getDanaRPump().lastConnection) + " (" + String.format(MainApp.sResources.getString(R.string.minago), agoMin) + ")"); SetWarnColor.setColor(lastConnectionView, agoMin, 16d, 31d); } if (DanaRPlugin.getDanaRPump().lastBolusTime.getTime() != 0) { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/DanaRKorean/DanaRKoreanFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/DanaRKorean/DanaRKoreanFragment.java index 77e320c3a9..94beeea1f3 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/DanaRKorean/DanaRKoreanFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/DanaRKorean/DanaRKoreanFragment.java @@ -197,7 +197,7 @@ public class DanaRKoreanFragment extends Fragment implements FragmentBase { if (DanaRKoreanPlugin.getDanaRPump().lastConnection.getTime() != 0) { Long agoMsec = new Date().getTime() - DanaRKoreanPlugin.getDanaRPump().lastConnection.getTime(); int agoMin = (int) (agoMsec / 60d / 1000d); - lastConnectionView.setText(formatTime.format(DanaRKoreanPlugin.getDanaRPump().lastConnection) + " (" + agoMin + " " + MainApp.sResources.getString(R.string.minago) + ")"); + lastConnectionView.setText(formatTime.format(DanaRKoreanPlugin.getDanaRPump().lastConnection) + " (" + String.format(MainApp.sResources.getString(R.string.minago), agoMin) + ")"); SetWarnColor.setColor(lastConnectionView, agoMin, 16d, 31d); } // if (DanaRKoreanPlugin.getDanaRPump().lastBolusTime.getTime() != 0) { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java index 2df6dfc6be..c7760d7af7 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java @@ -82,7 +82,6 @@ import info.nightscout.utils.DateUtil; import info.nightscout.utils.DecimalFormatter; import info.nightscout.utils.Round; import info.nightscout.utils.SafeParse; -import info.nightscout.utils.ToastUtils; public class OverviewFragment extends Fragment { @@ -590,7 +589,7 @@ public class OverviewFragment extends Fragment { Long agoMsec = new Date().getTime() - lastBG.timeIndex; int agoMin = (int) (agoMsec / 60d / 1000d); - timeAgoView.setText(agoMin + " " + getString(R.string.minago)); + timeAgoView.setText(String.format(MainApp.sResources.getString(R.string.minago), agoMin)); // iob MainApp.getConfigBuilder().getActiveTreatments().updateTotalIOB(); diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/SmsCommunicator/SmsCommunicatorPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/SmsCommunicator/SmsCommunicatorPlugin.java index f878b5676f..fb05787a2a 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/SmsCommunicator/SmsCommunicatorPlugin.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/SmsCommunicator/SmsCommunicatorPlugin.java @@ -16,7 +16,6 @@ import java.text.Normalizer; import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.StringTokenizer; import info.nightscout.androidaps.Constants; import info.nightscout.androidaps.MainApp; @@ -212,7 +211,7 @@ public class SmsCommunicatorPlugin implements PluginBase { if (actualBG != null) { reply = MainApp.sResources.getString(R.string.actualbg) + " " + actualBG.valueToUnitsToString(units) + ", "; } else if (lastBG != null) { - reply = MainApp.sResources.getString(R.string.lastbg) + " " + lastBG.valueToUnitsToString(units) + " " + agoMin + MainApp.sResources.getString(R.string.minago) + ", "; + reply = MainApp.sResources.getString(R.string.lastbg) + " " + lastBG.valueToUnitsToString(units) + " " + String.format(MainApp.sResources.getString(R.string.minago), agoMin) + ", "; } DatabaseHelper.GlucoseStatus glucoseStatus = MainApp.getDbHelper().getGlucoseStatusData(); if (glucoseStatus != null) diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 9d833e5d01..72bab37a12 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -193,7 +193,6 @@ Макс. лимит на временен базал [Е/ч] Български Макс. лимит на не болус IOB подаван от openAPS - min ago Свързан Избраното устройство не съществува Прекъснат diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index bbb8aaf954..3746313c22 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -73,7 +73,6 @@ Nastaveno pumpou SMYČKA ZAKÁZÁNA OMEZENÍM Ručně spuštěno - m zpět Minimální trvání Záloha Ukončit @@ -376,4 +375,5 @@ Pera Glykémie: Poslední glykémie: + před %d min diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index b31207f125..9de913ce2d 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -176,7 +176,6 @@ Carbs constraint applied Reset Datenbanken Minimale Dauer - min ago Erneure treatments von NS Exit Fehlend diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index c87ec9529e..1d585c4912 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -74,7 +74,6 @@ Glucosa Delta Avg. delta - min antes Config Builder Objetivos diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 390757e27b..c0b1a65d53 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -75,7 +75,6 @@ 혈당 Delta Avg. delta - 분 전 Config Builder 목표 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ab184438f9..d5b7e123aa 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -76,7 +76,6 @@ Glucose Delta Avg. delta - m ago Config Builder Objectives @@ -389,4 +388,5 @@ MDI Ongoing Notification OLD DATA + %dmin ago