LoopKit · jakalm · Sep 2, 2024
diff --git a/Common/sv.lproj/Localizable.strings b/Common/sv.lproj/Localizable.strings
@@ -4,54 +4,20 @@
 /* Title of the user activity for adding carbs */
 "Add Carb Entry" = "Lägg till kolhydrater";
 
-/* Lesson subtitle */
-"Computes the percentage of glucose measurements within a specified range" = "Beräknar procentandelen glukosmätningar inom ett specifikt målvärde";
-
-/* Title of the button to begin lesson execution */
-"Continue" = "Fortsätt";
-
 /* The short unit display string for decibles */
 "dB" = "dB";
 
 /* The short unit display string for grams */
 "g" = "g";
 
-/* Placeholder for upper range entry */
-"Maximum" = "Maximum";
-
 /* The short unit display string for milligrams of glucose per decilter */
 "mg/dL" = "mg/dl";
 
-/* Placeholder for lower range entry */
-"Minimum" = "Minimum";
-
 /* The short unit display string for millimoles of glucose per liter */
 "mmol/L" = "mmol/l";
 
-/* Lesson title */
-"Modal Day" = "Genomsnittlig dag";
-
-/* Lesson result text for no data */
-"No data available" = "Ingen data tillgänglig";
-
 /* 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" = "Målvärde";
-
-/* Title of config entry */
-"Start Date" = "Starttid";
-
-/* Lesson title */
-"Time in Range" = "Tid inom målvärde";
-
 /* The short unit display string for international units of insulin */
 "U" = "E";
-
-/* Lesson subtitle */
-"Visualizes the most frequent glucose values by time of day" = "Visar de vanligaste glukosvärdena under olika tider på dagen";
-
-/* Unit string for a count of calendar weeks */
-"Weeks" = "Veckor";
-
diff --git a/Loop Intent Extension/sv.lproj/Localizable.strings b/Loop Intent Extension/sv.lproj/Localizable.strings
diff --git a/Loop Status Extension/sv.lproj/Localizable.strings b/Loop Status Extension/sv.lproj/Localizable.strings
@@ -10,36 +10,8 @@
 /* The subtitle format describing units of active insulin. (1: localized insulin value description) */
 "%1$@ U" = "%1$@ E";
 
-/* The format string for the app name and version number. (1: bundle name)(2: bundle version) */
-"%1$@ v%2$@" = "%1$@ v%2$@";
-
 /* Widget label title describing the active carbs */
 "Active Carbs" = "Aktiva kolhydrater";
 
 /* Widget label title describing the active insulin */
 "Active Insulin" = "Aktivt insulin";
-
-/* The short unit display string for decibles */
-"dB" = "dB";
-
-/* The subtitle format describing eventual glucose.  (1: localized glucose value description) */
-"Eventually %1$@" = "Förväntat %1$@";
-
-/* The short unit display string for grams */
-"g" = "g";
-
-/* The subtitle format describing units of active insulin. (1: localized insulin value description) */
-"IOB %1$@ U" = "IOB %1$@ E";
-
-/* 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" = "E";
-
diff --git a/Loop.xcodeproj/project.pbxproj b/Loop.xcodeproj/project.pbxproj
@@ -1335,7 +1335,6 @@
 		C1004DFC2981F5B700B8CF94 /* da */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = da; path = da.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		C1004DFD2981F67A00B8CF94 /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		C1004DFE2981F67A00B8CF94 /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		C1004DFF2981F67A00B8CF94 /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/Localizable.strings; sourceTree = "<group>"; };
 		C1004E002981F67A00B8CF94 /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		C1004E012981F67A00B8CF94 /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/Localizable.strings; sourceTree = "<group>"; };
 		C1004E022981F67A00B8CF94 /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/InfoPlist.strings; sourceTree = "<group>"; };
@@ -4683,7 +4682,6 @@
 			isa = PBXVariantGroup;
 			children = (
 				C1004DF42981F5B700B8CF94 /* da */,
-				C1004DFF2981F67A00B8CF94 /* sv */,
 				C1004E072981F6A100B8CF94 /* ro */,
 				C1004E0F2981F6E200B8CF94 /* nl */,
 				C1004E172981F6F500B8CF94 /* nb */,

diff --git a/Loop/Views/AddEditFavoriteFoodView.swift b/Loop/Views/AddEditFavoriteFoodView.swift
@@ -44,7 +44,7 @@ struct AddEditFavoriteFoodView: View {
                             saveButton
                         }
                     }
