Skip to content

Commit

Permalink
Release 2.2.1 (#1354)
Browse files Browse the repository at this point in the history
* Bump version for dev

* Add Spanish translations

* Add back comment

* Updated French translations

* Updated French translations (Watch)

* Updated French translations (carb-entry-title-add title)

* Bump carthage rev

* Bump carthage revisions

* Bump cartfile revs

* Swedish translation update (#1317)

Added translation for new strings in Loop 2.2.

Co-authored-by: Pete Schwamb <pete@schwamb.net>

* Update HealthKit usage Finnish description (#1295)

* Bump cartfile revisions

* Bump carthage revisions for translation updates

* Use prediction that includes pending insulin

Use prediction that includes pending insulin in:
* Nightscout uploads
* Issue Report
* Status Extension

* Update DeviceDataManager.swift (#1328)

Add markdown for easy parsing of Loop Version

* Adding Arabic translation  (#1332)

* Fix app icon link in README.md (#1311)

* Create ar.lproj

* Delete ar.lproj

* Add files via upload

* Update Localizable.strings

* Update Main.strings

* Update InfoPlist.strings

* Update Main.strings

* Update Localizable.strings

* Add files via upload

* Update Intents.strings

* Update Localizable.strings

* Add files via upload

* Update Localizable.strings

* Update Main.strings

* Add files via upload

* Update Localizable.strings

* Add files via upload

Co-authored-by: Pete Schwamb <pete@schwamb.net>
Co-authored-by: James Woglom <j@wogloms.net>

* Bump carthage revisions

* Dev-Complete ِArabic translations (#1334)

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Update Localizable.strings

* Add files via upload

* Delete Interface.strings

* Add files via upload

* Delete Interface.strings

* Add files via upload

* Delete Interface.strings

* Add files via upload

* Update Arabic translations

* Update Interface.strings

* back to English

Co-authored-by: AQ <anna.quinlan123@gmail.com>
Co-authored-by: Jean-Philippe Baud <55440734+Jean-Phi37@users.noreply.github.com>
Co-authored-by: MatteB <60271762+MatteB@users.noreply.github.com>
Co-authored-by: Marko Myllyaho <44064056+mylma@users.noreply.github.com>
Co-authored-by: Marion Barker <marionbarker@earthlink.net>
Co-authored-by: Ahmed <40410642+abutmim@users.noreply.github.com>
Co-authored-by: James Woglom <j@wogloms.net>
  • Loading branch information
8 people authored Aug 9, 2020
1 parent 5b3f10a commit b6e96de
Show file tree
Hide file tree
Showing 41 changed files with 1,906 additions and 147 deletions.
10 changes: 5 additions & 5 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
github "LoopKit/Amplitude-iOS" "2137d5fd44bf630ed33e1e72d7af6d8f8612f270"
github "LoopKit/CGMBLEKit" "edcf503ef8fe260b69ca98eae508e679dfd9ad69"
github "LoopKit/G4ShareSpy" "88c5a296e83ce618319ae365a7e6da76d9be126b"
github "LoopKit/LoopKit" "6940ab10d258b21e0a33aa5729b1111a8d332d77"
github "LoopKit/CGMBLEKit" "7b4c1022eb6b91ae3975bfc8ce93fde8e496b4f3"
github "LoopKit/G4ShareSpy" "3b749bc7f6323ad8303af6c755ba9b5649eff816"
github "LoopKit/LoopKit" "953b58e617379354b89ea33e0fd8f220ccc2d366"
github "LoopKit/MKRingProgressView" "f548a5c64832be2d37d7c91b5800e284887a2a0a"
github "LoopKit/dexcom-share-client-swift" "c37d87fcf121c44721e87c9e6d2bea94e48728cc"
github "LoopKit/dexcom-share-client-swift" "146cccfe4eba5f536487777a72e0e47834fff64e"
github "i-schuetz/SwiftCharts" "0.6.5"
github "ps2/rileylink_ios" "c33115c038a7d133234cfa8b73c80603ff10a599"
github "ps2/rileylink_ios" "802cc005e3eb10cb5e407586210ceb62a57f8c22"
1 change: 1 addition & 0 deletions Common/es.lproj/Intents.strings
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@

/* INIntentDescription */
"yc02Yq" = "Agregar registro de carbs a Loop";

10 changes: 10 additions & 0 deletions Common/es.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
/* Title of the user activity for adding carbs */
"Add Carb Entry" = "Agregar Registro de Carbs";

/* Lesson subtitle */
"Computes the percentage of glucose measurements within a specified range" = "Calcula el porcentaje de medidas de glucosa entre una gama especificada";

/* The short unit display string for decibles */
"dB" = "dB";

Expand All @@ -19,5 +22,12 @@
/* 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" = "Rango";

/* Title of config entry */
"Start Date" = "Fecha de Inicio";

/* The short unit display string for international units of insulin */
"U" = "U";

9 changes: 9 additions & 0 deletions Common/fr.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
/* Title of the user activity for adding carbs */
"Add Carb Entry" = "Ajouter des glucides";

/* Lesson subtitle */
"Computes the percentage of glucose measurements within a specified range" = "Ceci calcule le pourcentage des mesures de glycémie dans une plage spécifique";

/* The short unit display string for decibles */
"dB" = "dB";

Expand All @@ -19,6 +22,12 @@
/* 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" = "Plage";

/* Title of config entry */
"Start Date" = "Date de commencement";

/* The short unit display string for international units of insulin */
"U" = "U";

8 changes: 8 additions & 0 deletions Common/‏‏ar.lproj/Intents.strings
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/* INIntentTitle */
"80eo5o" = "أضف كمية الكارب";

/* INIntentParameterCombinationTitle */
"OcNxIj" = "أضف كمية الكارب";

/* INIntentDescription */
"yc02Yq" = "أضف كمية الكارب للتطبيق";
56 changes: 56 additions & 0 deletions Common/‏‏ar.lproj/Localizable.strings
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
/* The format string for the app name and version number. (1: bundle name)(2: bundle version) */
"%1$@ v%2$@" = "%1$@ v%2$@";

/* Title of the user activity for adding carbs */
"Add Carb Entry" = "أضف كمية الكارب";

/* Lesson subtitle */
"Computes the percentage of glucose measurements within a specified range" = "لحساب النسبة المئوية لقراءات سكر الدم ضمن نطاق محدد";

/* Title of the button to begin lesson execution */
"Continue" = "متابعة";

/* The short unit display string for decibles */
"dB" = "dB";

/* The short unit display string for grams */
"g" = "g";

/* Placeholder for upper range entry */
"Maximum" = "الحد الأعلى";

/* The short unit display string for milligrams of glucose per decilter */
"mg/dL" = "mg/dl";

/* Placeholder for lower range entry */
"Minimum" = "الحد الأدنى";

/* The short unit display string for millimoles of glucose per liter */
"mmol/L" = "mmol/l";

/* Lesson title */
"Modal Day" = "يوم طبيعي";

/* Lesson result text for no data */
"No data available" = "لا يوجد بيانات متاحة";

/* 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" = "النطاق";

/* Title of config entry */
"Start Date" = "تاريخ البداية";

/* Lesson title */
"Time in Range" = "الوقت في النطاق";

/* The short unit display string for international units of insulin */
"U" = "وحدة";

/* Lesson subtitle */
"Visualizes the most frequent glucose values by time of day" = "يعرض قراءات سكر الدم الأكثر شيوعًا في أوقات مختلفة من اليوم";

/* Unit string for a count of calendar weeks */
"Weeks" = "أسابيع";
27 changes: 27 additions & 0 deletions DoseMathTests/ar.lproj/Localizable.strings
Original file line number Diff line number Diff line change
@@ -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." = "سكر الدم الحالي %1$@ أقل من نطاق التصحيح.";

/* 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$@." = "متوقع سكر الدم خلال %1$@ هو %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." = "متوقع سكر الدم %1$@ أقل من إعدادات التعليق المؤقت.";

/* 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" = "وحدة";

120 changes: 120 additions & 0 deletions Interface.strings
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@

/* Class = "WKInterfaceButton"; title = "🌮"; ObjectID = "0fo-Z3-hTi"; */
"0fo-Z3-hTi.title" = "🌮";

/* Class = "WKInterfaceLabel"; text = "15"; ObjectID = "CWt-7U-cnK"; */
"CWt-7U-cnK.text" = "15";

/* Class = "WKInterfaceLabel"; text = "—"; ObjectID = "CsQ-fc-KLC"; */
"CsQ-fc-KLC.text" = "—";

/* Class = "WKInterfaceButton"; accessibilityLabel = "Add"; ObjectID = "DZc-Gn-RLu"; */
"DZc-Gn-RLu.accessibilityLabel" = "Add";

/* Class = "WKInterfaceButton"; title = "+"; ObjectID = "DZc-Gn-RLu"; */
"DZc-Gn-RLu.title" = "+";

/* Class = "WKInterfaceButton"; accessibilityLabel = "Subtract"; ObjectID = "Dh9-HV-fXy"; */
"Dh9-HV-fXy.accessibilityLabel" = "Subtract";

/* Class = "WKInterfaceButton"; title = "−"; ObjectID = "Dh9-HV-fXy"; */
"Dh9-HV-fXy.title" = "−";

/* Class = "WKInterfaceLabel"; text = "---"; ObjectID = "Dt1-kz-jMZ"; */
"Dt1-kz-jMZ.text" = "---";

/* Class = "WKInterfaceLabel"; text = "—"; ObjectID = "IRi-4t-ESO"; */
"IRi-4t-ESO.text" = "—";

/* Class = "WKInterfaceLabel"; text = "Running"; ObjectID = "JXa-s1-PJx"; */
"JXa-s1-PJx.text" = "Running";

/* Class = "WKInterfaceLabel"; text = "TITLE"; ObjectID = "MZU-QV-PtZ"; */
"MZU-QV-PtZ.text" = "TITLE";

/* Class = "WKInterfaceLabel"; text = "—"; ObjectID = "Mhe-aR-kQQ"; */
"Mhe-aR-kQQ.text" = "—";

/* Class = "WKInterfaceButton"; title = "Bolus"; ObjectID = "Qsq-p5-1J0"; */
"Qsq-p5-1J0.title" = "Bolus";

/* Class = "WKInterfaceLabel"; text = "Label"; ObjectID = "T4U-wP-dSW"; */
"T4U-wP-dSW.text" = "Label";

/* Class = "WKInterfaceLabel"; text = "🏃‍♀️"; ObjectID = "UVY-pa-SUL"; */
"UVY-pa-SUL.text" = "🏃‍♀️";

/* Class = "WKInterfaceLabel"; text = "10:09 AM"; ObjectID = "Ury-of-vQg"; */
"Ury-of-vQg.text" = "10:09 AM";

/* Class = "WKInterfaceLabel"; text = "<body>"; ObjectID = "XkS-y5-khE"; */
"XkS-y5-khE.text" = "<body>";

/* Class = "WKInterfaceButton"; title = "Add Carbs"; ObjectID = "b6f-3I-jki"; */
"b6f-3I-jki.title" = "Add Carbs";

/* Class = "WKInterfaceButton"; title = "🍕"; ObjectID = "dPF-QZ-sh6"; */
"dPF-QZ-sh6.title" = "🍕";

/* Class = "WKInterfaceMenuItem"; title = "2 hours"; ObjectID = "dPh-7b-Tfv"; */
"dPh-7b-Tfv.title" = "2 hours";

/* Class = "WKInterfaceLabel"; text = "TOTAL CARBS"; ObjectID = "dea-qG-va8"; */
"dea-qG-va8.text" = "TOTAL CARBS";

/* Class = "WKInterfaceButton"; accessibilityLabel = "Add"; ObjectID = "eu3-pj-GH3"; */
"eu3-pj-GH3.accessibilityLabel" = "Add";

/* Class = "WKInterfaceButton"; title = "+"; ObjectID = "eu3-pj-GH3"; */
"eu3-pj-GH3.title" = "+";

/* Class = "WKInterfaceLabel"; text = "Pre-Meal"; ObjectID = "f5G-bS-9pd"; */
"f5G-bS-9pd.text" = "Pre-Meal";

/* Class = "WKInterfaceMenuItem"; title = "3 hours"; ObjectID = "fR1-7h-SNe"; */
"fR1-7h-SNe.title" = "3 hours";

/* Class = "WKInterfaceButton"; title = "🍭"; ObjectID = "gAn-qe-OvX"; */
"gAn-qe-OvX.title" = "🍭";

/* Class = "WKInterfaceButton"; accessibilityLabel = "Subtract"; ObjectID = "hjF-xr-cwO"; */
"hjF-xr-cwO.accessibilityLabel" = "Subtract";

/* Class = "WKInterfaceButton"; title = "−"; ObjectID = "hjF-xr-cwO"; */
"hjF-xr-cwO.title" = "−";

/* Class = "WKInterfaceLabel"; text = "Carbs"; ObjectID = "hln-CI-MRP"; */
"hln-CI-MRP.text" = "Carbs";

/* Class = "WKInterfaceLabel"; text = "Bolus Failed"; ObjectID = "jj3-Gq-HBy"; */
"jj3-Gq-HBy.text" = "Bolus Failed";

/* Class = "WKInterfaceLabel"; text = "0.000"; ObjectID = "mpK-zY-UvA"; */
"mpK-zY-UvA.text" = "0.000";

/* Class = "WKInterfaceLabel"; text = "Override"; ObjectID = "nC0-X3-oFJ"; */
"nC0-X3-oFJ.text" = "Override";

/* Class = "WKInterfaceController"; title = "Loop"; ObjectID = "rNf-Mh-tID"; */
"rNf-Mh-tID.title" = "Loop";

/* Class = "WKInterfaceLabel"; text = "UNITS"; ObjectID = "rV7-d9-n6u"; */
"rV7-d9-n6u.text" = "UNITS";

/* Class = "WKInterfaceLabel"; text = "Bolus"; ObjectID = "smL-Rc-IZh"; */
"smL-Rc-IZh.text" = "Bolus";

/* Class = "WKInterfaceController"; title = "Loop"; ObjectID = "v5b-sO-bb8"; */
"v5b-sO-bb8.title" = "Loop";

/* Class = "WKInterfaceMenuItem"; title = "1 hour"; ObjectID = "vL1-NA-WZ1"; */
"vL1-NA-WZ1.title" = "1 hour";

/* Class = "WKInterfaceLabel"; text = "ACTIVE CARBS"; ObjectID = "ycL-5X-a05"; */
"ycL-5X-a05.text" = "ACTIVE CARBS";

/* Class = "WKInterfaceLabel"; text = "---"; ObjectID = "yl8-ZP-c3l"; */
"yl8-ZP-c3l.text" = "---";

/* Class = "WKInterfaceLabel"; text = "Label"; ObjectID = "zO8-x6-bZd"; */
"zO8-x6-bZd.text" = "Label";
32 changes: 32 additions & 0 deletions Learn/ar.lproj/Localizable.strings
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/* Lesson subtitle */
"Computes the percentage of glucose measurements within a specified range" = "حساب النسبة المئوية لقراءات سكر الدم ضمن نطاق محدد";

/* Title of the button to begin lesson execution */
"Continue" = "متابعة";

/* Placeholder for upper range entry */
"Maximum" = "الحد الأعلى";

/* Placeholder for lower range entry */
"Minimum" = "الحد الأدنى";

/* Lesson title */
"Modal Day" = "يوم طبيعي";

/* Lesson result text for no data */
"No data available" = "لا يوجد بيانات متاحة";

/* Section title for glucose range */
"Range" = "النطاق";

/* Title of config entry */
"Start Date" = "تاريخ البداية";

/* Lesson title */
"Time in Range" = "الوقت في النطاق";

/* Lesson subtitle */
"Visualizes the most frequent glucose values by time of day" = "يعرض قراءات سكر الدم الأكثر شيوعًا في أوقات مختلفة من اليوم";

/* Unit string for a count of calendar weeks */
"Weeks" = "أسابيع";
3 changes: 3 additions & 0 deletions Learn/ar.lproj/Main.strings
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@

/* Class = "UINavigationItem"; title = "Learn"; ObjectID = "8hF-Ij-B7m"; */
"8hF-Ij-B7m.title" = "تعلم";
2 changes: 1 addition & 1 deletion Learn/es.lproj/Main.strings
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@

/* Class = "UINavigationItem"; title = "Learn"; ObjectID = "8hF-Ij-B7m"; */
"8hF-Ij-B7m.title" = "Aprender";

2 changes: 1 addition & 1 deletion Learn/fi.lproj/InfoPlist.strings
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
/* Privacy - Health Share Usage Description */
"NSHealthShareUsageDescription" = "Terveys-sovelluksen ateriatietoja käytetään glukoosivaikutusten määrittämiseen. Terveys-sovelluksen glukoositietoja käytetään graafeissa ja laskelmissa.";
"NSHealthShareUsageDescription" = "Terveys-sovelluksen ateriatietoja käytetään glukoosivaikutusten määrittämiseen. Terveys-sovelluksen glukoositietoja käytetään graafeissa ja laskelmissa. Unitietoja käytetään Apple Watch -komplikaation toiminnan optimointiin hereillä olon aikana.";

2 changes: 1 addition & 1 deletion Learn/fr.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"Minimum" = "Minimum";

/* Lesson title */
"Modal Day" = "Journée type</";
"Modal Day" = "Journée type";

/* Lesson result text for no data */
"No data available" = "Données indisponibles";
Expand Down
5 changes: 5 additions & 0 deletions Loop Status Extension/ar.lproj/Localizable.strings
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
/* The subtitle format describing eventual glucose. (1: localized glucose value description) */
"Eventually %1$@" = "متوقع %1$@";

/* The subtitle format describing units of active insulin. (1: localized insulin value description) */
"IOB %1$@ U" = "أنسولين نشط %1$@ وحدة";
6 changes: 6 additions & 0 deletions Loop Status Extension/ar.lproj/MainInterface.strings
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@

/* Class = "UILabel"; text = "Eventually 92 mg/dL"; ObjectID = "9iF-xY-Bh4"; */
"9iF-xY-Bh4.text" = "متوقع 92 mg/dL";

/* Class = "UILabel"; text = "IOB 1.0 U"; ObjectID = "UPi-dG-yYD"; */
"UPi-dG-yYD.text" = "أنسولين نشط 1.0 وحدة";
1 change: 1 addition & 0 deletions Loop Status Extension/es.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@

/* The subtitle format describing units of active insulin. (1: localized insulin value description) */
"IOB %1$@ U" = "IOB %1$@ U";

2 changes: 1 addition & 1 deletion Loop.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
MAIN_APP_BUNDLE_IDENTIFIER = com.${DEVELOPMENT_TEAM}.loopkit
MAIN_APP_DISPLAY_NAME = Loop

LOOP_MARKETING_VERSION = 2.2.0
LOOP_MARKETING_VERSION = 2.3.0

APPICON_NAME = AppIcon

Expand Down
3 changes: 2 additions & 1 deletion Loop/Managers/DeviceDataManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,8 @@ final class DeviceDataManager {
}

let report = [
Bundle.main.localizedNameAndVersion,
"## LoopVersion",
"* Version: \(Bundle.main.localizedNameAndVersion)",
"* gitRevision: \(Bundle.main.gitRevision ?? "N/A")",
"* gitBranch: \(Bundle.main.gitBranch ?? "N/A")",
"* sourceRoot: \(Bundle.main.sourceRoot ?? "N/A")",
Expand Down
2 changes: 1 addition & 1 deletion Loop/Managers/LoopDataManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -1488,7 +1488,7 @@ extension LoopDataManager {

"predictedGlucose: [",
"* PredictedGlucoseValue(start, mg/dL)",
(state.predictedGlucose ?? []).reduce(into: "", { (entries, entry) in
(state.predictedGlucoseIncludingPendingInsulin ?? []).reduce(into: "", { (entries, entry) in
entries.append("* \(entry.startDate), \(entry.quantity.doubleValue(for: .milligramsPerDeciliter))\n")
}),
"]",
Expand Down
2 changes: 1 addition & 1 deletion Loop/Managers/NightscoutDataManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ final class NightscoutDataManager {
recommendedBolus = state.recommendedBolus?.recommendation.amount

let carbsOnBoard = state.carbsOnBoard
let predictedGlucose = state.predictedGlucose
let predictedGlucose = state.predictedGlucoseIncludingPendingInsulin
let recommendedTempBasal = state.recommendedTempBasal

manager.doseStore.insulinOnBoard(at: Date()) { (result) in
Expand Down
2 changes: 1 addition & 1 deletion Loop/Managers/StatusExtensionDataManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ final class StatusExtensionDataManager {

// Drop the first element in predictedGlucose because it is the currentGlucose
// and will have a different interval to the next element
if let predictedGlucose = state.predictedGlucose?.dropFirst(),
if let predictedGlucose = state.predictedGlucoseIncludingPendingInsulin?.dropFirst(),
predictedGlucose.count > 1 {
let first = predictedGlucose[predictedGlucose.startIndex]
let second = predictedGlucose[predictedGlucose.startIndex.advanced(by: 1)]
Expand Down
Loading

0 comments on commit b6e96de

Please sign in to comment.