Jon Mårtensson před 3 roky
rodič
revize
06ef1b4ad1
23 změnil soubory, kde provedl 24 přidání a 23 odebrání
  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/PreferencesEditor/View/PreferencesEditorRootView.swift
  23. 2 1
      FreeAPSWatch WatchKit Extension/Views/MainView.swift

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

@@ -903,7 +903,7 @@ Enact a temp Basal or a temp target */
 " day(s)" = " day(s)";
 
 /* Option to show HR in Watch app*/
-"Display HR on Watch instead of eventual BG" = "Display HR on Watch instead of eventual BG";
+"Display HR on Watch" = "Display HR on Watch";
 
 
 /* Headers for settings ----------------------- */

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

@@ -903,7 +903,7 @@ Enact a temp Basal or a temp target */
 " day(s)" = " day(s)";
 
 /* Option to show HR in Watch app*/
-"Display HR on Watch instead of eventual BG" = "Display HR on Watch instead of eventual BG";
+"Display HR on Watch" = "Display HR on Watch";
 
 
 /* Headers for settings ----------------------- */

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

@@ -903,7 +903,7 @@ Enact a temp Basal or a temp target */
 " day(s)" = " day(s)";
 
 /* Option to show HR in Watch app*/
-"Display HR on Watch instead of eventual BG" = "Display HR on Watch instead of eventual BG";
+"Display HR on Watch" = "Display HR on Watch";
 
 
 /* Headers for settings ----------------------- */

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

@@ -903,7 +903,7 @@ Enact a temp Basal or a temp target */
 " day(s)" = " Tag(e)";
 
 /* Option to show HR in Watch app*/
-"Display HR on Watch instead of eventual BG" = "Display HR on Watch instead of eventual BG";
+"Display HR on Watch" = "Display HR on Watch";
 
 
 /* Headers for settings ----------------------- */

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

@@ -903,7 +903,7 @@ Enact a temp Basal or a temp target */
 " day(s)" = " day(s)";
 
 /* Option to show HR in Watch app*/
-"Display HR on Watch instead of eventual BG" = "Display HR on Watch instead of eventual BG";
+"Display HR on Watch" = "Display HR on Watch";
 
 
 /* Headers for settings ----------------------- */

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

@@ -903,7 +903,7 @@ Enact a temp Basal or a temp target */
 " day(s)" = " day(s)";
 
 /* Option to show HR in Watch app*/
-"Display HR on Watch instead of eventual BG" = "Display HR on Watch instead of eventual BG";
+"Display HR on Watch" = "Display HR on Watch";
 
 
 /* Headers for settings ----------------------- */

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

@@ -903,7 +903,7 @@ Enact a temp Basal or a temp target */
 " day(s)" = " day(s)";
 
 /* Option to show HR in Watch app*/
-"Display HR on Watch instead of eventual BG" = "Display HR on Watch instead of eventual BG";
+"Display HR on Watch" = "Display HR on Watch";
 
 
 /* Headers for settings ----------------------- */

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

@@ -903,7 +903,7 @@ Enact a temp Basal or a temp target */
 " day(s)" = " jour(s)";
 
 /* Option to show HR in Watch app*/
-"Display HR on Watch instead of eventual BG" = "Display HR on Watch instead of eventual BG";
+"Display HR on Watch" = "Display HR on Watch";
 
 
 /* Headers for settings ----------------------- */

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

@@ -903,7 +903,7 @@ Enact a temp Basal or a temp target */
 " day(s)" = " day(s)";
 
 /* Option to show HR in Watch app*/
-"Display HR on Watch instead of eventual BG" = "Display HR on Watch instead of eventual BG";
+"Display HR on Watch" = "Display HR on Watch";
 
 
 /* Headers for settings ----------------------- */

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

@@ -903,7 +903,7 @@ Enact a temp Basal or a temp target */
 " day(s)" = " giorno/i";
 
 /* Option to show HR in Watch app*/
-"Display HR on Watch instead of eventual BG" = "Display HR on Watch instead of eventual BG";
+"Display HR on Watch" = "Display HR on Watch";
 
 
 /* Headers for settings ----------------------- */

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

@@ -903,7 +903,7 @@ Enact a temp Basal or a temp target */
 " day(s)" = " dag(er)";
 
 /* Option to show HR in Watch app*/
-"Display HR on Watch instead of eventual BG" = "Display HR on Watch instead of eventual BG";
+"Display HR on Watch" = "Display HR on Watch";
 
 
 /* Headers for settings ----------------------- */

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

@@ -903,7 +903,7 @@ Enact a temp Basal or a temp target */
 " day(s)" = " dag(en)";
 
 /* Option to show HR in Watch app*/