-                    .navigationBarTitle("New Favorite Food", displayMode: .inline)
+                    .navigationBarTitle(NSLocalizedString("New Favorite Food", comment: "Title of new favorite food screen"), displayMode: .inline)
                     .onAppear {
                         expandedRow = .name
                     }
@@ -92,20 +92,20 @@ struct AddEditFavoriteFoodView: View {
             let carbQuantityFocused: Binding<Bool> = Binding(get: { expandedRow == .carbQuantity }, set: { expandedRow = $0 ? .carbQuantity : nil })
             let foodTypeFocused: Binding<Bool> = Binding(get: { expandedRow == .foodType }, set: { expandedRow = $0 ? .foodType : nil })
             let absorptionTimeFocused: Binding<Bool> = Binding(get: { expandedRow == .absorptionTime }, set: { expandedRow = $0 ? .absorptionTime : nil })
-            
-            TextFieldRow(text: $viewModel.name, isFocused: nameFocused, title: "Name", placeholder: "Apple")
-            
+
+            TextFieldRow(text: $viewModel.name, isFocused: nameFocused, title: NSLocalizedString("Name", comment: "Label for name row on add favorite food screen"), placeholder: NSLocalizedString("Apple", comment: "Default name on add favorite food screen"))
+
             CardSectionDivider()
 
-            CarbQuantityRow(quantity: $viewModel.carbsQuantity, isFocused: carbQuantityFocused, title: "Carb Quantity", preferredCarbUnit: viewModel.preferredCarbUnit)
-            
+            CarbQuantityRow(quantity: $viewModel.carbsQuantity, isFocused: carbQuantityFocused, title: NSLocalizedString("Carb Quantity", comment: "Label for carb quantity row on add favorite food screen"), preferredCarbUnit: viewModel.preferredCarbUnit)
+
             CardSectionDivider()
-            
-            EmojiRow(text: $viewModel.foodType, isFocused: foodTypeFocused, emojiType: .food, title: "Food Type")
-            
+
+            EmojiRow(text: $viewModel.foodType, isFocused: foodTypeFocused, emojiType: .food, title: NSLocalizedString("Food Type", comment: "Label for food type entry on add favorite food screen"))
+
             CardSectionDivider()
 
-            AbsorptionTimePickerRow(absorptionTime: $viewModel.absorptionTime, isFocused: absorptionTimeFocused, validDurationRange: viewModel.absorptionRimesRange, showHowAbsorptionTimeWorks: $showHowAbsorptionTimeWorks)
+            AbsorptionTimePickerRow(absorptionTime: $viewModel.absorptionTime, isFocused: absorptionTimeFocused, title: NSLocalizedString("Absorption Time", comment: "Label for absorption time entry row on add favorite food screen"), validDurationRange: viewModel.absorptionRimesRange, showHowAbsorptionTimeWorks: $showHowAbsorptionTimeWorks)
                 .padding(.bottom, 2)
         }
         .padding(.vertical, 12)
