Merge ea7bafabdd into d7ffa33950

src/pages/Details.vue

@@ -661,7 +661,7 @@ export default {
         secondsToHumanReadableFormat(seconds) {
             return rtf.secondsToHumanReadableFormat(seconds);
         }
-
+    
     },
 };
 </script>

src/pages/EditMonitor.vue

@@ -530,7 +530,7 @@
                             <div class="my-3">
                                 <label for="interval" class="form-label">{{ $t("Heartbeat Interval") }} ({{ $t("checkEverySecond", [ monitor.interval ]) }})</label>
                                 <input id="interval" v-model="monitor.interval" type="number" class="form-control" required :min="minInterval" step="1" :max="maxInterval" @blur="finishUpdateInterval">
-                                <div class="form-text">
+                                 <div class="form-text">
                                     {{ monitor.humanReadableInterval }}
                                 </div>
                             </div>

src/util-frontend.js

@@ -215,58 +215,38 @@ export function getToastErrorTimeout() {
 }
 
 class RelativeTimeFormatter {
-    /**
-     * Default locale and options for Relative Time Formatter
-     */
+    // Default locale and options
     constructor() {
         this.locale = currentLocale();
         this.options = { numeric: "auto" };
         this.rtf = new Intl.RelativeTimeFormat(this.locale, this.options);
     }
 
-    /**
-     * Method to get the singleton instance
-     * @returns {object} Intl.RelativeTimeFormat instance
-     */
+    // Method to get the singleton instance
     getInstance() {
         return this.rtf;
     }
 
-    /**
-     * Method to update the instance locale and options
-     * @param {string} locale Localization identifier (e.g., "en", "ar-sy") to update the instance with.
-     * @returns {void} No return value.
-     */
-    updateLocale(locale) {
+    // Method to update the locale and options
+    updateLocale(locale, options = {}) {
         this.locale = locale;
+        this.options = { ...this.options, ...options };
         this.rtf = new Intl.RelativeTimeFormat(this.locale, this.options);
     }
 
-    /**
-     * Method to convert seconds into Human readable format
-     * @param {number} seconds Receive value in seconds.
-     * @returns {string} String converted to Days Mins Seconds Format
-     */
     secondsToHumanReadableFormat(seconds) {
         const days = Math.floor(seconds / 86400);
         const hours = Math.floor((seconds % 86400) / 3600);
         const minutes = Math.floor(((seconds % 86400) % 3600) / 60);
         const secs = ((seconds % 86400) % 3600) % 60;
         const parts = [];
-        /**
-         * Build the formatted string from parts
-         * @param {number} value Receives value in seconds.
-         * @param {string} unitOfTime Expected unit of time after conversion.
-         * @returns {void}
-         */
+        // Build the formatted string from parts
         const toFormattedPart = (value, unitOfTime) => {
             const res = this.getInstance().formatToParts(value, unitOfTime);
+            console.log(res)
             let formattedString = res
                 .map((part, _idx) => {
-                    if (
-                        (part.type === "literal" || part.type === "integer") &&
-                        _idx > 0
-                    ) {
+                    if ((part.type === "literal" || part.type === "integer") && _idx > 0) {
                         return part.value;
                     }
                     return "";
@@ -276,22 +256,14 @@ class RelativeTimeFormatter {
             parts.push(formattedString);
         };
 
-        if (days > 0) {
-            toFormattedPart(days, "days");
-        }
-        if (hours > 0) {
-            toFormattedPart(hours, "hour");
-        }
-        if (minutes > 0) {
-            toFormattedPart(minutes, "minute");
-        }
-        if (secs > 0) {
-            toFormattedPart(secs, "second");
-        }
+        if (days > 0) toFormattedPart(days, "days");
+        if (hours > 0) toFormattedPart(hours, "hour");
+        if (minutes > 0) toFormattedPart(minutes, "minute");
+        if (secs > 0) toFormattedPart(secs, "second");
 
         const result =
             parts.length > 0
-                ? `${parts.join(" ")}`
+                ? `~ ${parts.join(" ")}`
                 : this.getInstance().format(0, "second"); // Handle case for 0 seconds
 
         return result;