diff --git a/src/components/HeartbeatBar.vue b/src/components/HeartbeatBar.vue index fc044fe54..96a62cf61 100644 --- a/src/components/HeartbeatBar.vue +++ b/src/components/HeartbeatBar.vue @@ -14,7 +14,7 @@ v-if="!$root.isMobile && size !== 'small' && beatList.length > 4 && $root.styleElapsedTime !== 'none'" class="d-flex justify-content-between align-items-center word" :style="timeStyle" > -
{{ timeSinceFirstBeat }} ago
+
{{ timeSinceFirstBeat }}
{{ timeSinceLastBeat }}
@@ -184,11 +184,11 @@ export default { } if (seconds < tolerance) { - return "now"; + return this.$t("now"); } else if (seconds < 60 * 60) { - return (seconds / 60).toFixed(0) + "m ago"; + return this.$t("time ago", [ (seconds / 60).toFixed(0) + "m" ]); } else { - return (seconds / 60 / 60).toFixed(0) + "h ago"; + return this.$t("time ago", [ (seconds / 60 / 60).toFixed(0) + "h" ]); } } }, diff --git a/src/lang/en.json b/src/lang/en.json index 1382707d5..6081e0146 100644 --- a/src/lang/en.json +++ b/src/lang/en.json @@ -49,10 +49,13 @@ "Uptime": "Uptime", "Cert Exp.": "Cert Exp.", "Monitor": "Monitor | Monitors", + "now": "now", + "time ago": "{0} ago", "day": "day | days", "-day": "-day", "hour": "hour", "-hour": "-hour", + "-year": "-year", "Response": "Response", "Ping": "Ping", "Monitor Type": "Monitor Type", @@ -80,7 +83,7 @@ "resendDisabled": "Resend disabled", "retriesDescription": "Maximum retries before the service is marked as down and a notification is sent", "ignoreTLSError": "Ignore TLS/SSL errors for HTTPS websites", - "ignoreTLSErrorGeneral": "Ignore TLS/SSL error for connection", + "ignoreTLSErrorGeneral": "Ignore TLS/SSL error for connection", "upsideDownModeDescription": "Flip the status upside down. If the service is reachable, it is DOWN.", "maxRedirectDescription": "Maximum number of redirects to follow. Set to 0 to disable redirects.", "Upside Down Mode": "Upside Down Mode",