@@ -145,13 +145,13 @@ struct AddEditFavoriteFoodView: View {
 extension AddEditFavoriteFoodView {
     private var dismissButton: some View {
         Button(action: dismiss.callAsFunction) {
-            Text("Cancel")
+            Text(NSLocalizedString("Cancel", comment: "Favorite food cancel button"))
         }
     }
 
     private var saveActionButton: some View {
         Button(action: viewModel.save) {
-            Text("Save")
+            Text(NSLocalizedString("Save", comment: "Favorite food save button"))
         }
         .buttonStyle(ActionButtonStyle())
         .padding()
@@ -160,7 +160,7 @@ extension AddEditFavoriteFoodView {
 
     private var saveButton: some View {
         Button(action: viewModel.save) {
-            Text("Save")
+            Text(NSLocalizedString("Save", comment: "Favorite food save button"))
         }
         .disabled(viewModel.updatedFavoriteFood == nil)
     }

diff --git a/Loop/Views/BolusEntryView.swift b/Loop/Views/BolusEntryView.swift
@@ -311,7 +311,7 @@ struct BolusEntryView: View {
             let suspendThresholdString = displayGlucosePreference.format(suspendThreshold)
             return WarningView(
                 title: Text("No Bolus Recommended", comment: "Title for bolus screen notice when no bolus is recommended"),
-                caption: Text("Your glucose is below or predicted to go below your glucose safety limit, \(suspendThresholdString).", comment: "Caption for bolus screen notice when no bolus is recommended due to prediction dropping below glucose safety limit")
+                caption: Text(String(format: NSLocalizedString("Your glucose is below or predicted to go below your glucose safety limit, \(suspendThresholdString).", comment: "Caption for bolus screen notice when no bolus is recommended due to prediction dropping below glucose safety limit")))
             )
         case .staleGlucoseData:
             return WarningView(

diff --git a/Loop/Views/CarbEntryView.swift b/Loop/Views/CarbEntryView.swift
@@ -106,15 +106,15 @@ struct CarbEntryView: View, HorizontalSizeClassOverride {
 
             CardSectionDivider()
 
-            DatePickerRow(date: $viewModel.time, isFocused: timeFocused, minimumDate: viewModel.minimumDate, maximumDate: viewModel.maximumDate)
+            DatePickerRow(date: $viewModel.time, isFocused: timeFocused, title: NSLocalizedString("Time", comment: "Label for time entry row on carb entry screen"), minimumDate: viewModel.minimumDate, maximumDate: viewModel.maximumDate)
 
             CardSectionDivider()
 
-            FoodTypeRow(foodType: $viewModel.foodType, absorptionTime: $viewModel.absorptionTime, selectedDefaultAbsorptionTimeEmoji: $viewModel.selectedDefaultAbsorptionTimeEmoji, usesCustomFoodType: $viewModel.usesCustomFoodType, absorptionTimeWasEdited: $viewModel.absorptionTimeWasEdited, isFocused: foodTypeFocused, defaultAbsorptionTimes: viewModel.defaultAbsorptionTimes)
+            FoodTypeRow(foodType: $viewModel.foodType, absorptionTime: $viewModel.absorptionTime, selectedDefaultAbsorptionTimeEmoji: $viewModel.selectedDefaultAbsorptionTimeEmoji, usesCustomFoodType: $viewModel.usesCustomFoodType, absorptionTimeWasEdited: $viewModel.absorptionTimeWasEdited, isFocused: foodTypeFocused, title: NSLocalizedString("Food Type", comment: "Label for food type entry row on carb entry screen"), defaultAbsorptionTimes: viewModel.defaultAbsorptionTimes)
 
             CardSectionDivider()
 
-            AbsorptionTimePickerRow(absorptionTime: $viewModel.absorptionTime, isFocused: absorptionTimeFocused, validDurationRange: viewModel.absorptionRimesRange, showHowAbsorptionTimeWorks: $showHowAbsorptionTimeWorks)
+            AbsorptionTimePickerRow(absorptionTime: $viewModel.absorptionTime, isFocused: absorptionTimeFocused, title: NSLocalizedString("Absorption Time", comment: "Label for absorption time entry row on carb entry screen"), validDurationRange: viewModel.absorptionRimesRange, showHowAbsorptionTimeWorks: $showHowAbsorptionTimeWorks)
                 .padding(.bottom, 2)
         }
         .padding(.vertical, 12)

diff --git a/Loop/Views/FavoriteFoodsView.swift b/Loop/Views/FavoriteFoodsView.swift
@@ -61,7 +61,7 @@ struct FavoriteFoodsView: View {
                     dismissButton
                 }
             }
-            .navigationBarTitle("Favorite Foods", displayMode: .large)
+            .navigationBarTitle(NSLocalizedString("Favorite Foods", comment: "Favorite Foods view title"), displayMode: .large)
         }
         .sheet(isPresented: $viewModel.isAddViewActive) {
             AddEditFavoriteFoodView(onSave: viewModel.onFoodSave(_:))

diff --git a/Loop/Views/SettingsView.swift b/Loop/Views/SettingsView.swift
@@ -369,8 +369,8 @@ extension SettingsView {
             LargeButton(action: { sheet = .favoriteFoods },
                         includeArrow: true,
                         imageView: Image("Favorite Foods Icon").renderingMode(.template).foregroundColor(carbTintColor),
-                        label: "Favorite Foods",
-                        descriptiveText: "Simplify Carb Entry")
+                        label: NSLocalizedString("Favorite Foods", comment: "Button title for entering Favorite Foods settings"),
+                        descriptiveText: NSLocalizedString("Simplify Carb Entry", comment: "Descriptive text for Favorite Foods setting button"))
         }
     }