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

SMB Interval description update

(cherry picked from commit dee5c1196fb5df2e95ff82418f1e6880fcc32ab9)

Insert a space

(cherry picked from commit b2d6fbfb933afa82a8e8cb8c1dc778e763d5df9d)

Xcode auto formatting

(cherry picked from commit d67446962fac07b3a210023a54ae61c0a25c929c)

Update description again

(cherry picked from commit 4f42e945e06db92b682bce89c7c0295994a7e2c6)
Jon Mårtensson 3 лет назад
Родитель
Сommit
2e1316e72b
23 измененных файлов с 26 добавлено и 23 удалено
  1. 1 1
      FreeAPS/Sources/Localizations/Main/ar.lproj/Localizable.strings
  2. 1 1
      FreeAPS/Sources/Localizations/Main/ca.lproj/Localizable.strings
  3. 1 1
      FreeAPS/Sources/Localizations/Main/da.lproj/Localizable.strings
  4. 1 1
      FreeAPS/Sources/Localizations/Main/de.lproj/Localizable.strings
  5. 1 1
      FreeAPS/Sources/Localizations/Main/en.lproj/Localizable.strings
  6. 1 1
      FreeAPS/Sources/Localizations/Main/es.lproj/Localizable.strings
  7. 1 1
      FreeAPS/Sources/Localizations/Main/fi.lproj/Localizable.strings
  8. 1 1
      FreeAPS/Sources/Localizations/Main/fr.lproj/Localizable.strings
  9. 1 1
      FreeAPS/Sources/Localizations/Main/he.lproj/Localizable.strings
  10. 1 1
      FreeAPS/Sources/Localizations/Main/it.lproj/Localizable.strings
  11. 1 1
      FreeAPS/Sources/Localizations/Main/nb.lproj/Localizable.strings
  12. 1 1
      FreeAPS/Sources/Localizations/Main/nl.lproj/Localizable.strings
  13. 1 1
      FreeAPS/Sources/Localizations/Main/pl.lproj/Localizable.strings
  14. 1 1
      FreeAPS/Sources/Localizations/Main/pt-BR.lproj/Localizable.strings
  15. 1 1
      FreeAPS/Sources/Localizations/Main/pt-PT.lproj/Localizable.strings
  16. 1 1
      FreeAPS/Sources/Localizations/Main/ru.lproj/Localizable.strings
  17. 1 1
      FreeAPS/Sources/Localizations/Main/sk.lproj/Localizable.strings
  18. 1 1
      FreeAPS/Sources/Localizations/Main/sv.lproj/Localizable.strings
  19. 1 1
      FreeAPS/Sources/Localizations/Main/tr.lproj/Localizable.strings
  20. 1 1
      FreeAPS/Sources/Localizations/Main/uk.lproj/Localizable.strings
  21. 1 1
      FreeAPS/Sources/Localizations/Main/zh-Hans.lproj/Localizable.strings
  22. 1 1
      FreeAPS/Sources/Modules/Home/View/HomeRootView.swift
  23. 4 1
      FreeAPS/Sources/Modules/PreferencesEditor/PreferencesEditorStateModel.swift

+ 1 - 1
FreeAPS/Sources/Localizations/Main/ar.lproj/Localizable.strings

@@ -1487,7 +1487,7 @@ Enact a temp Basal or a temp target */
 "SMB Interval" = "SMB Interval";
 
 /* "SMB Interval" */
-"Minimum duration in minutes between two enacted SMBs" = "Minimum duration in minutes between two enacted SMBs";
+"Minimum duration in minutes for new SMB since last SMB or manual bolus" = "Minimum duration in minutes for new SMB since last SMB or manual bolus";
 
 /* Headline "Bolus Increment" */
 "Bolus Increment" = "Bolus Increment";

+ 1 - 1
FreeAPS/Sources/Localizations/Main/ca.lproj/Localizable.strings

@@ -1487,7 +1487,7 @@ Enact a temp Basal or a temp target */
 "SMB Interval" = "SMB Interval";
 
 /* "SMB Interval" */
-"Minimum duration in minutes between two enacted SMBs" = "Minimum duration in minutes between two enacted SMBs";
+"Minimum duration in minutes for new SMB since last SMB or manual bolus" = "Minimum duration in minutes for new SMB since last SMB or manual bolus";
 
 /* Headline "Bolus Increment" */
 "Bolus Increment" = "Bolus Increment";

