Some more merge resolution

Author: conradarcturus

package-lock.json

@@ -1,4 +1,4 @@
- {
+{
   "name": "lang-nav",
   "private": true,
   "version": "0.0.0",
@@ -10,19 +10,20 @@
     "preview": "vite preview",
     "predeploy": "npm run build",
     "deploy": "gh-pages -d dist",
-    "build:cldr-locales": "ts-node scripts/ingest/build-cldr-locales.ts"
     "test": "vitest",
     "test:watch": "vitest --watch",
     "test:ui": "vitest --ui",
     "test:run": "vitest run",
-    "test:coverage": "vitest run --coverage""build:cldr-locales": "ts-node scripts/ingest/build-cldr-locales.ts"
+    "test:coverage": "vitest run --coverage",
+    "build:cldr-locales": "ts-node scripts/ingest/build-cldr-locales.ts"
   },
   "dependencies": {
     "cldr-core": "^47.0.0",
     "lucide-react": "^0.525.0",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
-    "react-router-dom": "^7.5.1"
+    "react-router-dom": "^7.5.1",
+    "ts-node": "^10.9.2"
   },
   "devDependencies": {
     "@eslint/js": "^9.25.0",
@@ -59,4 +60,4 @@
     "semi": true,
     "printWidth": 100
   }
-}
+}

package.json

@@ -26,7 +26,6 @@ const CHARTS_TSV_BASE = `https://raw.githubusercontent.com/unicode-org/cldr-stag
   '',
 )}/tsv`;
 const CLDR_REPO_RAW_BASE = 'https://raw.githubusercontent.com/unicode-org/cldr/main/common/main';
-import territoryInfo from 'cldr-core/supplemental/territoryInfo.json';
 
 const OUTPUT_FILE = path.join(process.cwd(), 'public/data/unicode/cldrLocales.json');
 

scripts/ingest/build-cldr-locales.ts

@@ -1,6 +1,6 @@
 import type { CLDRLocaleIndex, CLDRLocaleSupport } from '@entities/types/CLDRLocaleTypes';
 
-import cldrLocalesData from '../../public/data/unicode/cldrLocales.json';
+import cldrLocalesData from '../../../public/data/unicode/cldrLocales.json';
 
 // Import the generated JSON instead of requiring it.
 

src/features/data-loading/cldrLocales.ts

@@ -1,20 +1,7 @@
 import React from 'react';
 
-<<<<<<< HEAD:src/views/locale/LocaleDetails.tsx
-import { getCldrLocale } from '../../data/cldrLocales';
-import CommaSeparated from '../../generic/CommaSeparated';
-import Deemphasized from '../../generic/Deemphasized';
-import { numberToFixedUnlessSmall, numberToSigFigs } from '../../generic/numberUtils';
-import { PercentageDifference } from '../../generic/PercentageDifference';
-import { LocaleData, LocaleSource } from '../../types/DataTypes';
-import DetailsField from '../common/details/DetailsField';
-import DetailsSection from '../common/details/DetailsSection';
-import HoverableObjectName from '../common/HoverableObjectName';
-import ObjectWikipediaInfo from '../common/ObjectWikipediaInfo';
-=======
 import Hoverable from '@features/hovercard/Hoverable';
 import HoverableObjectName from '@features/hovercard/HoverableObjectName';
->>>>>>> origin/master:src/widgets/details/LocaleDetails.tsx
 
 import LocaleCensusCitation from '@entities/locale/LocaleCensusCitation';
 import LocaleCLDRSupportSection from '@entities/locale/LocaleDetailsCLDR';
@@ -226,43 +213,6 @@ const LocalePopulationSection: React.FC<{ locale: LocaleData }> = ({ locale }) =
   );
 };
 
-/** CLDR Support section */
-const LocaleCLDRSupportSection: React.FC<{ locale: LocaleData }> = ({ locale }) => {
-  const cldr = getCldrLocale(locale.ID);
-  if (!cldr) {
-    return (
-      <DetailsSection title="CLDR Support">
-        <Deemphasized>Not supported by CLDR.</Deemphasized>
-      </DetailsSection>
-    );
-  }
-  return (
-    <DetailsSection title="CLDR Support">
-      <DetailsField title="Tier:">{cldr.tier}</DetailsField>
-      <DetailsField title="Present in CLDR:">
-        {cldr.presentInCLDRDatabase ? 'Yes' : 'No'}
-      </DetailsField>
-      <DetailsField title="Default Locale:">
-        {cldr.localeIsDefaultForLanguage ? 'Yes' : 'No'}
-      </DetailsField>
-      <DetailsField title="Target / Computed Level:">
-        {cldr.targetLevel ?? '—'} / {cldr.computedLevel ?? '—'}
-      </DetailsField>
-      {cldr.confirmedPct != null && (
-        <DetailsField title="Confirmed %:">{cldr.confirmedPct.toFixed(1)}%</DetailsField>
-      )}
-      {cldr.icuIncluded != null && (
-        <DetailsField title="ICU:">{cldr.icuIncluded ? 'Yes' : 'No'}</DetailsField>
-      )}
-      {cldr.missingCounts && (
-        <DetailsField title="Missing Counts:">
-          {cldr.missingCounts.found} found / {cldr.missingCounts.unconfirmed} unconfirmed /{' '}
-          {cldr.missingCounts.missing} missing
-        </DetailsField>
-      )}
-      {cldr.notes && cldr.notes.length > 0 && (
-        <DetailsField title="Missing Features:">{cldr.notes.join(', ')}</DetailsField>
-      )}
 const LocaleOtherSection: React.FC<{ locale: LocaleData }> = ({ locale }) => {
   const { officialStatus, wikipedia, localeSource, containedLocales } = locale;
   return (