Просмотр исходного кода

Describe better... and missing localization commit

Jon Mårtensson 2 лет назад
Родитель
Сommit
9a5010a166

Разница между файлами не показана из-за своего большого размера
+ 1 - 1
FreeAPS/Resources/javascript/bundle/determine-basal.js


+ 4 - 7
FreeAPS/Sources/Localizations/Main/en.lproj/Localizable.strings

@@ -1308,13 +1308,10 @@ Enact a temp Basal or a temp target */
 "Hide" = "Hide";
 
 /* Bolus pop-up / Alert string. Make translations concise! */
-"Predicted Glucose, " = "Predicted Glucose, ";
+"Eventual Glucose > Target Glucose, but glucose, " = "Predicted Glucose, ";
 
 /* Bolus pop-up / Alert string. Make translations concise! */
-"is predicted below threshold " = "is predicted below threshold ";
-
-/* Bolus pop-up / Alert string. Make translations concise! */
-"is below Threshold of " = "is below Threshold of ";
+"is predicted below Threshold of " = "is below Threshold of ";
 
 /* Bolus pop-up / Alert string. Make translations concise! */
 "Eventual Glucose > Target Glucose, but glucose is climbing slower than expected. Expected: " = "Eventual Glucose > Target Glucose, but glucose is climbing slower than expected. Expected: ";
@@ -1323,7 +1320,7 @@ Enact a temp Basal or a temp target */
 ". Climbing: " = ". Climbing: ";
 
 /* Bolus pop-up / Alert string. Make translations concise! */
-"Eventual Glucose > Target Glucose, but glucose is falling slower than expected. Expected: " = "Eventual Glucose > Target Glucose, but glucose is falling slower than expected. Expected: ";
+"Eventual Glucose > Target Glucose, but glucose is falling faster than expected. Expected: " = "Eventual Glucose > Target Glucose, but glucose is falling faster than expected. Expected: ";
 
 /* Bolus pop-up / Alert string. Make translations concise! */
 ". Falling: " = ". Falling: ";
@@ -1335,7 +1332,7 @@ Enact a temp Basal or a temp target */
 ". Changing: " = ". Changing: ";
 
 /* Bolus pop-up / Alert string. Make translations concise! */
-"Minimum predicted Glucose is " = "Minimum predicted Glucose is ";
+"Eventual Glucose > Target Glucose, but glucose is predicted to drop down to " = "Glucose is predicted to drop to";
 
 /* Add insulin without bolusing alert */
 " without bolusing" = " without bolusing";

+ 3 - 3
FreeAPS/Sources/Localizations/Main/sv.lproj/Localizable.strings

@@ -1351,13 +1351,13 @@ Enact a temp Basal or a temp target */
 "is below Threshold of " = "är under tröskelvärde ";
 
 /* Bolus pop-up / Alert string. Make translations concise! */
-"Eventual Glucose > Target Glucose, but glucose is climbing slower than expected. Expected: " = "Prognos > Målvärde, men blodsocker stiger snabbare än väntat. Förväntat: ";
+"Eventual Glucose > Target Glucose, but glucose is climbing slower than expected. Expected: " = "Prognos > Målvärde, men blodsocker stiger långsammare än väntat. Förväntat: ";
 
 //* Bolus pop-up / Alert string. Make translations concise! */
 ". Climbing: " = ". Stiger: ";
 
 /* Bolus pop-up / Alert string. Make translations concise! */
-"Eventual Glucose > Target Glucose, but glucose is falling slower than expected. Expected: " = "Prognos > Målvärde, men blodsocker sjunker snabbare än väntat. Förväntat: ";
+"Eventual Glucose > Target Glucose, but glucose is falling faster than expected. Expected: " = "Prognos > Målvärde, men blodsocker sjunker snabbare än väntat. Förväntat: ";
 
 /* Bolus pop-up / Alert string. Make translations concise! */
 ". Falling: " = ". Sjunker: ";
@@ -1369,7 +1369,7 @@ Enact a temp Basal or a temp target */
 ". Changing: " = ". Ändras: ";
 
 /* Bolus pop-up / Alert string. Make translations concise! */
-"Minimum predicted Glucose is " = "Lägsta prognos är ";
+"Eventual Glucose > Target Glucose, but glucose is predicted to drop down to " = "Prognos är > målvärde, men blodsocker väntas ev sjunka till ";
 
 /* Add insulin without bolusing alert */
 " without bolusing" = " utan att ge insulin";

+ 7 - 7
FreeAPS/Sources/Modules/Bolus/View/BolusRootView.swift

@@ -95,7 +95,7 @@ extension Bolus {
                         Alert(
                             title: Text("Are you sure?"),
                             message: Text(
-                                "Add " + formatter
+                                NSLocalizedString("Add", comment: "Add insulin without bolusing alert") + " " + formatter
                                     .string(from: state.amount as NSNumber)! + NSLocalizedString(" U", comment: "Insulin unit") +
                                     NSLocalizedString(" without bolusing", comment: "Add insulin without bolusing alert")
                             ),
@@ -256,25 +256,25 @@ extension Bolus {
             switch state.errorString {
             case 1:
                 return NSLocalizedString(
-                    "Predicted Glucose, ",
+                    "Eventual Glucose > Target Glucose, but glucose, ",
                     comment: "Bolus pop-up / Alert string. Make translations concise!"
                 ) + state.minGuardBG
                     .formatted(.number.grouping(.never).rounded().precision(.fractionLength(fractionDigits))) + " " + state.units
                     .rawValue + ", " +
                     NSLocalizedString(
-                        "is predicted below threshold ",
+                        "is predicted below threshold of ",
                         comment: "Bolus pop-up / Alert string. Make translations concise!"
                     ) + state
                     .threshold.formatted(.number.grouping(.never).rounded().precision(.fractionLength(fractionDigits))) + "!"
             case 2:
                 return NSLocalizedString(
-                    "Predicted Glucose, ",
+                    "Eventual Glucose > Target Glucose, but glucose, ",
                     comment: "Bolus pop-up / Alert string. Make translations concise!"
                 ) + state.minGuardBG
                     .formatted(.number.grouping(.never).rounded().precision(.fractionLength(fractionDigits))) + " " + state.units
                     .rawValue + ", " +
                     NSLocalizedString(
-                        "is below Threshold of ",
+                        "is predicted below Threshold of ",
                         comment: "Bolus pop-up / Alert string. Make translations concise!"
                     ) + state
                     .threshold.formatted(.number.grouping(.never).rounded().precision(.fractionLength(fractionDigits)))
@@ -289,7 +289,7 @@ extension Bolus {
                     .minDelta.formatted(.number.grouping(.never).rounded().precision(.fractionLength(fractionDigits)))
             case 4:
                 return NSLocalizedString(
-                    "Eventual Glucose > Target Glucose, but glucose is falling slower than expected. Expected: ",
+                    "Eventual Glucose > Target Glucose, but glucose is falling faster than expected. Expected: ",
                     comment: "Bolus pop-up / Alert string. Make translations concise!"
                 ) +
                     state.expectedDelta
@@ -307,7 +307,7 @@ extension Bolus {
                     .minDelta.formatted(.number.grouping(.never).rounded().precision(.fractionLength(fractionDigits)))
             case 6:
                 return NSLocalizedString(
-                    "Minimum predicted Glucose is ",
+                    "Eventual Glucose > Target Glucose, but glucose is predicted to drop down to ",
                     comment: "Bolus pop-up / Alert string. Make translations concise!"
                 ) + state
                     .minPredBG