+ 1 - 1
FreeAPS/Sources/Localizations/Main/da.lproj/Localizable.strings

@@ -1487,7 +1487,7 @@ Enact a temp Basal or a temp target */
 "SMB Interval" = "SMB Interval";
 
 /* "SMB Interval" */
-"Minimum duration in minutes between two enacted SMBs" = "Minimum duration in minutes between two enacted SMBs";
+"Minimum duration in minutes for new SMB since last SMB or manual bolus" = "Minimum duration in minutes for new SMB since last SMB or manual bolus";
 
 /* Headline "Bolus Increment" */
 "Bolus Increment" = "Bolus Increment";

+ 1 - 1
FreeAPS/Sources/Localizations/Main/de.lproj/Localizable.strings

@@ -1487,7 +1487,7 @@ Enact a temp Basal or a temp target */
 "SMB Interval" = "SMB-Intervall";
 
 /* "SMB Interval" */
-"Minimum duration in minutes between two enacted SMBs" = "Minimaler Abstand (in Minuten), der zwischen zwei SMBs liegen muss";
+"Minimum duration in minutes for new SMB since last SMB or manual bolus" = "Minimaler Abstand (in Minuten), der zwischen zwei SMBs liegen muss";
 
 /* Headline "Bolus Increment" */
 "Bolus Increment" = "Bolus-Erhöhung";

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

@@ -1491,7 +1491,7 @@ Enact a temp Basal or a temp target */
 "SMB Interval" = "SMB Interval";
 
 /* "SMB Interval" */
-"Minimum duration in minutes between two enacted SMBs" = "Minimum duration in minutes between two enacted SMBs";
+"Minimum duration in minutes for new SMB since last SMB or manual bolus" = "Minimum duration in minutes for new SMB since last SMB or manual bolus";
 
 /* Headline "Bolus Increment" */
 "Bolus Increment" = "Bolus Increment";

+ 1 - 1
FreeAPS/Sources/Localizations/Main/es.lproj/Localizable.strings

@@ -1493,7 +1493,7 @@ Un 1.0 de valor permite un ajuste completo con el nuevo factor de sensibilidad d
 "SMB Interval" = "SMB Interval";
 
 /* "SMB Interval" */
-"Minimum duration in minutes between two enacted SMBs" = "Duración mínima en minutos entre dos SMBs aprobados";
+"Minimum duration in minutes for new SMB since last SMB or manual bolus" = "Duración mínima en minutos entre dos SMBs aprobados";
 
 /* Headline "Bolus Increment" */
 "Bolus Increment" = "Bolus Increment";

+ 1 - 1
FreeAPS/Sources/Localizations/Main/fi.lproj/Localizable.strings

@@ -1487,7 +1487,7 @@ Enact a temp Basal or a temp target */
 "SMB Interval" = "SMB Interval";
 
 /* "SMB Interval" */
-"Minimum duration in minutes between two enacted SMBs" = "Minimum duration in minutes between two enacted SMBs";
+"Minimum duration in minutes for new SMB since last SMB or manual bolus" = "Minimum duration in minutes for new SMB since last SMB or manual bolus";
 
 /* Headline "Bolus Increment" */
 "Bolus Increment" = "Bolus Increment";

+ 1 - 1
FreeAPS/Sources/Localizations/Main/fr.lproj/Localizable.strings

@@ -1487,7 +1487,7 @@ Enact a temp Basal or a temp target */
 "SMB Interval" = "SMB Interval";
 
 /* "SMB Interval" */
-"Minimum duration in minutes between two enacted SMBs" = "Durée minimale en minutes entre deux SMB injectés";
+"Minimum duration in minutes for new SMB since last SMB or manual bolus" = "Durée minimale en minutes entre deux SMB injectés";
 
 /* Headline "Bolus Increment" */
 "Bolus Increment" = "Bolus Increment";

+ 1 - 1
FreeAPS/Sources/Localizations/Main/he.lproj/Localizable.strings

@@ -1487,7 +1487,7 @@ Enact a temp Basal or a temp target */
 "SMB Interval" = "SMB Interval";
 
 /* "SMB Interval" */
-"Minimum duration in minutes between two enacted SMBs" = "Minimum duration in minutes between two enacted SMBs";
+"Minimum duration in minutes for new SMB since last SMB or manual bolus" = "Minimum duration in minutes for new SMB since last SMB or manual bolus";
 
 /* Headline "Bolus Increment" */
 "Bolus Increment" = "Bolus Increment";

