Преглед изворни кода

Display nr of days. Was inadvertently deleted

Jon Mårtensson пре 3 година
родитељ
комит
560100891d
22 измењених фајлова са 50 додато и 45 уклоњено
  1. 2 2
      FreeAPS/Sources/Localizations/Main/ar.lproj/Localizable.strings
  2. 2 2
      FreeAPS/Sources/Localizations/Main/ca.lproj/Localizable.strings
  3. 2 2
      FreeAPS/Sources/Localizations/Main/da.lproj/Localizable.strings
  4. 2 2
      FreeAPS/Sources/Localizations/Main/de.lproj/Localizable.strings
  5. 2 2
      FreeAPS/Sources/Localizations/Main/en.lproj/Localizable.strings
  6. 2 2
      FreeAPS/Sources/Localizations/Main/es.lproj/Localizable.strings
  7. 2 2
      FreeAPS/Sources/Localizations/Main/fi.lproj/Localizable.strings
  8. 2 2
      FreeAPS/Sources/Localizations/Main/fr.lproj/Localizable.strings
  9. 2 2
      FreeAPS/Sources/Localizations/Main/he.lproj/Localizable.strings
  10. 2 2
      FreeAPS/Sources/Localizations/Main/it.lproj/Localizable.strings
  11. 2 2
      FreeAPS/Sources/Localizations/Main/nb.lproj/Localizable.strings
  12. 2 2
      FreeAPS/Sources/Localizations/Main/nl.lproj/Localizable.strings
  13. 2 2
      FreeAPS/Sources/Localizations/Main/pl.lproj/Localizable.strings
  14. 2 2
      FreeAPS/Sources/Localizations/Main/pt-BR.lproj/Localizable.strings
  15. 2 2
      FreeAPS/Sources/Localizations/Main/pt-PT.lproj/Localizable.strings
  16. 2 2
      FreeAPS/Sources/Localizations/Main/ru.lproj/Localizable.strings
  17. 2 2
      FreeAPS/Sources/Localizations/Main/sk.lproj/Localizable.strings
  18. 2 2
      FreeAPS/Sources/Localizations/Main/sv.lproj/Localizable.strings
  19. 2 2
      FreeAPS/Sources/Localizations/Main/tr.lproj/Localizable.strings
  20. 2 2
      FreeAPS/Sources/Localizations/Main/uk.lproj/Localizable.strings
  21. 2 2
      FreeAPS/Sources/Localizations/Main/zh-Hans.lproj/Localizable.strings
  22. 8 3
      FreeAPS/Sources/Modules/Home/View/HomeRootView.swift

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

@@ -1220,10 +1220,10 @@ Enact a temp Basal or a temp target */
 "HbA1c (24h)" = "HbA1c (24h)";
 
 /* Total number of days of data for HbA1c estimation, part 1/2*/
-"All " = "All ";
+"All" = "All";
 
 /* Total number of days of data for HbA1c estimation, part 2/2*/
-" days" = " days";
+"days" = "days";
 
 /* Nr of loops last 24 hours */
 "Loops" = "Loops";

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

@@ -1220,10 +1220,10 @@ Enact a temp Basal or a temp target */
 "HbA1c (24h)" = "HbA1c (24h)";
 
 /* Total number of days of data for HbA1c estimation, part 1/2*/
-"All " = "All ";
+"All" = "All";
 
 /* Total number of days of data for HbA1c estimation, part 2/2*/
-" days" = " days";
+"days" = "days";
 
 /* Nr of loops last 24 hours */
 "Loops" = "Loops";

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

@@ -1220,10 +1220,10 @@ Enact a temp Basal or a temp target */
 "HbA1c (24h)" = "HbA1c (24h)";
 
 /* Total number of days of data for HbA1c estimation, part 1/2*/
-"All " = "All ";
+"All" = "All";
 
 /* Total number of days of data for HbA1c estimation, part 2/2*/
-" days" = " days";
+"days" = "days";
 
 /* Nr of loops last 24 hours */
 "Loops" = "Loops";

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

@@ -1220,10 +1220,10 @@ Enact a temp Basal or a temp target */
 "HbA1c (24h)" = "HbA1c (24 Std.)";
 
 /* Total number of days of data for HbA1c estimation, part 1/2*/
-"All " = "Ø";
+"All" = "Ø";
 
 /* Total number of days of data for HbA1c estimation, part 2/2*/
-" days" = " Tage";
+"days" = " Tage";
 
 /* Nr of loops last 24 hours */
 "Loops" = "Loops";

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

