Release 2.2.1 (#125)

* Don't limit the recommended meal bolus with Max IOB, unlike insulinReq for SMBs.

* Display when Max IOB setting = 0 and closed loop. For new loopers.

* Only display warning about expected ≠ minDelta when difference is more (or less) than 2 mg/dl

* Remove duplicate code after bad merge. Remove superfluous info in bolus alert. 

* Crowdin updates.

Config.xcconfig

@@ -1,5 +1,5 @@
 APP_DISPLAY_NAME = iAPS
-APP_VERSION = 2.2.0
+APP_VERSION = 2.2.1
 APP_BUILD_NUMBER = 1
 COPYRIGHT_NOTICE =
 DEVELOPER_TEAM = ##TEAM_ID##

FreeAPS/Sources/Localizations/Main/ar.lproj/Localizable.strings

@@ -1299,7 +1299,7 @@ Enact a temp Basal or a temp target */
 "(Eventual Glucose - Target) / ISF" = "(Eventual Glucose - Target) / ISF";
 
 /* */
-"Formula =" = "Formula =";
+"Formula:" = "Formula:";
 
 /* Bolus pop-up footer */
 "Carbs and previous insulin are included in the glucose prediction, but if the Eventual Glucose is lower than the Target Glucose, a bolus will not be recommended." = "Carbs and previous insulin are included in the glucose prediction, but if the Eventual Glucose is lower than the Target Glucose, a bolus will not be recommended.";

FreeAPS/Sources/Localizations/Main/da.lproj/Localizable.strings

@@ -1300,7 +1300,7 @@ Enact a temp Basal or a temp target */
 "(Eventual Glucose - Target) / ISF" = "(Eventual Glucose - Target) / ISF";
 
 /* */
-"Formula =" = "Formula =";
+"Formula:" = "Formula:";
 
 /* Bolus pop-up footer */
 "Carbs and previous insulin are included in the glucose prediction, but if the Eventual Glucose is lower than the Target Glucose, a bolus will not be recommended." = "Carbs and previous insulin are included in the glucose prediction, but if the Eventual Glucose is lower than the Target Glucose, a bolus will not be recommended.";

FreeAPS/Sources/Localizations/Main/de.lproj/Localizable.strings

@@ -1164,8 +1164,6 @@ Enact a temp Basal or a temp target */
 /* */
 "Normal " = "im Zielbereich ";
 
-"Currently no Override active" = "Derzeit keine Überschreibung aktiv";
-
 /* */
 "Total Insulin Adjustment" = "Gesamte Insulinanpassung";
 
@@ -1298,10 +1296,10 @@ Enact a temp Basal or a temp target */
 "Insulin Sensitivity" = "Insulin Empfindlichkeit";
 
 /* Formula displayed in Bolus info pop-up. Make translation short! */
-"(Eventual Glucose - Target) / ISF" = "(Eventual Glucose - Target) / ISF";
+"(Eventual Glucose - Target) / ISF" = "(Prognostizierte Glukose - Ziel) / ISF";
 
 /* */
-"Formula =" = "Formula =";
+"Formula:" = "Formel:";
 
 /* Bolus pop-up footer */
 "Carbs and previous insulin are included in the glucose prediction, but if the Eventual Glucose is lower than the Target Glucose, a bolus will not be recommended." = "Kohlenhydrate und vorheriges Insulin sind in der Glukose-Vorhersage enthalten aber wenn das Endergebnis niedriger als das Target-Glukose ist, wird ein Bolus nicht empfohlen.";
@@ -1310,31 +1308,31 @@ Enact a temp Basal or a temp target */
 "Hide" = "Ausblenden";
 
 /* Bolus pop-up / Alert string. Make translations concise! */
-"Eventual Glucose > Target Glucose, but glucose is predicted to drop down to " = "Eventual Glucose > Target Glucose, but glucose is predicted to first drop down to ";
+"Eventual Glucose > Target Glucose, but glucose is predicted to drop down to " = "Prognostizierte Glukose > Glukose des Ziels, aber Glukose wird voraussichtlich zum ersten Mal herunterfallen auf ";
 
 /* Bolus pop-up / Alert string. Make translations concise! */
-"which is below your Threshold (" = "which is below your Threshold (";
+"which is below your Threshold (" = "die unter Ihrem Grenzwert liegen (";
 
 /* Bolus pop-up / Alert string. Make translations concise! */
-"Eventual Glucose > Target Glucose, but glucose is climbing slower than expected. Expected: " = "Eventual Glucose > Target Glucose, but glucose is climbing slower than expected. Expected: ";
+"Eventual Glucose > Target Glucose, but glucose is climbing slower than expected. Expected: " = "Prognostizierte Glukose > Glukose des Ziels Glukose, aber die Glukose fällt schneller als erwartet. Erwartet: ";
 
 //* Bolus pop-up / Alert string. Make translations concise! */
-". Climbing: " = ". Climbing: ";
+". Climbing: " = ". Erhöhung: ";
 
 /* Bolus pop-up / Alert string. Make translations concise! */
-"Eventual Glucose > Target Glucose, but glucose is falling faster than expected. Expected: " = "Eventual Glucose > Target Glucose, but glucose is falling faster than expected. Expected: ";
+"Eventual Glucose > Target Glucose, but glucose is falling faster than expected. Expected: " = "Prognostizierte Glukose > Glukose des Ziels Glukose, aber die Glukose fällt schneller als erwartet. Erwartet: ";
 
 /* Bolus pop-up / Alert string. Make translations concise! */
-". Falling: " = ". Falling: ";
+". Falling: " = ". Rückgang: ";
 
 /* Bolus pop-up / Alert string. Make translations concise! */
-"Eventual Glucose > Target Glucose, but glucose is changing faster than expected. Expected: " = "Eventual Glucose > Target Glucose, but glucose is changing faster than expected. Expected: ";
+"Eventual Glucose > Target Glucose, but glucose is changing faster than expected. Expected: " = "Prognostizierte Glukose > Glukose des Ziels Glukose, aber die Glukose fällt schneller als erwartet. Erwartet: ";
 
 /* Bolus pop-up / Alert string. Make translations concise! */
-". Changing: " = ". Changing: ";
+". Changing: " = ". Änderung: ";
 
 /* Add insulin without bolusing alert */
-" without bolusing" = " without bolusing";
+" without bolusing" = " Ohne tatsächliche Bolusabgabe";
 
 /* -------------------------------------------------------------------------------------------
   DASH strings

FreeAPS/Sources/Localizations/Main/en.lproj/Localizable.strings

@@ -1302,7 +1302,7 @@ Enact a temp Basal or a temp target */
 "(Eventual Glucose - Target) / ISF" = "(Eventual Glucose - Target) / ISF";
 
 /* */
-"Formula =" = "Formula =";
+"Formula:" = "Formula:";
 
 /* Bolus pop-up footer */
 "Carbs and previous insulin are included in the glucose prediction, but if the Eventual Glucose is lower than the Target Glucose, a bolus will not be recommended." = "Carbs and previous insulin are included in the glucose prediction, but if the Eventual Glucose is lower than the Target Glucose, a bolus will not be recommended.";

FreeAPS/Sources/Localizations/Main/es.lproj/Localizable.strings

@@ -1299,7 +1299,7 @@ Enact a temp Basal or a temp target */
 "(Eventual Glucose - Target) / ISF" = "(Eventual Glucose - Target) / ISF";
 
 /* */
-"Formula =" = "Formula =";
+"Formula:" = "Formula:";
 
 /* Bolus pop-up footer */
 "Carbs and previous insulin are included in the glucose prediction, but if the Eventual Glucose is lower than the Target Glucose, a bolus will not be recommended." = "Carbs and previous insulin are included in the glucose prediction, but if the Eventual Glucose is lower than the Target Glucose, a bolus will not be recommended.";

FreeAPS/Sources/Localizations/Main/fi.lproj/Localizable.strings

@@ -1299,7 +1299,7 @@ Enact a temp Basal or a temp target */
 "(Eventual Glucose - Target) / ISF" = "(Eventual Glucose - Target) / ISF";
 
 /* */
-"Formula =" = "Formula =";
+"Formula:" = "Formula:";
 
 /* Bolus pop-up footer */
 "Carbs and previous insulin are included in the glucose prediction, but if the Eventual Glucose is lower than the Target Glucose, a bolus will not be recommended." = "Carbs and previous insulin are included in the glucose prediction, but if the Eventual Glucose is lower than the Target Glucose, a bolus will not be recommended.";

FreeAPS/Sources/Localizations/Main/fr.lproj/Localizable.strings

@@ -1299,7 +1299,7 @@ Enact a temp Basal or a temp target */
 "(Eventual Glucose - Target) / ISF" = "(Eventual Glucose - Target) / ISF";
 
 /* */
-"Formula =" = "Formula =";
+"Formula:" = "Formula:";
 
 /* Bolus pop-up footer */
 "Carbs and previous insulin are included in the glucose prediction, but if the Eventual Glucose is lower than the Target Glucose, a bolus will not be recommended." = "Carbs and previous insulin are included in the glucose prediction, but if the Eventual Glucose is lower than the Target Glucose, a bolus will not be recommended.";

FreeAPS/Sources/Localizations/Main/he.lproj/Localizable.strings

@@ -1299,7 +1299,7 @@ Enact a temp Basal or a temp target */
 "(Eventual Glucose - Target) / ISF" = "(Eventual Glucose - Target) / ISF";
 
 /* */
-"Formula =" = "Formula =";
+"Formula:" = "Formula:";
 
 /* Bolus pop-up footer */
 "Carbs and previous insulin are included in the glucose prediction, but if the Eventual Glucose is lower than the Target Glucose, a bolus will not be recommended." = "Carbs and previous insulin are included in the glucose prediction, but if the Eventual Glucose is lower than the Target Glucose, a bolus will not be recommended.";

FreeAPS/Sources/Localizations/Main/it.lproj/Localizable.strings

@@ -1164,8 +1164,6 @@ Enact a temp Basal or a temp target */
 /* */
 "Normal " = "Normale ";
 
-"Currently no Override active" = "Attualmente nessuna regolazione attiva";
-
 /* */
 "Total Insulin Adjustment" = "Regolazione Insulina Totale";
 
@@ -1301,7 +1299,7 @@ Enact a temp Basal or a temp target */
 "(Eventual Glucose - Target) / ISF" = "(Eventual Glucose - Target) / ISF";
 
 /* */
-"Formula =" = "Formula =";
+"Formula:" = "Formula:";
 
 /* Bolus pop-up footer */
 "Carbs and previous insulin are included in the glucose prediction, but if the Eventual Glucose is lower than the Target Glucose, a bolus will not be recommended." = "Carbs and previous insulin are included in the glucose prediction, but if the Eventual Glucose is lower than the Target Glucose, a bolus will not be recommended.";

FreeAPS/Sources/Localizations/Main/nb.lproj/Localizable.strings

@@ -1299,7 +1299,7 @@ Enact a temp Basal or a temp target */
 "(Eventual Glucose - Target) / ISF" = "(Beregnet blodsukker - Blodsukkermål) / ISF";
 
 /* */
-"Formula =" = "Formel =";
+"Formula:" = "Formel:";
 
 /* Bolus pop-up footer */
 "Carbs and previous insulin are included in the glucose prediction, but if the Eventual Glucose is lower than the Target Glucose, a bolus will not be recommended." = "Karbohydrater og tidligere insulin er inkludert i blodsukkerprognosen, men hvis Beregnet Blodsukker er lavere enn Blodsukkermål, anbefales det ikke en bolusdose.";

FreeAPS/Sources/Localizations/Main/nl.lproj/Localizable.strings

@@ -1164,8 +1164,6 @@ Enact a temp Basal or a temp target */
 /* */
 "Normal " = "Normaal ";
 
-"Currently no Override active" = "Op dit moment geen 'Overschrijving' actief";
-
 /* */
 "Total Insulin Adjustment" = "Totale insuline aanpassing";
 
@@ -1301,7 +1299,7 @@ Enact a temp Basal or a temp target */
 "(Eventual Glucose - Target) / ISF" = "(Voorspelde glucose - doel) / ISF";
 
 /* */
-"Formula =" = "Formule";
+"Formula:" = "Formule:";
 
 /* Bolus pop-up footer */
 "Carbs and previous insulin are included in the glucose prediction, but if the Eventual Glucose is lower than the Target Glucose, a bolus will not be recommended." = "Koolhydraten en vorige insuline zijn opgenomen in de glucosevoorspelling, maar als de uiteindelijke glucose lager is dan het doelglucose, wordt een bolus niet aangeraden.";

FreeAPS/Sources/Localizations/Main/pl.lproj/Localizable.strings

@@ -1301,7 +1301,7 @@ Połączono z Nightscout!";
 "(Eventual Glucose - Target) / ISF" = "(Eventual Glucose - Target) / ISF";
 
 /* */
-"Formula =" = "Formula =";
+"Formula:" = "Formula:";
 
 /* Bolus pop-up footer */
 "Carbs and previous insulin are included in the glucose prediction, but if the Eventual Glucose is lower than the Target Glucose, a bolus will not be recommended." = "Carbs and previous insulin are included in the glucose prediction, but if the Eventual Glucose is lower than the Target Glucose, a bolus will not be recommended.";

FreeAPS/Sources/Localizations/Main/pt-BR.lproj/Localizable.strings

@@ -1299,7 +1299,7 @@ Enact a temp Basal or a temp target */
 "(Eventual Glucose - Target) / ISF" = "(Eventual Glucose - Target) / ISF";
 
 /* */
-"Formula =" = "Formula =";
+"Formula:" = "Formula:";
 
 /* Bolus pop-up footer */
 "Carbs and previous insulin are included in the glucose prediction, but if the Eventual Glucose is lower than the Target Glucose, a bolus will not be recommended." = "Carbs and previous insulin are included in the glucose prediction, but if the Eventual Glucose is lower than the Target Glucose, a bolus will not be recommended.";

FreeAPS/Sources/Localizations/Main/pt-PT.lproj/Localizable.strings

@@ -1299,7 +1299,7 @@ Enact a temp Basal or a temp target */
 "(Eventual Glucose - Target) / ISF" = "(Eventual Glucose - Target) / ISF";
 
 /* */
-"Formula =" = "Formula =";
+"Formula:" = "Formula:";
 
 /* Bolus pop-up footer */
 "Carbs and previous insulin are included in the glucose prediction, but if the Eventual Glucose is lower than the Target Glucose, a bolus will not be recommended." = "Carbs and previous insulin are included in the glucose prediction, but if the Eventual Glucose is lower than the Target Glucose, a bolus will not be recommended.";

FreeAPS/Sources/Localizations/Main/ru.lproj/Localizable.strings

@@ -1299,7 +1299,7 @@ Enact a temp Basal or a temp target */
 "(Eventual Glucose - Target) / ISF" = "(Eventual Glucose - Target) / ISF";
 
 /* */
-"Formula =" = "Formula =";
+"Formula:" = "Formula:";
 
 /* Bolus pop-up footer */
 "Carbs and previous insulin are included in the glucose prediction, but if the Eventual Glucose is lower than the Target Glucose, a bolus will not be recommended." = "Carbs and previous insulin are included in the glucose prediction, but if the Eventual Glucose is lower than the Target Glucose, a bolus will not be recommended.";

FreeAPS/Sources/Localizations/Main/sk.lproj/Localizable.strings

@@ -1299,7 +1299,7 @@ Enact a temp Basal or a temp target */
 "(Eventual Glucose - Target) / ISF" = "(Eventual Glucose - Target) / ISF";
 
 /* */
-"Formula =" = "Formula =";
+"Formula:" = "Formula:";
 
 /* Bolus pop-up footer */
 "Carbs and previous insulin are included in the glucose prediction, but if the Eventual Glucose is lower than the Target Glucose, a bolus will not be recommended." = "Carbs and previous insulin are included in the glucose prediction, but if the Eventual Glucose is lower than the Target Glucose, a bolus will not be recommended.";

FreeAPS/Sources/Localizations/Main/sv.lproj/Localizable.strings

@@ -1299,7 +1299,7 @@ Enact a temp Basal or a temp target */
 "(Eventual Glucose - Target) / ISF" = "(Blodsockerprognos - Målvärde) / ISF";
 
 /* */
-"Formula =" = "Formel =";
+"Formula:" = "Formel:";
 
 /* Bolus pop-up footer */
 "Carbs and previous insulin are included in the glucose prediction, but if the Eventual Glucose is lower than the Target Glucose, a bolus will not be recommended." = "Kolhydrater och tidigare insulin ingår i prognos, men om prognos är lägre än målvärde kommer ingen bolus att föreslås.";

FreeAPS/Sources/Localizations/Main/tr.lproj/Localizable.strings

@@ -1299,7 +1299,7 @@ Enact a temp Basal or a temp target */
 "(Eventual Glucose - Target) / ISF" = "(Eventual Glucose - Target) / ISF";
 
 /* */
-"Formula =" = "Formula =";
+"Formula:" = "Formula:";
 
 /* Bolus pop-up footer */
 "Carbs and previous insulin are included in the glucose prediction, but if the Eventual Glucose is lower than the Target Glucose, a bolus will not be recommended." = "Carbs and previous insulin are included in the glucose prediction, but if the Eventual Glucose is lower than the Target Glucose, a bolus will not be recommended.";

FreeAPS/Sources/Localizations/Main/uk.lproj/Localizable.strings

@@ -1299,7 +1299,7 @@ Enact a temp Basal or a temp target */
 "(Eventual Glucose - Target) / ISF" = "(Eventual Glucose - Target) / ISF";
 
 /* */
-"Formula =" = "Formula =";
+"Formula:" = "Formula:";
 
 /* Bolus pop-up footer */
 "Carbs and previous insulin are included in the glucose prediction, but if the Eventual Glucose is lower than the Target Glucose, a bolus will not be recommended." = "Вуглеводи та попередній інсулін включені в прогноз рівня глюкози, але якщо кінцевий рівень глюкози нижчий за цільовий рівень глюкози, болюс не буде рекомендовано.";

FreeAPS/Sources/Localizations/Main/zh-Hans.lproj/Localizable.strings

@@ -1299,7 +1299,7 @@ Enact a temp Basal or a temp target */
 "(Eventual Glucose - Target) / ISF" = "(Eventual Glucose - Target) / ISF";
 
 /* */
-"Formula =" = "Formula =";
+"Formula:" = "Formula:";
 
 /* Bolus pop-up footer */
 "Carbs and previous insulin are included in the glucose prediction, but if the Eventual Glucose is lower than the Target Glucose, a bolus will not be recommended." = "Carbs and previous insulin are included in the glucose prediction, but if the Eventual Glucose is lower than the Target Glucose, a bolus will not be recommended.";

FreeAPS/Sources/Modules/Bolus/View/BolusRootView.swift

@@ -114,10 +114,7 @@ extension Bolus {
             .alert(isPresented: $displayError) {
                 Alert(
                     title: Text("Warning!"),
-                    message: Text("\n" + alertString() + NSLocalizedString(
-                        "\n\nTap 'Add' to continue with selected amount.",
-                        comment: "Alert text to confirm bolus amount to add"
-                    )),
+                    message: Text("\n" + alertString() + "\n"),
                     primaryButton: .destructive(
                         Text("Add"),
                         action: {
@@ -127,25 +124,7 @@ extension Bolus {
                     ),
                     secondaryButton: .cancel()
                 )
-            }
-            .alert(isPresented: $displayError) {
-                Alert(
-                    title: Text("Warning!"),
-                    message: Text("\n" + alertString() + NSLocalizedString(
-                        "\n\nTap 'Add' to continue with selected amount.",
-                        comment: "Alert text to confirm bolus amount to add"
-                    )),
-                    primaryButton: .destructive(
-                        Text("Add"),
-                        action: {
-                            state.amount = state.insulinRecommended
-                            displayError = false
-                        }
-                    ),
-                    secondaryButton: .cancel()
-                )
-            }
-            .onAppear {
+            }.onAppear {
                 configureView {
                     state.waitForSuggestionInitial = waitForSuggestion
                     state.waitForSuggestion = waitForSuggestion
@@ -195,7 +174,7 @@ extension Bolus {
                         }
                     }
                     HStack {
-                        Text("Formula =")
+                        Text("Formula:")
                         Text("(Eventual Glucose - Target) / ISF")
                     }.foregroundColor(.secondary).italic().padding(.top, 5)
                 }

FreeAPS/Sources/Modules/Home/View/HomeRootView.swift

@@ -308,6 +308,10 @@ extension Home {
                         .padding(.trailing, 8)
                 }
 
+                if state.closedLoop, state.settingsManager.preferences.maxIOB == 0 {
+                    Text("Max IOB: 0").font(.callout).foregroundColor(.orange).padding(.trailing, 20)
+                }
+
                 if let progress = state.bolusProgress {
                     Text("Bolusing")
                         .font(.system(size: 12, weight: .bold)).foregroundColor(.insulin)