reword notification stats, more focus on 'Checking sth. at', so that times make sense here

deltachat-ios/Controller/ConnectivityViewController.swift

@@ -94,31 +94,35 @@ class ConnectivityViewController: WebViewViewController {
             averageDelta = (timestamps.last! - timestamps.first!) / Double(timestamps.count-1)
         }
 
-        let lastWakeup = DateUtils.getExtendedRelativeTimeSpanString(timeStamp: timestamps.last!)
+        let lastWakeup = DateUtils.getExtendedAbsTimeSpanString(timeStamp: timestamps.last!)
 
         if Int(averageDelta / Double(60 * 60)) > 1 {
             // more than 1 hour in average
             return "<span class=\"red dot\"></span>"
                 .appending(title)
-                .appending(String.localized(stringID: "notifications_stats_hours_delayed", count: Int(averageDelta / Double(60 * 60))))
-                .appending(" ")
-                .appending(String.localizedStringWithFormat(String.localized("notifications_stats_last_wakeup"), lastWakeup))
+                .appending(String.localized("delayed"))
+                .appending(", ")
+                .appending(String.localizedStringWithFormat(String.localized("last_check_at"), lastWakeup))
+                .appending(", ")
+                .appending(String.localized(stringID: "notifications_avg_hours", count: Int(averageDelta / Double(60 * 60))))
         }
 
         if averageDelta / Double(60 * 20) > 1 {
             // more than 20 minutes in average
             return  "<span class=\"yellow dot\"></span>"
                 .appending(title)
-                .appending(String.localized(stringID: "notifications_stats_minutes_delayed", count: Int(averageDelta / 60)))
-                .appending(" ")
-                .appending(String.localizedStringWithFormat(String.localized("notifications_stats_last_wakeup"), lastWakeup))
+                .appending(String.localized("delayed"))
+                .appending(", ")
+                .appending(String.localizedStringWithFormat(String.localized("last_check_at"), lastWakeup))
+                .appending(", ")
+                .appending(String.localized(stringID: "notifications_avg_minutes", count: Int(averageDelta / 60)))
         }
 
         return  "<span class=\"green dot\"></span>"
             .appending(title)
-            .appending(String.localized(stringID: "notifications_stats_minutes", count: Int(averageDelta / 60)))
-            .appending(" ")
-            .appending(String.localizedStringWithFormat(String.localized("notifications_stats_last_wakeup"), lastWakeup))
+            .appending(String.localizedStringWithFormat(String.localized("last_check_at"), lastWakeup))
+            .appending(", ")
+            .appending(String.localized(stringID: "notifications_avg_minutes", count: Int(averageDelta / 60)))
     }
 
     private func loadHtml() {

deltachat-ios/en.lproj/Localizable.strings

@@ -859,9 +859,9 @@
 
 "perm_ios_explain_access_to_camera_denied" = "To take photos, capture videos or use the QR-Code scanner, open the system settings and enable \"Camera\".";
 "open_settings" = "Open Settings";
-"notifications_disabled_dc" = "Disabled in Delta Chat.";
-"notifications_disabled" = "Disabled in system settings.";
-"notifications_stats_minutes" = "In average every %1$d minutes.";
-"notifications_stats_minutes_delayed" = "Delayed. In average every %1$d minutes.";
-"notifications_stats_hours_delayed" = "Delayed. In average every %1$d hours.";
-"notifications_stats_last_wakeup" = "Last wakeup: %1$@";
+"notifications_disabled_dc" = "Disabled in Delta Chat";
+"notifications_disabled" = "Disabled in system settings";
+"delayed" = "Delayed";
+"notifications_avg_minutes" = "In average every %1$d minutes";
+"notifications_avg_hours" = "In average every %1$d hours";
+"last_check_at" = "Last check at %1$@";

scripts/untranslated.xml

@@ -12,10 +12,10 @@
     
     <string name="perm_ios_explain_access_to_camera_denied">To take photos, capture videos or use the QR-Code scanner, open the system settings and enable \"Camera\".</string>
     <string name="open_settings">Open Settings</string>
-    <string name="notifications_disabled_dc">Disabled in Delta Chat.</string>
-    <string name="notifications_disabled">Disabled in system settings.</string>
-    <string name="notifications_stats_minutes">In average every %1$d minutes.</string>
-    <string name="notifications_stats_minutes_delayed">Delayed. In average every %1$d minutes.</string>
-    <string name="notifications_stats_hours_delayed">Delayed. In average every %1$d hours.</string>
-    <string name="notifications_stats_last_wakeup">Last wakeup: %1$s</string>
+    <string name="notifications_disabled_dc">Disabled in Delta Chat</string>
+    <string name="notifications_disabled">Disabled in system settings</string>
+    <string name="delayed">Delayed</string>
+    <string name="notifications_avg_minutes">In average every %1$d minutes</string>
+    <string name="notifications_avg_hours">In average every %1$d hours</string>
+    <string name="last_check_at">Last check at %1$s</string>
 </resources>