Skip to content

Commit d7deb46

Browse files
ps2ps2
authored
Merge pull request #560 from tidepool-org/ps2/LOOP-887/keycloak-updates
LOOP-887 Keycloak updates and DIY Sync
2 parents 58ed7ed + 9a8556d commit d7deb46

File tree

505 files changed

+26054
-6740
lines changed

Some content is hidden

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

505 files changed

+26054
-6740
lines changed

‎Common/FeatureFlags.swift

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,15 @@ struct FeatureFlagConfiguration: Decodable {
3030
let predictedGlucoseChartClampEnabled: Bool
3131
let scenariosEnabled: Bool
3232
let sensitivityOverridesEnabled: Bool
33+
let showEventualBloodGlucoseOnWatchEnabled: Bool
3334
let simulatedCoreDataEnabled: Bool
3435
let siriEnabled: Bool
3536
let simpleBolusCalculatorEnabled: Bool
3637
let usePositiveMomentumAndRCForManualBoluses: Bool
3738
let dynamicCarbAbsorptionEnabled: Bool
3839
let adultChildInsulinModelSelectionEnabled: Bool
40+
let profileExpirationSettingsViewEnabled: Bool
41+
let missedMealNotifications: Bool
3942

4043

4144
fileprivate init() {
@@ -159,7 +162,7 @@ struct FeatureFlagConfiguration: Decodable {
159162
#endif
160163

161164
// Swift compiler config is inverse, since the default state is enabled.
162-
#if REMOTE_COMMANDS_DISABLED
165+
#if REMOTE_COMMANDS_DISABLED || REMOTE_OVERRIDES_DISABLED //REMOTE_OVERRIDES_DISABLED: backwards compatibility of Loop 3 & prior
163166
self.remoteCommandsEnabled = false
164167
#else
165168
self.remoteCommandsEnabled = true
@@ -171,6 +174,13 @@ struct FeatureFlagConfiguration: Decodable {
171174
self.scenariosEnabled = false
172175
#endif
173176

177+
// Swift compiler config is inverse, since the default state is enabled.
178+
#if SHOW_EVENTUAL_BLOOD_GLUCOSE_ON_WATCH_DISABLED
179+
self.showEventualBloodGlucoseOnWatchEnabled = false
180+
#else
181+
self.showEventualBloodGlucoseOnWatchEnabled = true
182+
#endif
183+
174184
#if SIMULATED_CORE_DATA_ENABLED
175185
self.simulatedCoreDataEnabled = true
176186
#else
@@ -204,6 +214,21 @@ struct FeatureFlagConfiguration: Decodable {
204214
#endif
205215

206216
self.dynamicCarbAbsorptionEnabled = true
217+
218+
// ProfileExpirationSettingsView is inverse, since the default state is enabled.
219+
#if PROFILE_EXPIRATION_SETTINGS_VIEW_DISABLED
220+
self.profileExpirationSettingsViewEnabled = false
221+
#else
222+
self.profileExpirationSettingsViewEnabled = true
223+
#endif
224+
225+
// Missed meal notifications compiler flag is inverse, since the default state is enabled.
226+
#if MISSED_MEAL_NOTIFICATIONS_DISABLED
227+
self.missedMealNotifications = false
228+
#else
229+
self.missedMealNotifications = true
230+
#endif
231+
207232
}
208233
}
209234

@@ -227,6 +252,7 @@ extension FeatureFlagConfiguration : CustomDebugStringConvertible {
227252
"* remoteCommandsEnabled: \(remoteCommandsEnabled)",
228253
"* scenariosEnabled: \(scenariosEnabled)",
229254
"* sensitivityOverridesEnabled: \(sensitivityOverridesEnabled)",
255+
"* showEventualBloodGlucoseOnWatchEnabled: \(showEventualBloodGlucoseOnWatchEnabled)",
230256
"* simulatedCoreDataEnabled: \(simulatedCoreDataEnabled)",
231257
"* siriEnabled: \(siriEnabled)",
232258
"* automaticBolusEnabled: \(automaticBolusEnabled)",
@@ -235,7 +261,9 @@ extension FeatureFlagConfiguration : CustomDebugStringConvertible {
235261
"* simpleBolusCalculatorEnabled: \(simpleBolusCalculatorEnabled)",
236262
"* usePositiveMomentumAndRCForManualBoluses: \(usePositiveMomentumAndRCForManualBoluses)",
237263
"* dynamicCarbAbsorptionEnabled: \(dynamicCarbAbsorptionEnabled)",
238-
"* adultChildInsulinModelSelectionEnabled: \(adultChildInsulinModelSelectionEnabled)"
264+
"* adultChildInsulinModelSelectionEnabled: \(adultChildInsulinModelSelectionEnabled)",
265+
"* profileExpirationSettingsViewEnabled: \(profileExpirationSettingsViewEnabled)",
266+
"* missedMealNotifications: \(missedMealNotifications)"
239267
].joined(separator: "\n")
240268
}
241269
}

‎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/cs.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/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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"9KhaIS" = "Voreinstellung gesetzt";
33

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

77
/* (No Comment) */
88
"b085BW" = "Voreinstellung konnte nicht gesetzt werden.";
@@ -14,10 +14,10 @@
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) */
20-
"OcNxIj" = "KH-Eintrag hinzufügen";
20+
"OcNxIj" = "Kohlenhydrate hinzufügen";
2121

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

‎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 Entrada de Carb";
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 Entrada de Carb";
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+

0 commit comments

Comments
 (0)