Merge pull request #4 from iMaces/dev-watch

Dev watch

Author: iMaces

Cartfile

@@ -1,7 +1,7 @@
-github "LoopKit/LoopKit" "dev"
-github "LoopKit/CGMBLEKit" "dev"
+github "LoopKit/LoopKit" == 2.1.2
+github "LoopKit/CGMBLEKit" == 2.1.1
 github "i-schuetz/SwiftCharts" == 0.6.1
 github "mddub/dexcom-share-client-swift" == 0.4.1
 github "mddub/G4ShareSpy" == 0.3.3
-github "ps2/rileylink_ios" "dev"
+github "ps2/rileylink_ios" == 2.0.3
 github "LoopKit/Amplitude-iOS" "decreepify"

Cartfile.resolved

@@ -1,7 +1,7 @@
 github "LoopKit/Amplitude-iOS" "2137d5fd44bf630ed33e1e72d7af6d8f8612f270"
-github "LoopKit/CGMBLEKit" "1f9d0f221b886f12bcb2c46dc0b551589b623210"
-github "LoopKit/LoopKit" "7082c64333113ad83238e483e83029c161ac35bb"
+github "LoopKit/CGMBLEKit" "v2.1.1"
+github "LoopKit/LoopKit" "v2.1.2"
 github "i-schuetz/SwiftCharts" "0.6.1"
 github "mddub/G4ShareSpy" "v0.3.3"
 github "mddub/dexcom-share-client-swift" "v0.4.1"
-github "ps2/rileylink_ios" "4a714a59d399aeb2984cbbe0434f02e6b59cfec5"
+github "ps2/rileylink_ios" "v2.0.3"

Common/Extensions/OSLog.swift

@@ -21,6 +21,10 @@ extension OSLog {
         log(message, type: .info, args)
     }
 
+    func `default`(_ message: StaticString, _ args: CVarArg...) {
+        log(message, type: .default, args)
+    }
+
     func error(_ message: StaticString, _ args: CVarArg...) {
         log(message, type: .error, args)
     }
@@ -35,6 +39,10 @@ extension OSLog {
             os_log(message, log: self, type: type, args[0], args[1])
         case 3:
             os_log(message, log: self, type: type, args[0], args[1], args[2])
+        case 4:
+            os_log(message, log: self, type: type, args[0], args[1], args[2], args[3])
+        case 5:
+            os_log(message, log: self, type: type, args[0], args[1], args[2], args[3], args[4])
         default:
             os_log(message, log: self, type: type, args)
         }

DoseMathTests/Base.lproj/InfoPlist.strings

@@ -0,0 +1 @@
+/* No Localized Strings */

DoseMathTests/Base.lproj/Localizable.strings

@@ -0,0 +1,26 @@
+/* Message when offering bolus recommendation even though bg is below range. (1: glucose value) */
+"Current glucose of %1$@ is below correction range." = "Current glucose of %1$@ is below correction range.";
+
+/* The short unit display string for decibles */
+"dB" = "dB";
+
+/* The short unit display string for grams */
+"g" = "g";
+
+/* The short unit display string for milligrams of glucose per decilter */
+"mg/dL" = "mg/dL";
+
+/* The short unit display string for millimoles of glucose per liter */
+"mmol/L" = "mmol/L";
+
+/* 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$@." = "Predicted glucose at %1$@ is %2$@.";
+
+/* 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." = "Predicted glucose of %1$@ is below your suspend threshold setting.";
+
+/* Format string for combining localized numeric value and unit. (1: numeric value)(2: unit) */
+"QUANTITY_VALUE_AND_UNIT" = "%1$@ %2$@";
+
+/* The short unit display string for international units of insulin */
+"U" = "U";

DoseMathTests/de.lproj/InfoPlist.strings

@@ -0,0 +1,3 @@
+/* Bundle name */
+"CFBundleName" = "$(PRODUCT_NAME)";
+

DoseMathTests/de.lproj/Localizable.strings

@@ -0,0 +1,27 @@
+/* Message when offering bolus recommendation even though bg is below range. (1: glucose value) */
+"Current glucose of %1$@ is below correction range." = "Der aktuell Blutzucker von %1$@ liegt unterhalb des Korrekturbereiches.";
+
+/* The short unit display string for decibles */
+"dB" = "dB";
+
+/* The short unit display string for grams */
+"g" = "g";
+
+/* The short unit display string for milligrams of glucose per decilter */
+"mg/dL" = "mg/dL";
+
+/* The short unit display string for millimoles of glucose per liter */
+"mmol/L" = "mmol/L";
+
+/* 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 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. ";
+
+/* Format string for combining localized numeric value and unit. (1: numeric value)(2: unit) */
+"QUANTITY_VALUE_AND_UNIT" = "%1$@ %2$@";
+
+/* The short unit display string for international units of insulin */
+"U" = "E";
+

DoseMathTests/es.lproj/InfoPlist.strings

@@ -1 +0,0 @@
-/* No Localized Strings */

DoseMathTests/es.lproj/Localizable.strings

@@ -1,6 +1,18 @@
 /* Message when offering bolus recommendation even though bg is below range. (1: glucose value) */
 "Current glucose of %1$@ is below correction range." = "Glucosa actual de %1$@ está debajo del rango correctivo.";
 
+/* The short unit display string for decibles */
+"dB" = "dB";
+
+/* The short unit display string for grams */
+"g" = "g";
+
+/* The short unit display string for milligrams of glucose per decilter */
+"mg/dL" = "mg/dL";
+
+/* The short unit display string for millimoles of glucose per liter */
+"mmol/L" = "mmol/L";
+
 /* 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$@." = "Glucosa proyectada en %1$@ es %2$@.";
 
@@ -10,6 +22,6 @@
 /* Format string for combining localized numeric value and unit. (1: numeric value)(2: unit) */
 "QUANTITY_VALUE_AND_UNIT" = "%1$@ %2$@";
 
-/* The unit display string for millimoles of glucose per liter */
-"mmol/L" = "mmol/L";
+/* The short unit display string for international units of insulin */
+"U" = "U";
 

DoseMathTests/fr.lproj/InfoPlist.strings

@@ -0,0 +1 @@
+/* No Localized Strings */