Skip to content

Commit b4a5567

Browse files
committed
Merge remote-tracking branch 'origin/dev' into tidepool-sync
2 parents 6f3a067 + fa03121 commit b4a5567

File tree

63 files changed

+1316
-1193
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+1316
-1193
lines changed

.github/workflows/inactive_issues.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: Close inactive issues
2+
on:
3+
schedule:
4+
- cron: "30 1 * * *"
5+
6+
jobs:
7+
close-issues:
8+
runs-on: ubuntu-latest
9+
permissions:
10+
issues: write
11+
pull-requests: write
12+
steps:
13+
- uses: actions/stale@v5
14+
with:
15+
operations-per-run: 100
16+
days-before-issue-stale: 30
17+
days-before-issue-close: 14
18+
stale-issue-label: "stale"
19+
stale-issue-message: "This issue is stale because it has been open for 30 days with no activity."
20+
close-issue-message: "This issue was closed because it has been inactive for 14 days since being marked as stale."
21+
days-before-pr-stale: -1
22+
days-before-pr-close: -1
23+
repo-token: ${{ secrets.GITHUB_TOKEN }}

Common/Extensions/GlucoseRangeSchedule.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ extension GlucoseRangeSchedule {
1313
func minQuantity(at date: Date) -> HKQuantity {
1414
return HKQuantity(unit: unit, doubleValue: value(at: date).minValue)
1515
}
16+
func maxQuantity(at date: Date) -> HKQuantity {
17+
return HKQuantity(unit: unit, doubleValue: value(at: date).maxValue)
18+
}
1619
}
1720

1821

Common/FeatureFlags.swift

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ struct FeatureFlagConfiguration: Decodable {
3939
let adultChildInsulinModelSelectionEnabled: Bool
4040
let profileExpirationSettingsViewEnabled: Bool
4141
let missedMealNotifications: Bool
42+
let allowAlgorithmExperiments: Bool
4243

4344

4445
fileprivate init() {
@@ -229,6 +230,11 @@ struct FeatureFlagConfiguration: Decodable {
229230
self.missedMealNotifications = true
230231
#endif
231232

233+
#if ALLOW_ALGORITHM_EXPERIMENTS
234+
self.allowAlgorithmExperiments = true
235+
#else
236+
self.allowAlgorithmExperiments = false
237+
#endif
232238
}
233239
}
234240

@@ -263,7 +269,8 @@ extension FeatureFlagConfiguration : CustomDebugStringConvertible {
263269
"* dynamicCarbAbsorptionEnabled: \(dynamicCarbAbsorptionEnabled)",
264270
"* adultChildInsulinModelSelectionEnabled: \(adultChildInsulinModelSelectionEnabled)",
265271
"* profileExpirationSettingsViewEnabled: \(profileExpirationSettingsViewEnabled)",
266-
"* missedMealNotifications: \(missedMealNotifications)"
272+
"* missedMealNotifications: \(missedMealNotifications)",
273+
"* allowAlgorithmExperiments: \(allowAlgorithmExperiments)"
267274
].joined(separator: "\n")
268275
}
269276
}

Common/de.lproj/Intents.strings

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
"9KhaIS" = "Voreinstellung gesetzt";
33

44
/* (No Comment) */
5-
"80eo5o" = "Kohlenhydrate hinzufügen";
5+
"80eo5o" = "KH-Eintrag hinzufügen";
66

77
/* (No Comment) */
88
"b085BW" = "Voreinstellung konnte nicht gesetzt werden.";
99

1010
/* (No Comment) */
11-
"I4OZy8" = "Enable Override Preset";
11+
"I4OZy8" = "Aktiviere Voreinstellung";
1212

1313
/* (No Comment) */
1414
"lYMuWV" = "Voreinstellungs-Name";
@@ -17,7 +17,7 @@
1717
"nDKAmn" = "Welche Voreinstellung möchten Sie aktivieren?";
1818

1919
/* (No Comment) */
20-
"OcNxIj" = "Kohlenhydrate hinzufügen";
20+
"OcNxIj" = "KH hinzufügen";
2121