@@ -1224,10 +1224,10 @@ Enact a temp Basal or a temp target */
 "HbA1c (24h)" = "HbA1c (24h)";
 
 /* Total number of days of data for HbA1c estimation, part 1/2*/
-"All " = "All ";
+"All" = "All";
 
 /* Total number of days of data for HbA1c estimation, part 2/2*/
-" days" = " days";
+"days" = "days";
 
 /* Nr of loops last 24 hours */
 "Loops" = "Loops";

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

@@ -1220,10 +1220,10 @@ Enact a temp Basal or a temp target */
 "HbA1c (24h)" = "HbA1c (24h)";
 
 /* Total number of days of data for HbA1c estimation, part 1/2*/
-"All " = "All ";
+"All" = "All";
 
 /* Total number of days of data for HbA1c estimation, part 2/2*/
-" days" = " days";
+"days" = "days";
 
 /* Nr of loops last 24 hours */
 "Loops" = "Loops";

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

@@ -1220,10 +1220,10 @@ Enact a temp Basal or a temp target */
 "HbA1c (24h)" = "HbA1c (24h)";
 
 /* Total number of days of data for HbA1c estimation, part 1/2*/
-"All " = "All ";
+"All" = "All";
 
 /* Total number of days of data for HbA1c estimation, part 2/2*/
-" days" = " days";
+"days" = "days";
 
 /* Nr of loops last 24 hours */
 "Loops" = "Loops";

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

@@ -1220,10 +1220,10 @@ Enact a temp Basal or a temp target */
 "HbA1c (24h)" = "HbA1c (24h)";
 
 /* Total number of days of data for HbA1c estimation, part 1/2*/
-"All " = "All ";
+"All" = "All";
 
 /* Total number of days of data for HbA1c estimation, part 2/2*/
-" days" = " days";
+"days" = "days";
 
 /* Nr of loops last 24 hours */
 "Loops" = "Loops";

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

@@ -1220,10 +1220,10 @@ Enact a temp Basal or a temp target */
 "HbA1c (24h)" = "HbA1c (24h)";
 
 /* Total number of days of data for HbA1c estimation, part 1/2*/
-"All " = "All ";
+"All" = "All";
 
 /* Total number of days of data for HbA1c estimation, part 2/2*/
-" days" = " days";
+"days" = "days";
 
 /* Nr of loops last 24 hours */
 "Loops" = "Loops";

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

@@ -1220,10 +1220,10 @@ Enact a temp Basal or a temp target */
 "HbA1c (24h)" = "HbA1c (24h)";
 
 /* Total number of days of data for HbA1c estimation, part 1/2*/
-"All " = "All ";
+"All" = "All";
 
 /* Total number of days of data for HbA1c estimation, part 2/2*/
-" days" = " days";
+"days" = "days";
 
 /* Nr of loops last 24 hours */
 "Loops" = "Loops";

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

@@ -1220,10 +1220,10 @@ Enact a temp Basal or a temp target */
 "HbA1c (24h)" = "HbA1c (24t)";
 
 /* Total number of days of data for HbA1c estimation, part 1/2*/
-"All " = "Alle ";
+"All" = "Alle ";
 
 /* Total number of days of data for HbA1c estimation, part 2/2*/
-" days" = " dager";
+"days" = " dager";
 
 /* Nr of loops last 24 hours */
 "Loops" = "Loops";

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

@@ -1220,10 +1220,10 @@ Enact a temp Basal or a temp target */
 "HbA1c (24h)" = "HbA1c (24h)";
 
 /* Total number of days of data for HbA1c estimation, part 1/2*/
-"All " = "Alle ";
+"All" = "Alle ";
 
 /* Total number of days of data for HbA1c estimation, part 2/2*/
-" days" = " dagen";
+"days" = " dagen";
 
 /* Nr of loops last 24 hours */
 "Loops" = "Loops";

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

@@ -1222,10 +1222,10 @@ Połączono z Nightscout!";
 "HbA1c (24h)" = "HbA1c (24h)";
 
 /* Total number of days of data for HbA1c estimation, part 1/2*/
-"All " = "All ";
+"All" = "All";
 
 /* Total number of days of data for HbA1c estimation, part 2/2*/
-" days" = " days";
+"days" = "days";
 
 /* Nr of loops last 24 hours */
 "Loops" = "Loops";

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

@@ -1220,10 +1220,10 @@ Enact a temp Basal or a temp target */
 "HbA1c (24h)" = "HbA1c (24h)";
 
 /* Total number of days of data for HbA1c estimation, part 1/2*/
