Update locale display name strings

signalapp · Nov 14, 2023 · f180f66 · f180f66
1 parent 592a683
commit f180f66
Show file tree

Hide file tree

Showing 5 changed files with 4,837 additions and 84 deletions.
diff --git a/build/locale-display-names.json b/build/locale-display-names.json
diff --git a/stylesheets/components/Preferences.scss b/stylesheets/components/Preferences.scss
@@ -310,7 +310,6 @@
 }
 
 .Preferences__LanguageButton {
-  text-transform: capitalize;
   @include button-reset;
 }
 
@@ -377,7 +376,6 @@
 
 .Preferences__LanguageModal__Item__Current {
   display: block;
-  text-transform: capitalize;
   @include font-body-1;
 }
 
@@ -399,7 +397,6 @@
 
 .Preferences__LanguageModal__Item__Matching {
   display: block;
-  text-transform: capitalize;
   @include font-body-2;
   @include light-theme {
     color: $color-gray-60;

diff --git a/ts/components/Preferences.tsx b/ts/components/Preferences.tsx
@@ -459,7 +459,7 @@ export function Preferences({
   );
 
   const localeSearchOptions = useMemo(() => {
-    const collator = new Intl.Collator(resolvedLocale, { usage: 'sort' });
+    const collator = new Intl.Collator('en', { usage: 'sort' });
 
     const availableLocalesOptions = availableLocales
       .map(locale => {
@@ -468,7 +468,7 @@ export function Preferences({
         return { locale, currentLocaleLabel, matchingLocaleLabel };
       })
       .sort((a, b) => {
-        return collator.compare(a.currentLocaleLabel, b.currentLocaleLabel);
+        return collator.compare(a.locale, b.locale);
       });
 
     const [localeOverrideMatches, localeOverrideNonMatches] = partition(

diff --git a/ts/scripts/build-locale-display-names.ts b/ts/scripts/build-locale-display-names.ts
@@ -17,10 +17,7 @@ const LocaleString = z.string().refine(arg => {
 });
 
 const LocaleDisplayNames = z
-  .tuple([
-    z.tuple([z.literal('Raw Code')]).rest(LocaleString),
-    z.tuple([z.literal('Display Code')]).rest(LocaleString),
-  ])
+  .tuple([z.tuple([z.literal('locale')]).rest(LocaleString)])
   .rest(z.tuple([LocaleString]).rest(z.string()));
 
 type Row = ReadonlyArray<string>;
@@ -39,7 +36,7 @@ const localeDisplayNamesBuildPath = path.join(
 
 function parseCsv(input: string) {
   return new Promise<Records>((resolve, reject) => {
-    parse(input, (error, records: Records) => {
+    parse(input, { trim: true }, (error, records: Records) => {
       if (error) {
         reject(error);
       } else {
@@ -54,7 +51,7 @@ type LocaleDisplayNamesResult = Record<string, Record<string, string>>;
 function convertData(
   input: z.infer<typeof LocaleDisplayNames>
 ): LocaleDisplayNamesResult {
-  const [[, ...keys], , ...rows] = input;
+  const [[, ...keys], ...rows] = input;
   const result = Object.fromEntries(
     rows.map(row => {
       const [key, ...messages] = row;
@@ -89,7 +86,7 @@ async function main() {
   const data = LocaleDisplayNames.parse(records);
   const result = convertData(data);
   assertValuesForAllLocales(result);
-  const json = JSON.stringify(result);
+  const json = JSON.stringify(result, null, 2);
   await fs.writeFile(localeDisplayNamesBuildPath, json, 'utf-8');
 }