diff --git a/xdrip/Core Data/classes/TreatmentEntry+CoreDataClass.swift b/xdrip/Core Data/classes/TreatmentEntry+CoreDataClass.swift index 1a0d968f..29b1d7cf 100644 --- a/xdrip/Core Data/classes/TreatmentEntry+CoreDataClass.swift +++ b/xdrip/Core Data/classes/TreatmentEntry+CoreDataClass.swift @@ -24,13 +24,13 @@ import CoreData public func asString() -> String { switch self { case .Insulin: - return "Insulin" + return Texts_TreatmentsView.insulin case .Carbs: - return "Carbs" + return Texts_TreatmentsView.carbs case .Exercise: - return "Exercise" + return Texts_TreatmentsView.exercise default: - return "Unknown" + return Texts_TreatmentsView.questionMark } } @@ -38,13 +38,13 @@ import CoreData public func unit() -> String { switch self { case .Insulin: - return "u" + return Texts_TreatmentsView.insulinUnit case .Carbs: - return "g" + return Texts_TreatmentsView.carbsUnit case .Exercise: - return "min" + return Texts_TreatmentsView.exerciseUnit default: - return "" + return Texts_TreatmentsView.questionMark } } } diff --git a/xdrip/Storyboards/ar.lproj/Treatments.strings b/xdrip/Storyboards/ar.lproj/Treatments.strings index 8446cda6..982ac12f 100644 --- a/xdrip/Storyboards/ar.lproj/Treatments.strings +++ b/xdrip/Storyboards/ar.lproj/Treatments.strings @@ -8,5 +8,12 @@ "treatments_carbs_with_unit" = "Carbs (g):"; "treatments_insulin_with_unit" = "Insulin (U):"; "treatments_exercise_with_unit" = "Exercise (min):"; +"treatments_carbs_unit" = "g"; +"treatments_insulin_unit" = "U"; +"treatments_exercise_unit" = "min"; +"treatments_carbs" = "Carbs"; +"treatments_insulin" = "Insulin"; +"treatments_exercise" = "Exercise"; +"treatments_question_mark" = "?"; "treatments_success" = "Success"; "treatments_upload_complete" = "Upload complete."; \ No newline at end of file diff --git a/xdrip/Storyboards/de.lproj/Treatments.strings b/xdrip/Storyboards/de.lproj/Treatments.strings index 8446cda6..982ac12f 100644 --- a/xdrip/Storyboards/de.lproj/Treatments.strings +++ b/xdrip/Storyboards/de.lproj/Treatments.strings @@ -8,5 +8,12 @@ "treatments_carbs_with_unit" = "Carbs (g):"; "treatments_insulin_with_unit" = "Insulin (U):"; "treatments_exercise_with_unit" = "Exercise (min):"; +"treatments_carbs_unit" = "g"; +"treatments_insulin_unit" = "U"; +"treatments_exercise_unit" = "min"; +"treatments_carbs" = "Carbs"; +"treatments_insulin" = "Insulin"; +"treatments_exercise" = "Exercise"; +"treatments_question_mark" = "?"; "treatments_success" = "Success"; "treatments_upload_complete" = "Upload complete."; \ No newline at end of file diff --git a/xdrip/Storyboards/en.lproj/Treatments.strings b/xdrip/Storyboards/en.lproj/Treatments.strings index ded1aedb..518c7869 100644 --- a/xdrip/Storyboards/en.lproj/Treatments.strings +++ b/xdrip/Storyboards/en.lproj/Treatments.strings @@ -4,5 +4,12 @@ "treatments_carbs_with_unit" = "Carbs (g):"; "treatments_insulin_with_unit" = "Insulin (U):"; "treatments_exercise_with_unit" = "Exercise (min):"; +"treatments_carbs_unit" = "g"; +"treatments_insulin_unit" = "U"; +"treatments_exercise_unit" = "min"; +"treatments_carbs" = "Carbs"; +"treatments_insulin" = "Insulin"; +"treatments_exercise" = "Exercise"; +"treatments_question_mark" = "?"; "treatments_success" = "Success"; "treatments_upload_complete" = "Upload complete."; \ No newline at end of file diff --git a/xdrip/Storyboards/es.lproj/Treatments.strings b/xdrip/Storyboards/es.lproj/Treatments.strings index 8446cda6..982ac12f 100644 --- a/xdrip/Storyboards/es.lproj/Treatments.strings +++ b/xdrip/Storyboards/es.lproj/Treatments.strings @@ -8,5 +8,12 @@ "treatments_carbs_with_unit" = "Carbs (g):"; "treatments_insulin_with_unit" = "Insulin (U):"; "treatments_exercise_with_unit" = "Exercise (min):"; +"treatments_carbs_unit" = "g"; +"treatments_insulin_unit" = "U"; +"treatments_exercise_unit" = "min"; +"treatments_carbs" = "Carbs"; +"treatments_insulin" = "Insulin"; +"treatments_exercise" = "Exercise"; +"treatments_question_mark" = "?"; "treatments_success" = "Success"; "treatments_upload_complete" = "Upload complete."; \ No newline at end of file diff --git a/xdrip/Storyboards/fi.lproj/Treatments.strings b/xdrip/Storyboards/fi.lproj/Treatments.strings index 8446cda6..982ac12f 100644 --- a/xdrip/Storyboards/fi.lproj/Treatments.strings +++ b/xdrip/Storyboards/fi.lproj/Treatments.strings @@ -8,5 +8,12 @@ "treatments_carbs_with_unit" = "Carbs (g):"; "treatments_insulin_with_unit" = "Insulin (U):"; "treatments_exercise_with_unit" = "Exercise (min):"; +"treatments_carbs_unit" = "g"; +"treatments_insulin_unit" = "U"; +"treatments_exercise_unit" = "min"; +"treatments_carbs" = "Carbs"; +"treatments_insulin" = "Insulin"; +"treatments_exercise" = "Exercise"; +"treatments_question_mark" = "?"; "treatments_success" = "Success"; "treatments_upload_complete" = "Upload complete."; \ No newline at end of file diff --git a/xdrip/Storyboards/fr.lproj/Treatments.strings b/xdrip/Storyboards/fr.lproj/Treatments.strings index 8446cda6..982ac12f 100644 --- a/xdrip/Storyboards/fr.lproj/Treatments.strings +++ b/xdrip/Storyboards/fr.lproj/Treatments.strings @@ -8,5 +8,12 @@ "treatments_carbs_with_unit" = "Carbs (g):"; "treatments_insulin_with_unit" = "Insulin (U):"; "treatments_exercise_with_unit" = "Exercise (min):"; +"treatments_carbs_unit" = "g"; +"treatments_insulin_unit" = "U"; +"treatments_exercise_unit" = "min"; +"treatments_carbs" = "Carbs"; +"treatments_insulin" = "Insulin"; +"treatments_exercise" = "Exercise"; +"treatments_question_mark" = "?"; "treatments_success" = "Success"; "treatments_upload_complete" = "Upload complete."; \ No newline at end of file diff --git a/xdrip/Storyboards/it.lproj/Treatments.strings b/xdrip/Storyboards/it.lproj/Treatments.strings index 8446cda6..982ac12f 100644 --- a/xdrip/Storyboards/it.lproj/Treatments.strings +++ b/xdrip/Storyboards/it.lproj/Treatments.strings @@ -8,5 +8,12 @@ "treatments_carbs_with_unit" = "Carbs (g):"; "treatments_insulin_with_unit" = "Insulin (U):"; "treatments_exercise_with_unit" = "Exercise (min):"; +"treatments_carbs_unit" = "g"; +"treatments_insulin_unit" = "U"; +"treatments_exercise_unit" = "min"; +"treatments_carbs" = "Carbs"; +"treatments_insulin" = "Insulin"; +"treatments_exercise" = "Exercise"; +"treatments_question_mark" = "?"; "treatments_success" = "Success"; "treatments_upload_complete" = "Upload complete."; \ No newline at end of file diff --git a/xdrip/Storyboards/nl.lproj/Treatments.strings b/xdrip/Storyboards/nl.lproj/Treatments.strings index 8446cda6..982ac12f 100644 --- a/xdrip/Storyboards/nl.lproj/Treatments.strings +++ b/xdrip/Storyboards/nl.lproj/Treatments.strings @@ -8,5 +8,12 @@ "treatments_carbs_with_unit" = "Carbs (g):"; "treatments_insulin_with_unit" = "Insulin (U):"; "treatments_exercise_with_unit" = "Exercise (min):"; +"treatments_carbs_unit" = "g"; +"treatments_insulin_unit" = "U"; +"treatments_exercise_unit" = "min"; +"treatments_carbs" = "Carbs"; +"treatments_insulin" = "Insulin"; +"treatments_exercise" = "Exercise"; +"treatments_question_mark" = "?"; "treatments_success" = "Success"; "treatments_upload_complete" = "Upload complete."; \ No newline at end of file diff --git a/xdrip/Storyboards/pl-PL.lproj/Treatments.strings b/xdrip/Storyboards/pl-PL.lproj/Treatments.strings index 8446cda6..982ac12f 100644 --- a/xdrip/Storyboards/pl-PL.lproj/Treatments.strings +++ b/xdrip/Storyboards/pl-PL.lproj/Treatments.strings @@ -8,5 +8,12 @@ "treatments_carbs_with_unit" = "Carbs (g):"; "treatments_insulin_with_unit" = "Insulin (U):"; "treatments_exercise_with_unit" = "Exercise (min):"; +"treatments_carbs_unit" = "g"; +"treatments_insulin_unit" = "U"; +"treatments_exercise_unit" = "min"; +"treatments_carbs" = "Carbs"; +"treatments_insulin" = "Insulin"; +"treatments_exercise" = "Exercise"; +"treatments_question_mark" = "?"; "treatments_success" = "Success"; "treatments_upload_complete" = "Upload complete."; \ No newline at end of file diff --git a/xdrip/Storyboards/pt.lproj/Treatments.strings b/xdrip/Storyboards/pt.lproj/Treatments.strings index 8446cda6..982ac12f 100644 --- a/xdrip/Storyboards/pt.lproj/Treatments.strings +++ b/xdrip/Storyboards/pt.lproj/Treatments.strings @@ -8,5 +8,12 @@ "treatments_carbs_with_unit" = "Carbs (g):"; "treatments_insulin_with_unit" = "Insulin (U):"; "treatments_exercise_with_unit" = "Exercise (min):"; +"treatments_carbs_unit" = "g"; +"treatments_insulin_unit" = "U"; +"treatments_exercise_unit" = "min"; +"treatments_carbs" = "Carbs"; +"treatments_insulin" = "Insulin"; +"treatments_exercise" = "Exercise"; +"treatments_question_mark" = "?"; "treatments_success" = "Success"; "treatments_upload_complete" = "Upload complete."; \ No newline at end of file diff --git a/xdrip/Storyboards/ru.lproj/Treatments.strings b/xdrip/Storyboards/ru.lproj/Treatments.strings index 8446cda6..982ac12f 100644 --- a/xdrip/Storyboards/ru.lproj/Treatments.strings +++ b/xdrip/Storyboards/ru.lproj/Treatments.strings @@ -8,5 +8,12 @@ "treatments_carbs_with_unit" = "Carbs (g):"; "treatments_insulin_with_unit" = "Insulin (U):"; "treatments_exercise_with_unit" = "Exercise (min):"; +"treatments_carbs_unit" = "g"; +"treatments_insulin_unit" = "U"; +"treatments_exercise_unit" = "min"; +"treatments_carbs" = "Carbs"; +"treatments_insulin" = "Insulin"; +"treatments_exercise" = "Exercise"; +"treatments_question_mark" = "?"; "treatments_success" = "Success"; "treatments_upload_complete" = "Upload complete."; \ No newline at end of file diff --git a/xdrip/Storyboards/sl.lproj/Treatments.strings b/xdrip/Storyboards/sl.lproj/Treatments.strings index 8446cda6..982ac12f 100644 --- a/xdrip/Storyboards/sl.lproj/Treatments.strings +++ b/xdrip/Storyboards/sl.lproj/Treatments.strings @@ -8,5 +8,12 @@ "treatments_carbs_with_unit" = "Carbs (g):"; "treatments_insulin_with_unit" = "Insulin (U):"; "treatments_exercise_with_unit" = "Exercise (min):"; +"treatments_carbs_unit" = "g"; +"treatments_insulin_unit" = "U"; +"treatments_exercise_unit" = "min"; +"treatments_carbs" = "Carbs"; +"treatments_insulin" = "Insulin"; +"treatments_exercise" = "Exercise"; +"treatments_question_mark" = "?"; "treatments_success" = "Success"; "treatments_upload_complete" = "Upload complete."; \ No newline at end of file diff --git a/xdrip/Storyboards/sv.lproj/Treatments.strings b/xdrip/Storyboards/sv.lproj/Treatments.strings index 8446cda6..982ac12f 100644 --- a/xdrip/Storyboards/sv.lproj/Treatments.strings +++ b/xdrip/Storyboards/sv.lproj/Treatments.strings @@ -8,5 +8,12 @@ "treatments_carbs_with_unit" = "Carbs (g):"; "treatments_insulin_with_unit" = "Insulin (U):"; "treatments_exercise_with_unit" = "Exercise (min):"; +"treatments_carbs_unit" = "g"; +"treatments_insulin_unit" = "U"; +"treatments_exercise_unit" = "min"; +"treatments_carbs" = "Carbs"; +"treatments_insulin" = "Insulin"; +"treatments_exercise" = "Exercise"; +"treatments_question_mark" = "?"; "treatments_success" = "Success"; "treatments_upload_complete" = "Upload complete."; \ No newline at end of file diff --git a/xdrip/Storyboards/zh.lproj/Treatments.strings b/xdrip/Storyboards/zh.lproj/Treatments.strings index 8446cda6..982ac12f 100644 --- a/xdrip/Storyboards/zh.lproj/Treatments.strings +++ b/xdrip/Storyboards/zh.lproj/Treatments.strings @@ -8,5 +8,12 @@ "treatments_carbs_with_unit" = "Carbs (g):"; "treatments_insulin_with_unit" = "Insulin (U):"; "treatments_exercise_with_unit" = "Exercise (min):"; +"treatments_carbs_unit" = "g"; +"treatments_insulin_unit" = "U"; +"treatments_exercise_unit" = "min"; +"treatments_carbs" = "Carbs"; +"treatments_insulin" = "Insulin"; +"treatments_exercise" = "Exercise"; +"treatments_question_mark" = "?"; "treatments_success" = "Success"; "treatments_upload_complete" = "Upload complete."; \ No newline at end of file diff --git a/xdrip/Texts/TextsTreatmentsView.swift b/xdrip/Texts/TextsTreatmentsView.swift index dd0dc5c1..90ba1bec 100644 --- a/xdrip/Texts/TextsTreatmentsView.swift +++ b/xdrip/Texts/TextsTreatmentsView.swift @@ -28,6 +28,34 @@ enum Texts_TreatmentsView { return NSLocalizedString("treatments_exercise_with_unit", tableName: filename, bundle: Bundle.main, value: "Exercise (min):", comment: "Exercise with unit.") }() + static let carbsUnit:String = { + return NSLocalizedString("treatments_carbs_unit", tableName: filename, bundle: Bundle.main, value: "g", comment: "Carbs unit.") + }() + + static let insulinUnit:String = { + return NSLocalizedString("treatments_insulin_unit", tableName: filename, bundle: Bundle.main, value: "U:", comment: "Insulin unit.") + }() + + static let exerciseUnit:String = { + return NSLocalizedString("treatments_exercise_unit", tableName: filename, bundle: Bundle.main, value: "min", comment: "Exercise unit.") + }() + + static let carbs:String = { + return NSLocalizedString("treatments_carbs", tableName: filename, bundle: Bundle.main, value: "Carbs", comment: "Carbs.") + }() + + static let insulin:String = { + return NSLocalizedString("treatments_insulin", tableName: filename, bundle: Bundle.main, value: "Insulin", comment: "Insulin.") + }() + + static let exercise:String = { + return NSLocalizedString("treatments_exercise", tableName: filename, bundle: Bundle.main, value: "Exercise", comment: "Exercise.") + }() + + static let questionMark:String = { + return NSLocalizedString("treatments_question_mark", tableName: filename, bundle: Bundle.main, value: "?", comment: "Literally a question mark, used as unknown abbreviation.") + }() + static let success:String = { return NSLocalizedString("treatments_success", tableName: filename, bundle: Bundle.main, value: "Success", comment: "Success.") }()