Skip to content

Commit bcb4ed9

Browse files
ps2ps2
authored
Merge pull request #1949 from LoopKit/dev
Release 3.2
2 parents 743b8d7 + a1fb919 commit bcb4ed9

File tree

430 files changed

+22522
-5419
lines changed

Some content is hidden

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

430 files changed

+22522
-5419
lines changed

‎Common/FeatureFlags.swift

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ struct FeatureFlagConfiguration: Decodable {
2626
let observeHealthKitCarbSamplesFromOtherApps: Bool
2727
let observeHealthKitDoseSamplesFromOtherApps: Bool
2828
let observeHealthKitGlucoseSamplesFromOtherApps: Bool
29-
let remoteOverridesEnabled: Bool
29+
let remoteCommandsEnabled: Bool
3030
let predictedGlucoseChartClampEnabled: Bool
3131
let scenariosEnabled: Bool
3232
let sensitivityOverridesEnabled: Bool
@@ -37,6 +37,7 @@ struct FeatureFlagConfiguration: Decodable {
3737
let usePositiveMomentumAndRCForManualBoluses: Bool
3838
let dynamicCarbAbsorptionEnabled: Bool
3939
let adultChildInsulinModelSelectionEnabled: Bool
40+
let profileExpirationSettingsViewEnabled: Bool
4041

4142

4243
fileprivate init() {
@@ -160,10 +161,10 @@ struct FeatureFlagConfiguration: Decodable {
160161
#endif
161162

162163
// Swift compiler config is inverse, since the default state is enabled.
163-
#if REMOTE_OVERRIDES_DISABLED
164-
self.remoteOverridesEnabled = false
164+
#if REMOTE_COMMANDS_DISABLED || REMOTE_OVERRIDES_DISABLED //REMOTE_OVERRIDES_DISABLED: backwards compatibility of Loop 3 & prior
165+
self.remoteCommandsEnabled = false
165166
#else
166-
self.remoteOverridesEnabled = true
167+
self.remoteCommandsEnabled = true
167168
#endif
168169

169170
#if SCENARIOS_ENABLED
@@ -212,6 +213,13 @@ struct FeatureFlagConfiguration: Decodable {
212213
#endif
213214

214215
self.dynamicCarbAbsorptionEnabled = true
216+
217+
// ProfileExpirationSettingsView is inverse, since the default state is enabled.
218+
#if PROFILE_EXPIRATION_SETTINGS_VIEW_DISABLED
219+
self.profileExpirationSettingsViewEnabled = false
220+
#else
221+
self.profileExpirationSettingsViewEnabled = true
222+
#endif
215223
}
216224
}
217225

@@ -232,7 +240,7 @@ extension FeatureFlagConfiguration : CustomDebugStringConvertible {
232240
"* observeHealthKitDoseSamplesFromOtherApps: \(observeHealthKitDoseSamplesFromOtherApps)",
233241
"* observeHealthKitGlucoseSamplesFromOtherApps: \(observeHealthKitGlucoseSamplesFromOtherApps)",
234242
"* predictedGlucoseChartClampEnabled: \(predictedGlucoseChartClampEnabled)",
235-
"* remoteOverridesEnabled: \(remoteOverridesEnabled)",
243+
"* remoteCommandsEnabled: \(remoteCommandsEnabled)",
236244
"* scenariosEnabled: \(scenariosEnabled)",
237245
"* sensitivityOverridesEnabled: \(sensitivityOverridesEnabled)",
238246
"* showEventualBloodGlucoseOnWatchEnabled: \(showEventualBloodGlucoseOnWatchEnabled)",
@@ -244,7 +252,8 @@ extension FeatureFlagConfiguration : CustomDebugStringConvertible {
244252
"* simpleBolusCalculatorEnabled: \(simpleBolusCalculatorEnabled)",
245253
"* usePositiveMomentumAndRCForManualBoluses: \(usePositiveMomentumAndRCForManualBoluses)",
246254
"* dynamicCarbAbsorptionEnabled: \(dynamicCarbAbsorptionEnabled)",
247-
"* adultChildInsulinModelSelectionEnabled: \(adultChildInsulinModelSelectionEnabled)"
255+
"* adultChildInsulinModelSelectionEnabled: \(adultChildInsulinModelSelectionEnabled)",
256+
"* profileExpirationSettingsViewEnabled: \(profileExpirationSettingsViewEnabled)"
248257
].joined(separator: "\n")
249258
}
250259
}

‎Common/ar.lproj/Intents.strings

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
/* (No Comment) */
2+
"9KhaIS" = "I've set the preset";
3+
4+
/* (No Comment) */
5+
"80eo5o" = "Add Carb Entry";
6+
7+
/* (No Comment) */
8+
"b085BW" = "I wasn't able to set the preset.";
9+
10+
/* (No Comment) */
11+
"I4OZy8" = "Enable Override Preset";
12+
13+
/* (No Comment) */
14+
"lYMuWV" = "Override Name";
15+
16+
/* (No Comment) */
17+
"nDKAmn" = "What's the name of the override you'd like to set?";
18+
19+
/* (No Comment) */
20+
"OcNxIj" = "Add Carb Entry";
21+
22+
/* (No Comment) */
23+
"oLQSsJ" = "Enable '${overrideName}' Override Preset";
24+
25+
/* (No Comment) */
26+
"XNNmtH" = "Enable preset in Loop";
27+
28+
/* (No Comment) */
29+
"yBzwCL" = "Override Selection";
30+
31+
/* (No Comment) */
32+
"yc02Yq" = "Add a carb entry to Loop";
33+
34+
/* (No Comment) */
35+
"ZZ3mtM" = "Enable an override preset in Loop";
36+

‎Common/ar.lproj/Localizable.strings

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
/* The format string for the app name and version number. (1: bundle name)(2: bundle version) */
2+
"%1$@ v%2$@" = "%1$@ v%2$@";
3+
4+
/* Title of the user activity for adding carbs */
5+
"Add Carb Entry" = "Add Carb Entry";
6+
7+
/* The short unit display string for decibles */
8+
"dB" = "dB";
9+
10+
/* The short unit display string for grams */
11+
"g" = "g";
12+
13+
/* The short unit display string for milligrams of glucose per decilter */
14+
"mg/dL" = "mg/dL";
15+
16+
/* The short unit display string for millimoles of glucose per liter */
17+
"mmol/L" = "mmol/L";
18+
19+
/* Format string for combining localized numeric value and unit. (1: numeric value)(2: unit) */
20+
"QUANTITY_VALUE_AND_UNIT" = "%1$@ %2$@";
21+
22+
/* The short unit display string for international units of insulin */
23+
"U" = "U";
24+

‎Common/da.lproj/Intents.strings

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,36 @@
1+
/* (No Comment) */
2+
"9KhaIS" = "Jeg har indstillet forudindstillingen";
3+
14
/* (No Comment) */
25
"80eo5o" = "Tilføj kulhydrater";
36

7+
/* (No Comment) */
8+
"b085BW" = "Jeg var ikke i stand til at indstille forudindstillingen.";
9+
10+
/* (No Comment) */
11+
"I4OZy8" = "Aktiver forudindstilling for Override";
12+
13+
/* (No Comment) */
14+
"lYMuWV" = "Override navn";
15+
16+
/* (No Comment) */
17+
"nDKAmn" = "Hvad er navnet på den Override, du vil angive?";
18+
419
/* (No Comment) */
520
"OcNxIj" = "Tilføj kulhydrater";
621

722
/* (No Comment) */
8-
"yc02Yq" = "Tilføj kulhydrater til Loop.";
23+
"oLQSsJ" = "Aktiver \"${overrideName}\" Override forudindstilling";
24+
25+
/* (No Comment) */
26+
"XNNmtH" = "Aktiver forudindstilling i Loop";
27+
28+
/* (No Comment) */
29+
"yBzwCL" = "Override valg";
30+
31+
/* (No Comment) */
32+
"yc02Yq" = "Tilføj kulhydrater til Loop";
33+
34+
/* (No Comment) */
35+
"ZZ3mtM" = "Aktivere en forudindstilling for Override i Loop";
936

10-
"9KhaIS" = "I've set the preset";
11-
"I4OZy8" = "Enable Override Preset";
12-
"XNNmtH" = "Enable preset in Loop";
13-
"ZZ3mtM" = "Enable an override preset in Loop";
14-
"b085BW" = "I wasn't able to set the preset.";
15-
"lYMuWV" = "Override Name";
16-
"nDKAmn" = "What's the name of the override you'd like to set?";
17-
"oLQSsJ" = "Enable '${overrideName}' Override Preset";
18-
"yBzwCL" = "Override Selection";

‎Common/da.lproj/Localizable.strings

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
/* Title of the user activity for adding carbs */
55
"Add Carb Entry" = "Tilføj kulhydrater";
66

7+
/* Lesson subtitle */
8+
"Computes the percentage of glucose measurements within a specified range" = "Beregner procentdelen af ​​blodsukkermålinger inden for et specificeret interval";
9+
710
/* Title of the button to begin lesson execution */
811
"Continue" = "Fortsæt";
912

@@ -14,7 +17,7 @@
1417
"g" = "g";
1518

1619
/* Placeholder for upper range entry */
17-
"Maximum" = "Maximum";
20+
"Maximum" = "Maksimum";
1821

1922
/* The short unit display string for milligrams of glucose per decilter */
2023
"mg/dL" = "mg/dL";
@@ -26,7 +29,7 @@
2629
"mmol/L" = "mmol/L";
2730

2831
/* Lesson title */
29-
"Modal Day" = "Modal Dag";
32+
"Modal Day" = "Modal-dag";
3033

3134
/* Lesson result text for no data */
3235
"No data available" = "Ingen data tilgængelige";
@@ -38,16 +41,16 @@
3841
"Range" = "Interval";
3942

4043
/* Title of config entry */
41-
"Start Date" = "Start Dato";
44+
"Start Date" = "Startdato";
4245

4346
/* Lesson title */
44-
"Time in Range" = "Tme in Range";
47+
"Time in Range" = "Tid inden for korrektionsområde";
4548

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

4952
/* Lesson subtitle */
50-
"Visualizes the most frequent glucose values by time of day" = "Visualiserer de hyppigste blodsukker værdier fordelt på dagen";
53+
"Visualizes the most frequent glucose values by time of day" = "Visualiserer de hyppigste blodsukkerværdier fordelt på dagen";
5154

5255
/* Unit string for a count of calendar weeks */
5356
"Weeks" = "Uger";

‎Common/de.lproj/Intents.strings

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"lYMuWV" = "Voreinstellungs-Name";
1515

1616
/* (No Comment) */
17-
"nDKAmn" = "Welche Voreinstellung möchtest Du aktivieren?";
17+
"nDKAmn" = "Welche Voreinstellung möchten Sie aktivieren?";
1818

1919
/* (No Comment) */
2020
"OcNxIj" = "KH-Eintrag hinzufügen";

‎Common/es.lproj/Intents.strings

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,36 @@
1-
/* INIntentTitle */
2-
"80eo5o" = "Agregar Registro de Carbs";
1+
/* (No Comment) */
2+
"9KhaIS" = "He establecido el ajuste";
33

4-
/* INIntentParameterCombinationTitle */
5-
"OcNxIj" = "Agregar Registro de Carbs";
4+
/* (No Comment) */
5+
"80eo5o" = "Agregar Registro de Carbs";
66

7-
/* INIntentDescription */
8-
"yc02Yq" = "Agregar registro de carbs a Loop";
7+
/* (No Comment) */
8+
"b085BW" = "I wasn't able to set the preset.";
99

10-
"9KhaIS" = "I've set the preset";
10+
/* (No Comment) */
1111
"I4OZy8" = "Enable Override Preset";
12-
"XNNmtH" = "Enable preset in Loop";
13-
"ZZ3mtM" = "Enable an override preset in Loop";
14-
"b085BW" = "I wasn't able to set the preset.";
12+
13+
/* (No Comment) */
1514
"lYMuWV" = "Override Name";
15+
16+
/* (No Comment) */
1617
"nDKAmn" = "What's the name of the override you'd like to set?";
18+
19+
/* (No Comment) */
20+
"OcNxIj" = "Agregar Registro de Carbs";
21+
22+
/* (No Comment) */
1723
"oLQSsJ" = "Enable '${overrideName}' Override Preset";
24+
25+
/* (No Comment) */
26+
"XNNmtH" = "Enable preset in Loop";
27+
28+
/* (No Comment) */
1829
"yBzwCL" = "Override Selection";
30+
31+
/* (No Comment) */
32+
"yc02Yq" = "Agregar registro de carbs a Loop";
33+
34+
/* (No Comment) */
35+
"ZZ3mtM" = "Enable an override preset in Loop";
36+

‎Common/es.lproj/Localizable.strings

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,33 @@
77
/* Lesson subtitle */
88
"Computes the percentage of glucose measurements within a specified range" = "Calcula el porcentaje de medidas de glucosa entre una gama especificada";
99

10+
/* Title of the button to begin lesson execution */
11+
"Continue" = "Continuar";
12+
1013
/* The short unit display string for decibles */
1114
"dB" = "dB";
1215

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

19+
/* Placeholder for upper range entry */
20+
"Maximum" = "Máximo";
21+
1622
/* The short unit display string for milligrams of glucose per decilter */
1723
"mg/dL" = "mg/dL";
1824

25+
/* Placeholder for lower range entry */
26+
"Minimum" = "Mínimo";
27+
1928
/* The short unit display string for millimoles of glucose per liter */
2029
"mmol/L" = "mmol/L";
2130

31+
/* Lesson title */
32+
"Modal Day" = "Día modal";
33+
34+
/* Lesson result text for no data */
35+
"No data available" = "Datos no disponibles";
36+
2237
/* Format string for combining localized numeric value and unit. (1: numeric value)(2: unit) */
2338
"QUANTITY_VALUE_AND_UNIT" = "%1$@ %2$@";
2439

@@ -28,6 +43,15 @@
2843
/* Title of config entry */
2944
"Start Date" = "Fecha de Inicio";
3045

46+
/* Lesson title */
47+
"Time in Range" = "Tiempo en Rango";
48+
3149
/* The short unit display string for international units of insulin */
3250
"U" = "U";
3351

52+
/* Lesson subtitle */
53+
"Visualizes the most frequent glucose values by time of day" = "Visualiza los valores de glucosa más frecuentes por hora del día";
54+
55+
/* Unit string for a count of calendar weeks */
56+
"Weeks" = "Semanas";
57+

‎Common/fi.lproj/Intents.strings

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,36 @@
11
/* (No Comment) */
2-
"80eo5o" = "Lisää hiilihydraatteja";
2+
"9KhaIS" = "I've set the preset";
33

44
/* (No Comment) */
5-
"OcNxIj" = "Lisää hiilihydraatteja";
5+
"80eo5o" = "Lisää hiilihydraatteja";
66

77
/* (No Comment) */
8-
"yc02Yq" = "Lisää hiilihydraatteja Loopiin";
8+
"b085BW" = "I wasn't able to set the preset.";
99

10-
"9KhaIS" = "I've set the preset";
10+
/* (No Comment) */
1111
"I4OZy8" = "Enable Override Preset";
12-
"XNNmtH" = "Enable preset in Loop";
13-
"ZZ3mtM" = "Enable an override preset in Loop";
14-
"b085BW" = "I wasn't able to set the preset.";
12+
13+
/* (No Comment) */
1514
"lYMuWV" = "Override Name";
15+
16+
/* (No Comment) */
1617
"nDKAmn" = "What's the name of the override you'd like to set?";
18+
19+
/* (No Comment) */
20+
"OcNxIj" = "Lisää hiilihydraatteja";
21+
22+
/* (No Comment) */
1723
"oLQSsJ" = "Enable '${overrideName}' Override Preset";
24+
25+
/* (No Comment) */
26+
"XNNmtH" = "Enable preset in Loop";
27+
28+
/* (No Comment) */
1829
"yBzwCL" = "Override Selection";
30+
31+
/* (No Comment) */
32+
"yc02Yq" = "Lisää hiilihydraatteja Loopiin";
33+
34+
/* (No Comment) */
35+
"ZZ3mtM" = "Enable an override preset in Loop";
36+

0 commit comments

Comments
 (0)