Merge pull request #537 from tidepool-org/ps2/LOOP-4371/diy-sync

LOOP-4371

Author: ps2

Common/FeatureFlags.swift

@@ -26,7 +26,7 @@ struct FeatureFlagConfiguration: Decodable {
     let observeHealthKitCarbSamplesFromOtherApps: Bool
     let observeHealthKitDoseSamplesFromOtherApps: Bool
     let observeHealthKitGlucoseSamplesFromOtherApps: Bool
-    let remoteOverridesEnabled: Bool
+    let remoteCommandsEnabled: Bool
     let predictedGlucoseChartClampEnabled: Bool
     let scenariosEnabled: Bool
     let sensitivityOverridesEnabled: Bool
@@ -35,6 +35,7 @@ struct FeatureFlagConfiguration: Decodable {
     let simpleBolusCalculatorEnabled: Bool
     let usePositiveMomentumAndRCForManualBoluses: Bool
     let dynamicCarbAbsorptionEnabled: Bool
+    let adultChildInsulinModelSelectionEnabled: Bool
 
 
     fileprivate init() {
@@ -158,10 +159,10 @@ struct FeatureFlagConfiguration: Decodable {
         #endif
 
         // Swift compiler config is inverse, since the default state is enabled.
-        #if REMOTE_OVERRIDES_DISABLED
-        self.remoteOverridesEnabled = false
+        #if REMOTE_COMMANDS_DISABLED
+        self.remoteCommandsEnabled = false
         #else
-        self.remoteOverridesEnabled = true
+        self.remoteCommandsEnabled = true
         #endif
 
         #if SCENARIOS_ENABLED
@@ -196,6 +197,12 @@ struct FeatureFlagConfiguration: Decodable {
         self.usePositiveMomentumAndRCForManualBoluses = true
         #endif
 
+        #if ADULT_CHILD_INSULIN_MODEL_SELECTION_ENABLED
+        self.adultChildInsulinModelSelectionEnabled = true
+        #else
+        self.adultChildInsulinModelSelectionEnabled = false
+        #endif
+
         self.dynamicCarbAbsorptionEnabled = true
     }
 }
@@ -217,7 +224,7 @@ extension FeatureFlagConfiguration : CustomDebugStringConvertible {
             "* observeHealthKitDoseSamplesFromOtherApps: \(observeHealthKitDoseSamplesFromOtherApps)",
             "* observeHealthKitGlucoseSamplesFromOtherApps: \(observeHealthKitGlucoseSamplesFromOtherApps)",
             "* predictedGlucoseChartClampEnabled: \(predictedGlucoseChartClampEnabled)",
-            "* remoteOverridesEnabled: \(remoteOverridesEnabled)",
+            "* remoteCommandsEnabled: \(remoteCommandsEnabled)",
             "* scenariosEnabled: \(scenariosEnabled)",
             "* sensitivityOverridesEnabled: \(sensitivityOverridesEnabled)",
             "* simulatedCoreDataEnabled: \(simulatedCoreDataEnabled)",
@@ -227,7 +234,8 @@ extension FeatureFlagConfiguration : CustomDebugStringConvertible {
             "* allowDebugFeatures: \(allowDebugFeatures)",
             "* simpleBolusCalculatorEnabled: \(simpleBolusCalculatorEnabled)",
             "* usePositiveMomentumAndRCForManualBoluses: \(usePositiveMomentumAndRCForManualBoluses)",
-            "* dynamicCarbAbsorptionEnabled: \(dynamicCarbAbsorptionEnabled)"
+            "* dynamicCarbAbsorptionEnabled: \(dynamicCarbAbsorptionEnabled)",
+            "* adultChildInsulinModelSelectionEnabled: \(adultChildInsulinModelSelectionEnabled)"
         ].joined(separator: "\n")
     }
 }

Common/Models/StatusExtensionContext.swift

@@ -296,6 +296,7 @@ struct StatusExtensionContext: RawRepresentable {
 
     var predictedGlucose: PredictedGlucoseContext?
     var lastLoopCompleted: Date?
+    var createdAt: Date?
     var isClosedLoop: Bool?
     var netBasal: NetBasalContext?
     var batteryPercentage: Double?
@@ -324,6 +325,7 @@ struct StatusExtensionContext: RawRepresentable {
         }
 
         lastLoopCompleted = rawValue["lastLoopCompleted"] as? Date
+        createdAt = rawValue["createdAt"] as? Date
         isClosedLoop = rawValue["isClosedLoop"] as? Bool
         batteryPercentage = rawValue["batteryPercentage"] as? Double
         reservoirCapacity = rawValue["reservoirCapacity"] as? Double
@@ -361,6 +363,7 @@ struct StatusExtensionContext: RawRepresentable {
 
         raw["predictedGlucose"] = predictedGlucose?.rawValue
         raw["lastLoopCompleted"] = lastLoopCompleted
+        raw["createdAt"] = createdAt
         raw["isClosedLoop"] = isClosedLoop
         raw["netBasal"] = netBasal?.rawValue
         raw["batteryPercentage"] = batteryPercentage

Common/de.lproj/Intents.strings

@@ -1,18 +1,36 @@
+/* (No Comment) */
+"9KhaIS" = "Voreinstellung gesetzt";
+
 /* (No Comment) */
 "80eo5o" = "KH-Eintrag hinzufügen";
 
+/* (No Comment) */
+"b085BW" = "Voreinstellung konnte nicht gesetzt werden.";
+
+/* (No Comment) */
+"I4OZy8" = "Enable Override Preset";
+
+/* (No Comment) */
+"lYMuWV" = "Voreinstellungs-Name";
+
+/* (No Comment) */
+"nDKAmn" = "Welche Voreinstellung möchtest Du aktivieren?";
+
 /* (No Comment) */
 "OcNxIj" = "KH-Eintrag hinzufügen";
 
 /* (No Comment) */
-"yc02Yq" = "Fügen Sie einen KH-Eintrag zu Loop hinzu.";
+"oLQSsJ" = "Aktiviere '${overrideName}' Voreinstellung";
+
+/* (No Comment) */
+"XNNmtH" = "Aktiviere Voreinstellung in Loop";
+
+/* (No Comment) */
+"yBzwCL" = "Voreinstellungsauswahl";
+
+/* (No Comment) */
+"yc02Yq" = "Füge einen KH-Eintrag zu Loop hinzu.";
+
+/* (No Comment) */
+"ZZ3mtM" = "Aktiviere eine Voreinstellung in Loop";
 
-"9KhaIS" = "I've set the preset";
-"I4OZy8" = "Enable Override Preset";
-"XNNmtH" = "Enable preset in Loop";
-"ZZ3mtM" = "Enable an override preset in Loop";
-"b085BW" = "I wasn't able to set the preset.";
-"lYMuWV" = "Override Name";
-"nDKAmn" = "What's the name of the override you'd like to set?";
-"oLQSsJ" = "Enable '${overrideName}' Override Preset";
-"yBzwCL" = "Override Selection";

Common/de.lproj/Localizable.strings

@@ -4,21 +4,54 @@
 /* Title of the user activity for adding carbs */
 "Add Carb Entry" = "KH-Eintrag hinzufügen";
 
+/* Lesson subtitle */
+"Computes the percentage of glucose measurements within a specified range" = "Berechnet den Prozentsatz der Glukosemessungen innerhalb eines angegebenen Bereichs";
+
+/* Title of the button to begin lesson execution */
+"Continue" = "Weiter";
+
 /* The short unit display string for decibles */
 "dB" = "dB";
 
 /* The short unit display string for grams */
 "g" = "g";
 
+/* Placeholder for upper range entry */
+"Maximum" = "Maximum";
+
 /* The short unit display string for milligrams of glucose per decilter */
 "mg/dL" = "mg/dL";
 
+/* Placeholder for lower range entry */
+"Minimum" = "Minimum";
+
 /* The short unit display string for millimoles of glucose per liter */
 "mmol/L" = "mmol/L";
 
+/* Lesson title */
+"Modal Day" = "Modaler Tag";
+
+/* Lesson result text for no data */
+"No data available" = "Keine Daten vorhanden";
+
 /* Format string for combining localized numeric value and unit. (1: numeric value)(2: unit) */
 "QUANTITY_VALUE_AND_UNIT" = "%1$@ %2$@";
 
+/* Section title for glucose range */
+"Range" = "Bereich";
+
+/* Title of config entry */
+"Start Date" = "Start Datum";
+
+/* Lesson title */
+"Time in Range" = "Zeit im Bereich";
+
 /* The short unit display string for international units of insulin */
 "U" = "IE";
 
+/* Lesson subtitle */
+"Visualizes the most frequent glucose values by time of day" = "Zeigt die häufigsten Glukosewerte nach Tageszeit";
+
+/* Unit string for a count of calendar weeks */
+"Weeks" = "Wochen";
+

DoseMathTests/de.lproj/Localizable.strings

@@ -16,6 +16,12 @@
 /* Message when offering bolus recommendation even though bg is below range and minBG is in future. (1: glucose time)(2: glucose number) */
 "Predicted glucose at %1$@ is %2$@." = "Der vorhergesagte Blutzucker um %1$@ ist %2$@.";
 
+/* Notice when predicted glucose for bolus recommendation is in range */
+"Predicted glucose is in range." = "Der vorhergesagte Glukosewert liegt im Bereich.";
+
+/* Notice message when recommending bolus when BG is below the glucose safety limit. (1: glucose value) */
+"Predicted glucose of %1$@ is below your glucose safety limit setting." = "Der vorhergesagte Glukosewert von %1$@ liegt unter Ihrer Glukose-Sicherheitsgrenzwerteinstellung.";
+
 /* Notice message when recommending bolus when BG is below the suspend threshold. (1: glucose value) */
 "Predicted glucose of %1$@ is below your suspend threshold setting." = "Der vorhergesagte Blutzucker von %1$@ liegt unterhalb des eingestellten Schwellwertes zur Unterbrechung der Basalrate. ";
 

Learn/de.lproj/Main.strings

@@ -1,3 +1,3 @@
 /* Class = "UINavigationItem"; title = "Learn"; ObjectID = "8hF-Ij-B7m"; */
-"8hF-Ij-B7m.title" = "Learn";
+"8hF-Ij-B7m.title" = "Lernen";
 

Loop Status Extension/de.lproj/Localizable.strings

@@ -1,8 +1,23 @@
+/* Displayed in the widget when the amount of active insulin cannot be determined. */
+"? U" = "? IE";
+
+/* The subtitle format describing units of active insulin. (1: localized insulin value description) */
+"%1$@ U" = "%1$@ IE";
+
+/* Widget label title describing the active carbs */
+"Active Carbs" = "Aktive KH";
+
+/* Widget label title describing the active insulin */
+"Active Insulin" = "Aktives Insulin";
+
+/* The short unit display string for decibles */
+"dB" = "dB";
+
 /* The subtitle format describing eventual glucose.  (1: localized glucose value description) */
-"Eventually %1$@" = "Schließlich %1$@";
+"Eventually %1$@" = "Irgendwann %1$@";
 
 /* The subtitle format describing units of active insulin. (1: localized insulin value description) */
-"IOB %1$@ U" = "IOB %1$@ E";
+"IOB %1$@ U" = "IOB %1$@ IE";
 
 /* The short unit display string for international units of insulin */
 "U" = "IE";

Loop Status Extension/de.lproj/MainInterface.strings

@@ -1,6 +1,9 @@
-/* Class = "UILabel"; text = "Eventually 92 mg/dL"; ObjectID = "9iF-xY-Bh4"; */
-"9iF-xY-Bh4.text" = "Schließlich 92 mg/dL";
+/* Class = "UILabel"; text = "Active Carbs"; ObjectID = "9iF-xY-Bh4"; */
+"9iF-xY-Bh4.text" = "Aktive KH";
 
-/* Class = "UILabel"; text = "IOB 1.0 U"; ObjectID = "UPi-dG-yYD"; */
-"UPi-dG-yYD.text" = "IOB 1.0 IE";
+/* Class = "UILabel"; text = "Active Insulin"; ObjectID = "UPi-dG-yYD"; */
+"UPi-dG-yYD.text" = "Aktives Insulin";
+
+/* Class = "UILabel"; text = "0 U"; ObjectID = "Vgf-p1-2QP"; */
+"Vgf-p1-2QP.text" = "0 IE";