add basic date & time formatters using navigator language

also use tabular nums in a few places

Author: emma-sg

src/embed-receipt.ts

@@ -12,6 +12,7 @@ import { tsToDate } from "./pageutils";
 import prettyBytes from "pretty-bytes";
 import { property } from "lit/decorators.js";
 import type { ItemType } from "./types";
+import { dateTimeFormatter } from "./utils/dateTimeFormatter";
 
 // ===========================================================================
 export class RWPEmbedReceipt extends LitElement {
@@ -184,7 +185,9 @@ export class RWPEmbedReceipt extends LitElement {
       ? `https://crt.sh/?q=${certFingerprint}`
       : "";
 
-    const dateStr = tsToDate(this.ts).toLocaleString();
+    const dateStr = this.ts
+      ? dateTimeFormatter.format(tsToDate(this.ts) as Date)
+      : "";
 
     return html`
       <div class="dropdown mb-4 ${this.active ? "is-active" : ""}">

src/item-info.ts

@@ -7,6 +7,7 @@ import prettyBytes from "pretty-bytes";
 import type { ItemType } from "./types";
 
 import "./components/labeled-field";
+import { dateTimeFormatter } from "./utils/dateTimeFormatter";
 
 // ===========================================================================
 class ItemInfo extends LitElement {
@@ -111,7 +112,9 @@ class ItemInfo extends LitElement {
           </wr-labeled-field>`
         : nothing}
       <wr-labeled-field label="Date Loaded" class="column is-2">
-        ${item!.ctime ? new Date(item!.ctime).toLocaleString() : nothing}
+        ${item!.ctime
+          ? dateTimeFormatter.format(new Date(item!.ctime))
+          : nothing}
       </wr-labeled-field>
       <wr-labeled-field label="Total Size" class="column is-2">
         ${prettyBytes(Number(item!.totalSize || item!.size || 0))}

src/item.ts

@@ -55,6 +55,7 @@ import type { Replay } from "./replay";
 import { ifDefined } from "lit/directives/if-defined.js";
 
 import "./item-info";
+import { dateTimeFormatter } from "./utils/dateTimeFormatter";
 
 const RWP_SCHEME = "search://";
 
@@ -756,6 +757,7 @@ class Item extends LitElement {
         align-items: center;
         transition: background-color var(--sl-transition-fast);
         color: var(--sl-color-neutral-600);
+        font-variant-numeric: tabular-nums;
       }
 
       .timestamp-dropdown-btn:hover {
@@ -782,6 +784,10 @@ class Item extends LitElement {
         transform: translateY(0.075em);
       }
 
+      .timestamp-menu-item {
+        font-variant-numeric: tabular-nums;
+      }
+
       .timestamp-menu-item[aria-selected="true"]::part(label) {
         color: var(--sl-color-blue-600);
       }
@@ -1245,7 +1251,9 @@ class Item extends LitElement {
   protected renderToolbarRight() {
     const isReplay = !!this.tabData.url;
 
-    const dateStr = tsToDate(this.ts).toLocaleString();
+    const dateStr = this.ts
+      ? dateTimeFormatter.format(tsToDate(this.ts) as Date)
+      : "";
 
     return html` <div
       class="dropdown is-right ${this.menuActive ? "is-active" : ""}"
@@ -1419,7 +1427,9 @@ class Item extends LitElement {
       // Filter out invalid dates
       try {
         const date = getDateFromTS(+ts);
-        const dateStr = tsToDate(date).toLocaleString();
+        const dateStr = date
+          ? dateTimeFormatter.format(tsToDate(date) as Date)
+          : "";
         timestampStrs.push({
           date,
           label: dateStr,
@@ -1428,7 +1438,9 @@ class Item extends LitElement {
         /* empty */
       }
     });
-    const currDateStr = tsToDate(this.ts).toLocaleString();
+    const currDateStr = this.ts
+      ? dateTimeFormatter.format(tsToDate(this.ts) as Date)
+      : "";
     return html`<div id="datetime" class="control is-hidden-mobile">
       ${timestampStrs.length > 1
         ? html`

src/pageentry.ts

@@ -9,6 +9,11 @@ import { getPageDateTS, getReplayLink } from "./pageutils";
 
 import { wrapCss } from "./misc";
 import type { URLResource } from "./types";
+import {
+  dateFormatter,
+  dateTimeFormatter,
+  timeFormatter,
+} from "./utils/dateTimeFormatter";
 
 // ===========================================================================
 class PageEntry extends LitElement {
@@ -154,6 +159,10 @@ class PageEntry extends LitElement {
       .media-content a {
         display: block;
       }
+
+      .col-date {
+        font-variant-numeric: tabular-nums;
+      }
     `);
   }
 
@@ -218,20 +227,8 @@ class PageEntry extends LitElement {
             `
           : ""}
         <div class="column col-date is-2">
-          <div>
-            ${
-              // TODO: Fix this the next time the file is edited.
-              // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-              date ? date.toLocaleDateString() : ""
-            }
-          </div>
-          <div>
-            ${
-              // TODO: Fix this the next time the file is edited.
-              // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-              date ? date.toLocaleTimeString() : ""
-            }
-          </div>
+          <div>${date ? dateFormatter.format(date) : ""}</div>
+          <div>${date ? timeFormatter.format(date) : ""}</div>
         </div>
         <div class="column">
           <div class="media">
@@ -259,11 +256,7 @@ class PageEntry extends LitElement {
                     >${this.thumbnailValid ? this.renderFavicon() : ""}
                   </p>
                   <p class="has-text-grey-dark text is-inline-date">
-                    ${
-                      // TODO: Fix this the next time the file is edited.
-                      // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-                      date ? date.toLocaleString() : ""
-                    }
+                    ${date ? dateTimeFormatter.format(date) : ""}
                   </p>
                 </a>
                 ${this.textSnippet

src/story.ts

@@ -10,6 +10,7 @@ import { getTS, getReplayLink } from "./pageutils";
 import Split from "split.js";
 import { type ItemType } from "./types";
 import { customElement, property } from "lit/decorators.js";
+import { dateTimeFormatter } from "./utils/dateTimeFormatter";
 
 // ===========================================================================
 @customElement("wr-coll-story")
@@ -364,7 +365,7 @@ class Story extends LitElement {
           <p class="is-size-6 has-text-weight-bold has-text-link">${p.title}</p>
           <p class="has-text-dark">${p.url}</p>
         </a>
-        <p>${date.toLocaleString()}</p>
+        <p>${dateTimeFormatter.format(date)}</p>
         <p>${p.desc}</p>
       </div>
       <hr />

src/url-resources.ts

@@ -8,6 +8,7 @@ import fasSearch from "@fortawesome/fontawesome-free/svgs/solid/search.svg";
 import "keyword-mark-element/lib/keyword-mark.js";
 import { type ItemType } from "./types";
 import { type URLResource } from "./types";
+import { dateTimeFormatter } from "./utils/dateTimeFormatter";
 
 // ===========================================================================
 /**
@@ -544,7 +545,7 @@ class URLResources extends LitElement {
                     </td>
                     <td class="column col-ts is-2">
                       <p class="minihead is-hidden-tablet">Date</p>
-                      ${new Date(result.date).toLocaleString()}
+                      ${dateTimeFormatter.format(new Date(result.date))}
                     </td>
                     <td class="column col-mime is-3">
                       <p class="minihead is-hidden-tablet">Media Type</p>

src/utils/dateTimeFormatter.ts

@@ -0,0 +1,23 @@
+export const dateTimeFormatter = new Intl.DateTimeFormat(
+  [...navigator.languages],
+  {
+    month: "2-digit",
+    day: "2-digit",
+    year: "numeric",
+    hour: "2-digit",
+    minute: "2-digit",
+    second: "2-digit",
+  },
+);
+
+export const dateFormatter = new Intl.DateTimeFormat([...navigator.languages], {
+  month: "2-digit",
+  day: "2-digit",
+  year: "numeric",
+});
+
+export const timeFormatter = new Intl.DateTimeFormat([...navigator.languages], {
+  hour: "2-digit",
+  minute: "2-digit",
+  second: "2-digit",
+});