Refactor localized list collation

Author: HankAviator

app/web/i18n/sorting.test.ts

@@ -1,31 +1,23 @@
-import { getLocalizedListComparer } from "./sorting";
+import { getLocaleCollator, getLocalizedListComparer } from "./sorting";
 
 describe("getLocalizedListComparer", () => {
   it("uses pinyin collation for zh-Hans when supported", () => {
-    const resolvedLocale = new Intl.Collator(
-      "zh-Hans-u-co-pinyin",
-    ).resolvedOptions().locale;
+    const collator = getLocaleCollator("zh-Hans");
 
-    if (resolvedLocale.includes("-pinyin")) {
-      expect(
-        ["中国", "法国", "德国", "阿富汗"].sort(
-          getLocalizedListComparer("zh-Hans"),
-        ),
-      ).toEqual(["阿富汗", "德国", "法国", "中国"]);
+    if (collator.resolvedOptions().locale.includes("-pinyin")) {
+      expect(["中国", "法国", "德国", "阿富汗"].sort(collator.compare)).toEqual(
+        ["阿富汗", "德国", "法国", "中国"],
+      );
     }
   });
 
   it("uses stroke collation for zh-Hant when supported", () => {
-    const resolvedLocale = new Intl.Collator(
-      "zh-Hant-u-co-stroke",
-    ).resolvedOptions().locale;
+    const collator = getLocaleCollator("zh-Hant");
 
-    if (resolvedLocale.includes("-stroke")) {
-      expect(
-        ["德國", "法國", "中國", "加拿大"].sort(
-          getLocalizedListComparer("zh-Hant"),
-        ),
-      ).toEqual(["中國", "加拿大", "法國", "德國"]);
+    if (collator.resolvedOptions().locale.includes("-stroke")) {
+      expect(["德國", "法國", "中國", "加拿大"].sort(collator.compare)).toEqual(
+        ["中國", "加拿大", "法國", "德國"],
+      );
     }
   });
 

app/web/i18n/sorting.ts

@@ -25,5 +25,10 @@ function getLocalizedListSortLocales(language: string): string[] {
 export function getLocalizedListComparer(
   language: string,
 ): Intl.Collator["compare"] {
-  return new Intl.Collator(getLocalizedListSortLocales(language)).compare;
+  return getLocaleCollator(language).compare;
+}
+
+export function getLocaleCollator(language: string): Intl.Collator {
+  // Intl.Collator compares strings according to locale-specific sorting rules.
+  return new Intl.Collator(getLocalizedListSortLocales(language));
 }