Skip to content

Commit

Permalink
Merge pull request #1949 from LoopKit/dev
Browse files Browse the repository at this point in the history
Release 3.2
  • Loading branch information
ps2 committed Mar 17, 2023
2 parents 743b8d7 + a1fb919 commit bcb4ed9
Show file tree
Hide file tree
Showing 430 changed files with 22,522 additions and 5,419 deletions.
21 changes: 15 additions & 6 deletions Common/FeatureFlags.swift
Expand Up @@ -26,7 +26,7 @@ struct FeatureFlagConfiguration: Decodable {
let observeHealthKitCarbSamplesFromOtherApps: Bool
let observeHealthKitDoseSamplesFromOtherApps: Bool
let observeHealthKitGlucoseSamplesFromOtherApps: Bool
let remoteOverridesEnabled: Bool
let remoteCommandsEnabled: Bool
let predictedGlucoseChartClampEnabled: Bool
let scenariosEnabled: Bool
let sensitivityOverridesEnabled: Bool
Expand All @@ -37,6 +37,7 @@ struct FeatureFlagConfiguration: Decodable {
let usePositiveMomentumAndRCForManualBoluses: Bool
let dynamicCarbAbsorptionEnabled: Bool
let adultChildInsulinModelSelectionEnabled: Bool
let profileExpirationSettingsViewEnabled: Bool


fileprivate init() {
Expand Down Expand Up @@ -160,10 +161,10 @@ struct FeatureFlagConfiguration: Decodable {
#endif

// Swift compiler config is inverse, since the default state is enabled.
#if REMOTE_OVERRIDES_DISABLED
self.remoteOverridesEnabled = false
#if REMOTE_COMMANDS_DISABLED || REMOTE_OVERRIDES_DISABLED //REMOTE_OVERRIDES_DISABLED: backwards compatibility of Loop 3 & prior
self.remoteCommandsEnabled = false
#else
self.remoteOverridesEnabled = true
self.remoteCommandsEnabled = true
#endif

#if SCENARIOS_ENABLED
Expand Down Expand Up @@ -212,6 +213,13 @@ struct FeatureFlagConfiguration: Decodable {
#endif

self.dynamicCarbAbsorptionEnabled = true

// ProfileExpirationSettingsView is inverse, since the default state is enabled.
#if PROFILE_EXPIRATION_SETTINGS_VIEW_DISABLED
self.profileExpirationSettingsViewEnabled = false
#else
self.profileExpirationSettingsViewEnabled = true
#endif
}
}

Expand All @@ -232,7 +240,7 @@ extension FeatureFlagConfiguration : CustomDebugStringConvertible {
"* observeHealthKitDoseSamplesFromOtherApps: \(observeHealthKitDoseSamplesFromOtherApps)",
"* observeHealthKitGlucoseSamplesFromOtherApps: \(observeHealthKitGlucoseSamplesFromOtherApps)",
"* predictedGlucoseChartClampEnabled: \(predictedGlucoseChartClampEnabled)",
"* remoteOverridesEnabled: \(remoteOverridesEnabled)",
"* remoteCommandsEnabled: \(remoteCommandsEnabled)",
"* scenariosEnabled: \(scenariosEnabled)",
"* sensitivityOverridesEnabled: \(sensitivityOverridesEnabled)",
"* showEventualBloodGlucoseOnWatchEnabled: \(showEventualBloodGlucoseOnWatchEnabled)",
Expand All @@ -244,7 +252,8 @@ extension FeatureFlagConfiguration : CustomDebugStringConvertible {
"* simpleBolusCalculatorEnabled: \(simpleBolusCalculatorEnabled)",
"* usePositiveMomentumAndRCForManualBoluses: \(usePositiveMomentumAndRCForManualBoluses)",
"* dynamicCarbAbsorptionEnabled: \(dynamicCarbAbsorptionEnabled)",
"* adultChildInsulinModelSelectionEnabled: \(adultChildInsulinModelSelectionEnabled)"
"* adultChildInsulinModelSelectionEnabled: \(adultChildInsulinModelSelectionEnabled)",
"* profileExpirationSettingsViewEnabled: \(profileExpirationSettingsViewEnabled)"
].joined(separator: "\n")
}
}
Expand Down
36 changes: 36 additions & 0 deletions Common/ar.lproj/Intents.strings
@@ -0,0 +1,36 @@
/* (No Comment) */
"9KhaIS" = "I've set the preset";

/* (No Comment) */
"80eo5o" = "Add Carb Entry";

/* (No Comment) */
"b085BW" = "I wasn't able to set the preset.";

/* (No Comment) */
"I4OZy8" = "Enable Override Preset";

/* (No Comment) */
"lYMuWV" = "Override Name";

/* (No Comment) */
"nDKAmn" = "What's the name of the override you'd like to set?";

/* (No Comment) */
"OcNxIj" = "Add Carb Entry";

/* (No Comment) */
"oLQSsJ" = "Enable '${overrideName}' Override Preset";

/* (No Comment) */
"XNNmtH" = "Enable preset in Loop";

/* (No Comment) */
"yBzwCL" = "Override Selection";

/* (No Comment) */
"yc02Yq" = "Add a carb entry to Loop";

/* (No Comment) */
"ZZ3mtM" = "Enable an override preset in Loop";

24 changes: 24 additions & 0 deletions Common/ar.lproj/Localizable.strings
@@ -0,0 +1,24 @@
/* 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" = "Add Carb Entry";

/* 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";

/* 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";

38 changes: 28 additions & 10 deletions Common/da.lproj/Intents.strings
@@ -1,18 +1,36 @@
/* (No Comment) */
"9KhaIS" = "Jeg har indstillet forudindstillingen";

/* (No Comment) */
"80eo5o" = "Tilføj kulhydrater";

/* (No Comment) */
"b085BW" = "Jeg var ikke i stand til at indstille forudindstillingen.";

/* (No Comment) */
"I4OZy8" = "Aktiver forudindstilling for Override";

/* (No Comment) */
"lYMuWV" = "Override navn";

/* (No Comment) */
"nDKAmn" = "Hvad er navnet på den Override, du vil angive?";

/* (No Comment) */
"OcNxIj" = "Tilføj kulhydrater";

/* (No Comment) */
"yc02Yq" = "Tilføj kulhydrater til Loop.";
"oLQSsJ" = "Aktiver \"${overrideName}\" Override forudindstilling";

/* (No Comment) */
"XNNmtH" = "Aktiver forudindstilling i Loop";

/* (No Comment) */
"yBzwCL" = "Override valg";

/* (No Comment) */
"yc02Yq" = "Tilføj kulhydrater til Loop";

/* (No Comment) */
"ZZ3mtM" = "Aktivere en forudindstilling for Override i Loop";

"9KhaIS" = "I've set the preset";
"I4OZy8" = "Enable Override Preset";
"XNNmtH" = "Enable preset in Loop";
"ZZ3mtM" = "Enable an override preset in Loop";
"b085BW" = "I wasn't able to set the preset.";
"lYMuWV" = "Override Name";
"nDKAmn" = "What's the name of the override you'd like to set?";
"oLQSsJ" = "Enable '${overrideName}' Override Preset";
"yBzwCL" = "Override Selection";
13 changes: 8 additions & 5 deletions Common/da.lproj/Localizable.strings
Expand Up @@ -4,6 +4,9 @@
/* Title of the user activity for adding carbs */
"Add Carb Entry" = "Tilføj kulhydrater";

/* Lesson subtitle */
"Computes the percentage of glucose measurements within a specified range" = "Beregner procentdelen af ​​blodsukkermålinger inden for et specificeret interval";

/* Title of the button to begin lesson execution */
"Continue" = "Fortsæt";

Expand All @@ -14,7 +17,7 @@
"g" = "g";

/* Placeholder for upper range entry */
"Maximum" = "Maximum";
"Maximum" = "Maksimum";

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

/* Lesson title */
"Modal Day" = "Modal Dag";
"Modal Day" = "Modal-dag";

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

/* Title of config entry */
"Start Date" = "Start Dato";
"Start Date" = "Startdato";

/* Lesson title */
"Time in Range" = "Tme in Range";
"Time in Range" = "Tid inden for korrektionsområde";

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

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

/* Unit string for a count of calendar weeks */
"Weeks" = "Uger";
Expand Down
2 changes: 1 addition & 1 deletion Common/de.lproj/Intents.strings
Expand Up @@ -14,7 +14,7 @@
"lYMuWV" = "Voreinstellungs-Name";

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

/* (No Comment) */
"OcNxIj" = "KH-Eintrag hinzufügen";
Expand Down
38 changes: 28 additions & 10 deletions Common/es.lproj/Intents.strings
@@ -1,18 +1,36 @@
/* INIntentTitle */
"80eo5o" = "Agregar Registro de Carbs";
/* (No Comment) */
"9KhaIS" = "He establecido el ajuste";

/* INIntentParameterCombinationTitle */
"OcNxIj" = "Agregar Registro de Carbs";
/* (No Comment) */
"80eo5o" = "Agregar Registro de Carbs";

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

"9KhaIS" = "I've set the preset";
/* (No Comment) */
"I4OZy8" = "Enable Override Preset";
"XNNmtH" = "Enable preset in Loop";
"ZZ3mtM" = "Enable an override preset in Loop";
"b085BW" = "I wasn't able to set the preset.";

/* (No Comment) */
"lYMuWV" = "Override Name";

/* (No Comment) */
"nDKAmn" = "What's the name of the override you'd like to set?";

/* (No Comment) */
"OcNxIj" = "Agregar Registro de Carbs";

/* (No Comment) */
"oLQSsJ" = "Enable '${overrideName}' Override Preset";

/* (No Comment) */
"XNNmtH" = "Enable preset in Loop";

/* (No Comment) */
"yBzwCL" = "Override Selection";

/* (No Comment) */
"yc02Yq" = "Agregar registro de carbs a Loop";

/* (No Comment) */
"ZZ3mtM" = "Enable an override preset in Loop";

24 changes: 24 additions & 0 deletions Common/es.lproj/Localizable.strings
Expand Up @@ -7,18 +7,33 @@
/* Lesson subtitle */
"Computes the percentage of glucose measurements within a specified range" = "Calcula el porcentaje de medidas de glucosa entre una gama especificada";

/* Title of the button to begin lesson execution */
"Continue" = "Continuar";

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

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

/* Placeholder for upper range entry */
"Maximum" = "Máximo";

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

/* Placeholder for lower range entry */
"Minimum" = "Mínimo";

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

/* Lesson title */
"Modal Day" = "Día modal";

/* Lesson result text for no data */
"No data available" = "Datos no disponibles";

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

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

/* Lesson title */
"Time in Range" = "Tiempo en Rango";

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

/* Lesson subtitle */
"Visualizes the most frequent glucose values by time of day" = "Visualiza los valores de glucosa más frecuentes por hora del día";

/* Unit string for a count of calendar weeks */
"Weeks" = "Semanas";

32 changes: 25 additions & 7 deletions Common/fi.lproj/Intents.strings
@@ -1,18 +1,36 @@
/* (No Comment) */
"80eo5o" = "Lisää hiilihydraatteja";
"9KhaIS" = "I've set the preset";

/* (No Comment) */
"OcNxIj" = "Lisää hiilihydraatteja";
"80eo5o" = "Lisää hiilihydraatteja";

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

"9KhaIS" = "I've set the preset";
/* (No Comment) */
"I4OZy8" = "Enable Override Preset";
"XNNmtH" = "Enable preset in Loop";
"ZZ3mtM" = "Enable an override preset in Loop";
"b085BW" = "I wasn't able to set the preset.";

/* (No Comment) */
"lYMuWV" = "Override Name";

/* (No Comment) */
"nDKAmn" = "What's the name of the override you'd like to set?";

/* (No Comment) */
"OcNxIj" = "Lisää hiilihydraatteja";

/* (No Comment) */
"oLQSsJ" = "Enable '${overrideName}' Override Preset";

/* (No Comment) */
"XNNmtH" = "Enable preset in Loop";

/* (No Comment) */
"yBzwCL" = "Override Selection";

/* (No Comment) */
"yc02Yq" = "Lisää hiilihydraatteja Loopiin";

/* (No Comment) */
"ZZ3mtM" = "Enable an override preset in Loop";

0 comments on commit bcb4ed9

Please sign in to comment.