2222
/* (No Comment) */
2323
"oLQSsJ" = "Aktiviere '${overrideName}' Voreinstellung";

Common/pl.lproj/Intents.strings

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* (No Comment) */
2-
"9KhaIS" = "Ustawiłem Cel Tymczas.";
2+
"9KhaIS" = "Ustawiłem Cel Tymczasowy";
33

44
/* (No Comment) */
55
"80eo5o" = "Wprowadź węglowodany";

DoseMathTests/de.lproj/Localizable.strings

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"Predicted glucose of %1$@ is below your glucose safety limit setting." = "Der vorhergesagte Blutzucker von %1$@ liegt unter der Sicherheitsgrenze.";
2424

2525
/* Notice message when recommending bolus when BG is below the suspend threshold. (1: glucose value) */
26-
"Predicted glucose of %1$@ is below your suspend threshold setting." = "Der vorhergesagte Blutzucker von %1$@ liegt unter dem Grenzwert für die Hypo-Abschaltung.";
26+
"Predicted glucose of %1$@ is below your suspend threshold setting." = "Der vorhergesagte Blutzucker von %1$@ liegt unter dem Grenzwert der Hypo-Abschaltung.";
2727

2828
/* Format string for combining localized numeric value and unit. (1: numeric value)(2: unit) */
2929
"QUANTITY_VALUE_AND_UNIT" = "%1$@ %2$@";

DoseMathTests/nb.lproj/Localizable.strings

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Message when offering bolus recommendation even though bg is below range. (1: glucose value) */
2-
"Current glucose of %1$@ is below correction range." = "Gjeldende glukose på %1$@ er under korreksjonsområdet.";
2+
"Current glucose of %1$@ is below correction range." = "Gjeldende blodsukker på %1$@ er under korreksjonsområdet.";
33

44
/* The short unit display string for decibles */
55
"dB" = "dB";
@@ -17,7 +17,7 @@
1717
"Predicted glucose at %1$@ is %2$@." = "Forventet blodsukker kl %1$@ er %2$@.";
1818

1919
/* Notice when predicted glucose for bolus recommendation is in range */
20-
"Predicted glucose is in range." = "Forventet blodsukker er innenfor målområdet.";
20+
"Predicted glucose is in range." = "Forutsagt blodsukker er innenfor området.";
2121

2222
/* Notice message when recommending bolus when BG is below the glucose safety limit. (1: glucose value) */
2323
"Predicted glucose of %1$@ is below your glucose safety limit setting." = "Forventet blodsukker på %1$@ er lavere enn innstillingen for blodsukkersikkerhet.";

Loop Status Extension/de.lproj/Localizable.strings

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"dB" = "dB";
2424

2525
/* The subtitle format describing eventual glucose. (1: localized glucose value description) */
26-
"Eventually %1$@" = "Irgendwann %1$@";
26+
"Eventually %1$@" = "Voraussichtlich %1$@";
2727

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

Loop Status Extension/he.lproj/Localizable.strings

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
"%1$@ v%2$@" = "%1$@ v%2$@";
33

44
/* Widget label title describing the active carbs */
5-
"Active Carbs" = "Active Carbs";
5+
"Active Carbs" = "פחמימות פעילות";
66

77
/* Widget label title describing the active insulin */
8-
"Active Insulin" = "Active Insulin";
8+
"Active Insulin" = "אינסולין פעיל";
99

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

Loop Status Extension/he.lproj/MainInterface.strings

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Class = "UILabel"; text = "Active Carbs"; ObjectID = "9iF-xY-Bh4"; */
2-
"9iF-xY-Bh4.text" = "Active Carbs";
2+
"9iF-xY-Bh4.text" = "פחמימות פעילות";
33

44
/* Class = "UILabel"; text = "0 g"; ObjectID = "dPp-lJ-5sh"; */
55
"dPp-lJ-5sh.text" = "0 g";

0 commit comments

Comments
 (0)