-"Display HR on Watch instead of eventual BG" = "Display HR on Watch instead of eventual BG";
+"Display HR on Watch" = "Display HR on Watch";
 
 
 /* Headers for settings ----------------------- */

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

@@ -905,7 +905,7 @@ Połączono z Nightscout!";
 " day(s)" = " day(s)";
 
 /* Option to show HR in Watch app*/
-"Display HR on Watch instead of eventual BG" = "Display HR on Watch instead of eventual BG";
+"Display HR on Watch" = "Display HR on Watch";
 
 
 /* Headers for settings ----------------------- */

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

@@ -903,7 +903,7 @@ Enact a temp Basal or a temp target */
 " day(s)" = " day(s)";
 
 /* Option to show HR in Watch app*/
-"Display HR on Watch instead of eventual BG" = "Display HR on Watch instead of eventual BG";
+"Display HR on Watch" = "Display HR on Watch";
 
 
 /* Headers for settings ----------------------- */

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

@@ -903,7 +903,7 @@ Enact a temp Basal or a temp target */
 " day(s)" = " day(s)";
 
 /* Option to show HR in Watch app*/
-"Display HR on Watch instead of eventual BG" = "Display HR on Watch instead of eventual BG";
+"Display HR on Watch" = "Display HR on Watch";
 
 
 /* Headers for settings ----------------------- */

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

@@ -903,7 +903,7 @@ Enact a temp Basal or a temp target */
 " day(s)" = "дн.";
 
 /* Option to show HR in Watch app*/
-"Display HR on Watch instead of eventual BG" = "Display HR on Watch instead of eventual BG";
+"Display HR on Watch" = "Display HR on Watch";
 
 
 /* Headers for settings ----------------------- */

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

@@ -903,7 +903,7 @@ Enact a temp Basal or a temp target */
 " day(s)" = " day(s)";
 
 /* Option to show HR in Watch app*/
-"Display HR on Watch instead of eventual BG" = "Display HR on Watch instead of eventual BG";
+"Display HR on Watch" = "Display HR on Watch";
 
 
 /* Headers for settings ----------------------- */

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

@@ -903,7 +903,7 @@ Enact a temp Basal or a temp target */
 " day(s)" = " dagar";
 
 /* Option to show HR in Watch app*/
-"Display HR on Watch instead of eventual BG" = "Visa puls på klocka istället för förväntat blodglukos";
+"Display HR on Watch" = "Visa puls på klocka istället för förväntat blodglukos";
 
 
 /* Headers for settings ----------------------- */

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

@@ -903,7 +903,7 @@ Enact a temp Basal or a temp target */
 " day(s)" = " gün(ler)";
 
 /* Option to show HR in Watch app*/
-"Display HR on Watch instead of eventual BG" = "Display HR on Watch instead of eventual BG";
+"Display HR on Watch" = "Display HR on Watch";
 
 
 /* Headers for settings ----------------------- */

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

@@ -903,7 +903,7 @@ Enact a temp Basal or a temp target */
 " day(s)" = "день(днів)";
 
 /* Option to show HR in Watch app*/
-"Display HR on Watch instead of eventual BG" = "Display HR on Watch instead of eventual BG";
+"Display HR on Watch" = "Display HR on Watch";
 
 
 /* Headers for settings ----------------------- */

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

@@ -903,7 +903,7 @@ Enact a temp Basal or a temp target */
 " day(s)" = "天";
 
 /* Option to show HR in Watch app*/
-"Display HR on Watch instead of eventual BG" = "Display HR on Watch instead of eventual BG";
+"Display HR on Watch" = "Display HR on Watch";
 
 
 /* Headers for settings ----------------------- */

+ 1 - 1
FreeAPS/Sources/Modules/PreferencesEditor/View/PreferencesEditorRootView.swift

@@ -37,7 +37,7 @@ extension PreferencesEditor {
 
                     Toggle("Skip Bolus screen after carbs", isOn: $state.skipBolusScreenAfterCarbs)
 
-                    Toggle("Display HR on Watch instead of eventual BG", isOn: $state.displayHR)
+                    Toggle("Display HR on Watch", isOn: $state.displayHR)
                 }
 
                 ForEach(state.sections.indexed(), id: \.1.id) { sectionIndex, section in

+ 2 - 1
FreeAPSWatch WatchKit Extension/Views/MainView.swift

@@ -128,6 +128,7 @@ struct MainView: View {
                 }
             }
             Spacer()
+                .onAppear(perform: start)
         }.padding()
     }
 
@@ -237,7 +238,7 @@ struct MainView: View {
             return .loopGray
         }
         let delta = Date().timeIntervalSince(lastLoopDate) - Config.lag
-        
+
         if delta <= 5.minutes.timeInterval {
             return .loopGreen
         } else if delta <= 10.minutes.timeInterval {