Bläddra i källkod

Change strings again...

Jon Mårtensson 2 år sedan
förälder
incheckning
9a0608e7f8

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

@@ -1311,10 +1311,10 @@ Enact a temp Basal or a temp target */
 "Hide" = "Hide";
 "Hide" = "Hide";
 
 
 /* Bolus pop-up / Alert string. Make translations concise! */
 /* Bolus pop-up / Alert string. Make translations concise! */
-"Eventual Glucose > Target Glucose, but glucose, " = "Eventual Glucose > Target Glucose, but glucose, ";
+"Eventual Glucose > Target Glucose, but glucose is predicted to drop down to " = "Eventual Glucose > Target Glucose, but glucose is predicted to drop down to ";
 
 
 /* Bolus pop-up / Alert string. Make translations concise! */
 /* Bolus pop-up / Alert string. Make translations concise! */
-"is predicted below Threshold of " = "is predicted below Threshold of ";
+"which is below your Threshold (" = "which is below your Threshold (";
 
 
 /* Bolus pop-up / Alert string. Make translations concise! */
 /* 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: ";
 "Eventual Glucose > Target Glucose, but glucose is climbing slower than expected. Expected: " = "Eventual Glucose > Target Glucose, but glucose is climbing slower than expected. Expected: ";

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

@@ -1345,10 +1345,10 @@ Enact a temp Basal or a temp target */
 "Hide" = "Göm";
 "Hide" = "Göm";
 
 
 /* Bolus pop-up / Alert string. Make translations concise! */
 /* Bolus pop-up / Alert string. Make translations concise! */
-"Eventual Glucose > Target Glucose, but glucose, " = "Prognos > målvärde, men ditt blodsocker, ";
+"Eventual Glucose > Target Glucose, but glucose is predicted to drop down to " = "Eventual Glucose > Target Glucose, but glucose is predicted to drop down to ";
 
 
 /* Bolus pop-up / Alert string. Make translations concise! */
 /* Bolus pop-up / Alert string. Make translations concise! */
-"is predicted below Threshold of " = "beräknas sjunka under tröskelvärde ";
+"which is below your Threshold (" = "vilket är lägre än ditt tröskelvärde (";
 
 
 /* Bolus pop-up / Alert string. Make translations concise! */
 /* 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 ditt blodsocker stiger långsammare än väntat. Förväntat: ";
 "Eventual Glucose > Target Glucose, but glucose is climbing slower than expected. Expected: " = "Prognos > Målvärde, men ditt blodsocker stiger långsammare än väntat. Förväntat: ";
@@ -1369,7 +1369,7 @@ Enact a temp Basal or a temp target */
 ". Changing: " = ". Ändras: ";
 ". Changing: " = ". Ändras: ";
 
 
 /* Bolus pop-up / Alert string. Make translations concise! */
 /* Bolus pop-up / Alert string. Make translations concise! */
-"Eventual Glucose > Target Glucose, but glucose is predicted to drop down to " = "Prognos är > målvärde, men blodsocker väntas ev sjunka till ";
+"Eventual Glucose > Target Glucose, but glucose is predicted to drop down to " = "Prognos är > målvärde, men ditt blodsocker väntas sjunka till ";
 
 
 /* Add insulin without bolusing alert */
 /* Add insulin without bolusing alert */
 " without bolusing" = " utan att ge insulin";
 " without bolusing" = " utan att ge insulin";

+ 5 - 16
FreeAPS/Sources/Modules/Bolus/View/BolusRootView.swift

@@ -257,30 +257,19 @@ extension Bolus {
         // Localize the Oref0 error/warning strings
         // Localize the Oref0 error/warning strings
         private func alertString() -> String {
         private func alertString() -> String {
             switch state.errorString {
             switch state.errorString {
-            case 1:
+            case 1,
+                 2:
                 return NSLocalizedString(
                 return NSLocalizedString(
-                    "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 of ",
-                        comment: "Bolus pop-up / Alert string. Make translations concise!"
-                    ) + state
-                    .threshold.formatted(.number.grouping(.never).rounded().precision(.fractionLength(fractionDigits))) + "!"
-            case 2:
-                return NSLocalizedString(
-                    "Eventual Glucose > Target Glucose, but glucose, ",
+                    "Eventual Glucose > Target Glucose, but glucose is predicted to drop down to ",
                     comment: "Bolus pop-up / Alert string. Make translations concise!"
                     comment: "Bolus pop-up / Alert string. Make translations concise!"
                 ) + state.minGuardBG
                 ) + state.minGuardBG
                     .formatted(.number.grouping(.never).rounded().precision(.fractionLength(fractionDigits))) + " " + state.units
                     .formatted(.number.grouping(.never).rounded().precision(.fractionLength(fractionDigits))) + " " + state.units
                     .rawValue + ", " +
                     .rawValue + ", " +
                     NSLocalizedString(
                     NSLocalizedString(
-                        "is predicted below Threshold of ",
+                        "which is below your Threshold (",
                         comment: "Bolus pop-up / Alert string. Make translations concise!"
                         comment: "Bolus pop-up / Alert string. Make translations concise!"
                     ) + state
                     ) + state
-                    .threshold.formatted(.number.grouping(.never).rounded().precision(.fractionLength(fractionDigits)))
+                    .threshold.formatted(.number.grouping(.never).rounded().precision(.fractionLength(fractionDigits))) + ")"
             case 3:
             case 3:
                 return NSLocalizedString(
                 return NSLocalizedString(
                     "Eventual Glucose > Target Glucose, but glucose is climbing slower than expected. Expected: ",
                     "Eventual Glucose > Target Glucose, but glucose is climbing slower than expected. Expected: ",