Merge 094e56099e into ca14c34977

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"
         >
-            <div>{{ timeSinceFirstBeat }} ago</div>
+            <div>{{ $t("time ago", [timeSinceFirstBeat]) }}</div>
             <div v-if="$root.styleElapsedTime === 'with-line'" class="connecting-line"></div>
             <div>{{ timeSinceLastBeat }}</div>
         </div>
@@ -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 (seconds / 60).toFixed(0) + "m";
             } else {
-                return (seconds / 60 / 60).toFixed(0) + "h ago";
+                return (seconds / 60 / 60).toFixed(0) + "h";
             }
         }
     },

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",
@@ -885,5 +888,20 @@
     "deleteRemoteBrowserMessage": "Are you sure want to delete this Remote Browser for all monitors?",
     "GrafanaOncallUrl": "Grafana Oncall URL",
     "Browser Screenshot": "Browser Screenshot",
-    "What is a Remote Browser?": "What is a Remote Browser?"
+    "What is a Remote Browser?": "What is a Remote Browser?",
+    "Add Remote Browser": "Add Remote Browser",
+    "New Group": "New Group",
+    "Group Name": "Group Name",
+    "OAuth2: Client Credentials": "OAuth2: Client Credentials",
+    "Authentication Method": "Authentication Method",
+    "Authorization Header": "Authorization Header",
+    "Form Data Body": "Form Data Body",
+    "OAuth Token URL": "OAuth Token URL",
+    "Client ID": "Client ID",
+    "Client Secret": "Client Secret",
+    "OAuth Scope": "OAuth Scope",
+    "Optional: Space separated list of scopes": "Optional: Space separated list of scopes",
+    "Go back to home page.": "Go back to home page.",
+    "No tags found.": "No tags found.",
+    "Lost connection to the socket server.": "Lost connection to the socket server."
 }

src/mixins/socket.js

@@ -241,7 +241,7 @@ export default {
 
             socket.on("disconnect", () => {
                 console.log("disconnect");
-                this.connectionErrorMsg = "Lost connection to the socket server. Reconnecting...";
+                this.connectionErrorMsg = `${this.$t("Lost connection to the socket server.")} ${this.$t("Reconnecting...")}`;
                 this.socket.connected = false;
             });