-"All " = "All ";
+"All" = "All";
 
 /* Total number of days of data for HbA1c estimation, part 2/2*/
-" days" = " days";
+"days" = "days";
 
 /* Nr of loops last 24 hours */
 "Loops" = "Loops";

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

@@ -1220,10 +1220,10 @@ Enact a temp Basal or a temp target */
 "HbA1c (24h)" = "HbA1c (24h)";
 
 /* Total number of days of data for HbA1c estimation, part 1/2*/
-"All " = "All ";
+"All" = "All";
 
 /* Total number of days of data for HbA1c estimation, part 2/2*/
-" days" = " days";
+"days" = "days";
 
 /* Nr of loops last 24 hours */
 "Loops" = "Loops";

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

@@ -1220,10 +1220,10 @@ Enact a temp Basal or a temp target */
 "HbA1c (24h)" = "HbA1c (24ч)";
 
 /* Total number of days of data for HbA1c estimation, part 1/2*/
-"All " = "Все ";
+"All" = "Все ";
 
 /* Total number of days of data for HbA1c estimation, part 2/2*/
-" days" = " дн.";
+"days" = " дн.";
 
 /* Nr of loops last 24 hours */
 "Loops" = "Петли";

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

@@ -1220,10 +1220,10 @@ Enact a temp Basal or a temp target */
 "HbA1c (24h)" = "HbA1c (24h)";
 
 /* Total number of days of data for HbA1c estimation, part 1/2*/
-"All " = "All ";
+"All" = "All";
 
 /* Total number of days of data for HbA1c estimation, part 2/2*/
-" days" = " days";
+"days" = "days";
 
 /* Nr of loops last 24 hours */
 "Loops" = "Loops";

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

@@ -1220,10 +1220,10 @@ Enact a temp Basal or a temp target */
 "HbA1c (24h)" = "HbA1c (24h)";
 
 /* Total number of days of data for HbA1c estimation, part 1/2*/
-"All " = "Alla ";
+"All" = "Alla ";
 
 /* Total number of days of data for HbA1c estimation, part 2/2*/
-" days" = " dagar";
+"days" = " dagar";
 
 /* Nr of loops last 24 hours */
 "Loops" = "Loopar";

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

@@ -1220,10 +1220,10 @@ Enact a temp Basal or a temp target */
 "HbA1c (24h)" = "HbA1c (24h)";
 
 /* Total number of days of data for HbA1c estimation, part 1/2*/
-"All " = "All ";
+"All" = "All";
 
 /* Total number of days of data for HbA1c estimation, part 2/2*/
-" days" = " days";
+"days" = "days";
 
 /* Nr of loops last 24 hours */
 "Loops" = "Loops";

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

@@ -1220,10 +1220,10 @@ Enact a temp Basal or a temp target */
 "HbA1c (24h)" = "HbA1c (24 години)";
 
 /* Total number of days of data for HbA1c estimation, part 1/2*/
-"All " = "Все";
+"All" = "Все";
 
 /* Total number of days of data for HbA1c estimation, part 2/2*/
-" days" = " дні";
+"days" = " дні";
 
 /* Nr of loops last 24 hours */
 "Loops" = "Петлі";

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

@@ -1220,10 +1220,10 @@ Enact a temp Basal or a temp target */
 "HbA1c (24h)" = "HbA1c (24h)";
 
 /* Total number of days of data for HbA1c estimation, part 1/2*/
-"All " = "All ";
+"All" = "All";
 
 /* Total number of days of data for HbA1c estimation, part 2/2*/
-" days" = " days";
+"days" = "days";
 
 /* Nr of loops last 24 hours */
 "Loops" = "Loops";

+ 8 - 3
FreeAPS/Sources/Modules/Home/View/HomeRootView.swift

@@ -438,11 +438,16 @@ extension Home {
                     }
 
                     Text(
-                        NSLocalizedString("All ", comment: "") +
-                            // getString(state.statistics?.GlucoseStorage_Days, false) +
-                            NSLocalizedString(" days", comment: "")
+                        NSLocalizedString("All", comment: "")
                     ).font(.caption2).foregroundColor(.secondary)
 
+                    Text(
+                        targetFormatter
+                            .string(from: (state.statistics?.GlucoseStorage_Days ?? 0) as NSNumber) ?? ""
+                    ).font(.caption2).foregroundColor(.secondary)
+                    Text(
+                        NSLocalizedString("days", comment: "")
+                    ).font(.caption2).foregroundColor(.secondary)
                     Text(hba1c_all).font(.system(size: 12))
                 }
             }