+ 1 - 1
FreeAPS/Sources/Localizations/Main/it.lproj/Localizable.strings

@@ -1487,7 +1487,7 @@ Enact a temp Basal or a temp target */
 "SMB Interval" = "SMB Interval";
 
 /* "SMB Interval" */
-"Minimum duration in minutes between two enacted SMBs" = "Durata minima in minuti tra due SMB sommimistrati";
+"Minimum duration in minutes for new SMB since last SMB or manual bolus" = "Durata minima in minuti tra due SMB sommimistrati";
 
 /* Headline "Bolus Increment" */
 "Bolus Increment" = "Bolus Increment";

+ 1 - 1
FreeAPS/Sources/Localizations/Main/nb.lproj/Localizable.strings

@@ -1487,7 +1487,7 @@ Enact a temp Basal or a temp target */
 "SMB Interval" = "SMB-intervall";
 
 /* "SMB Interval" */
-"Minimum duration in minutes between two enacted SMBs" = "Minimum varighet i minutter mellom to SMB'er";
+"Minimum duration in minutes for new SMB since last SMB or manual bolus" = "Minimum varighet i minutter mellom to SMB'er";
 
 /* Headline "Bolus Increment" */
 "Bolus Increment" = "Bolus-økning";

+ 1 - 1
FreeAPS/Sources/Localizations/Main/nl.lproj/Localizable.strings

@@ -1487,7 +1487,7 @@ Enact a temp Basal or a temp target */
 "SMB Interval" = "SMB interval";
 
 /* "SMB Interval" */
-"Minimum duration in minutes between two enacted SMBs" = "Minimale duur in minuten tussen twee uitgevoerde SMBs";
+"Minimum duration in minutes for new SMB since last SMB or manual bolus" = "Minimale duur in minuten tussen twee uitgevoerde SMBs";
 
 /* Headline "Bolus Increment" */
 "Bolus Increment" = "Bolusverhoging";

+ 1 - 1
FreeAPS/Sources/Localizations/Main/pl.lproj/Localizable.strings

@@ -1489,7 +1489,7 @@ Połączono z Nightscout!";
 "SMB Interval" = "SMB Interval";
 
 /* "SMB Interval" */
-"Minimum duration in minutes between two enacted SMBs" = "Minimum duration in minutes between two enacted SMBs";
+"Minimum duration in minutes for new SMB since last SMB or manual bolus" = "Minimum duration in minutes for new SMB since last SMB or manual bolus";
 
 /* Headline "Bolus Increment" */
 "Bolus Increment" = "Bolus Increment";

+ 1 - 1
FreeAPS/Sources/Localizations/Main/pt-BR.lproj/Localizable.strings

@@ -1487,7 +1487,7 @@ Enact a temp Basal or a temp target */
 "SMB Interval" = "SMB Interval";
 
 /* "SMB Interval" */
-"Minimum duration in minutes between two enacted SMBs" = "Minimum duration in minutes between two enacted SMBs";
+"Minimum duration in minutes for new SMB since last SMB or manual bolus" = "Minimum duration in minutes for new SMB since last SMB or manual bolus";
 
 /* Headline "Bolus Increment" */
 "Bolus Increment" = "Bolus Increment";

+ 1 - 1
FreeAPS/Sources/Localizations/Main/pt-PT.lproj/Localizable.strings

@@ -1487,7 +1487,7 @@ Enact a temp Basal or a temp target */
 "SMB Interval" = "SMB Interval";
 
 /* "SMB Interval" */
-"Minimum duration in minutes between two enacted SMBs" = "Minimum duration in minutes between two enacted SMBs";
+"Minimum duration in minutes for new SMB since last SMB or manual bolus" = "Minimum duration in minutes for new SMB since last SMB or manual bolus";
 
 /* Headline "Bolus Increment" */
 "Bolus Increment" = "Bolus Increment";

+ 1 - 1
FreeAPS/Sources/Localizations/Main/ru.lproj/Localizable.strings

@@ -1487,7 +1487,7 @@ Enact a temp Basal or a temp target */
 "SMB Interval" = "Интервал между SMB";
 
 /* "SMB Interval" */
-"Minimum duration in minutes between two enacted SMBs" = "Минимальная продолжительность в минутах между подачей болюсов";
+"Minimum duration in minutes for new SMB since last SMB or manual bolus" = "Минимальная продолжительность в минутах между подачей болюсов";
 
 /* Headline "Bolus Increment" */
 "Bolus Increment" = "Прирост болюса";

+ 1 - 1
FreeAPS/Sources/Localizations/Main/sk.lproj/Localizable.strings

@@ -1487,7 +1487,7 @@ Enact a temp Basal or a temp target */
 "SMB Interval" = "SMB Interval";
 
 /* "SMB Interval" */
-"Minimum duration in minutes between two enacted SMBs" = "Minimum duration in minutes between two enacted SMBs";
+"Minimum duration in minutes for new SMB since last SMB or manual bolus" = "Minimum duration in minutes for new SMB since last SMB or manual bolus";
 
 /* Headline "Bolus Increment" */
 "Bolus Increment" = "Bolus Increment";

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

@@ -1487,7 +1487,7 @@ Enact a temp Basal or a temp target */
 "SMB Interval" = "SMB-intervall (minuter)";
 
 /* "SMB Interval" */
-"Minimum duration in minutes between two enacted SMBs" = "Minsta tidsintervall mellan två supermikrobolusar.";
+"Minimum duration in minutes for new SMB since last SMB or manual bolus" = "Minsta tidsintervall mellan två supermikrobolusar.";
 
 /* Headline "Bolus Increment" */
 "Bolus Increment" = "Minsta bolusmångd";

+ 1 - 1
FreeAPS/Sources/Localizations/Main/tr.lproj/Localizable.strings

@@ -1487,7 +1487,7 @@ Enact a temp Basal or a temp target */
 "SMB Interval" = "SMB Aralığı";
 
 /* "SMB Interval" */
-"Minimum duration in minutes between two enacted SMBs" = "Yürürlüğe giren iki SMB arasındaki dakika cinsinden minimum süre";
+"Minimum duration in minutes for new SMB since last SMB or manual bolus" = "Yürürlüğe giren iki SMB arasındaki dakika cinsinden minimum süre";
 
 /* Headline "Bolus Increment" */
 "Bolus Increment" = "Bolus Artırımı";

+ 1 - 1
FreeAPS/Sources/Localizations/Main/uk.lproj/Localizable.strings

@@ -1487,7 +1487,7 @@ Enact a temp Basal or a temp target */
 "SMB Interval" = "Інтервал між SMB";
 
 /* "SMB Interval" */
-"Minimum duration in minutes between two enacted SMBs" = "Мінімальна тривалість у хвилинах між двома подачами SMB";
+"Minimum duration in minutes for new SMB since last SMB or manual bolus" = "Мінімальна тривалість у хвилинах між двома подачами SMB";
 
 /* Headline "Bolus Increment" */
 "Bolus Increment" = "Приріст болюсу";

+ 1 - 1
FreeAPS/Sources/Localizations/Main/zh-Hans.lproj/Localizable.strings

@@ -1489,7 +1489,7 @@ Enact a temp Basal or a temp target */
 "SMB Interval" = "SMB Interval";
 
 /* "SMB Interval" */
-"Minimum duration in minutes between two enacted SMBs" = "两次自动大剂量的最短时间";
+"Minimum duration in minutes for new SMB since last SMB or manual bolus" = "两次自动大剂量的最短时间";
 
 /* Headline "Bolus Increment" */
 "Bolus Increment" = "Bolus Increment";

+ 1 - 1
FreeAPS/Sources/Modules/Home/View/HomeRootView.swift

@@ -667,7 +667,7 @@ extension Home {
                 }
 
                 if let errorMessage = state.errorMessage, let date = state.errorDate {
-                    Text(NSLocalizedString("Error at", comment: "") + dateFormatter.string(from: date))
+                    Text(NSLocalizedString("Error at", comment: "") + " " + dateFormatter.string(from: date))
                         .foregroundColor(.white)
                         .font(.headline)
                         .padding(.bottom, 4)

+ 4 - 1
FreeAPS/Sources/Modules/PreferencesEditor/PreferencesEditorStateModel.swift

@@ -351,7 +351,10 @@ extension PreferencesEditor {
                 Field(
                     displayName: NSLocalizedString("SMB Interval", comment: "SMB Interval"),
                     type: .decimal(keypath: \.smbInterval),
-                    infoText: NSLocalizedString("Minimum duration in minutes between two enacted SMBs", comment: "SMB Interval"),
+                    infoText: NSLocalizedString(
+                        "Minimum duration in minutes for new SMB since last SMB or manual bolus",
+                        comment: "SMB Interval"
+                    ),
                     settable: self
                 ),
                 Field(