Merge pull request #27310 from software-mansion-labs/ts-migration/tra…

…nslations-follow-up

[No QA][TS migration] Improve translations: keep translations in sync

src/languages/en.ts

@@ -1,7 +1,6 @@
 import {CONST as COMMON_CONST} from 'expensify-common/lib/CONST';
 import CONST from '../CONST';
 import type {
-    Translation,
     AddressLineParams,
     CharacterLimitParams,
     MaxParticipantsReachedParams,
@@ -75,6 +74,15 @@ import type {
 } from './types';
 import * as ReportActionsUtils from '../libs/ReportActionsUtils';
 
+type StateValue = {
+    stateISO: string;
+    stateName: string;
+};
+
+type States = Record<keyof typeof COMMON_CONST.STATES, StateValue>;
+
+type AllCountries = Record<keyof typeof CONST.ALL_COUNTRIES, string>;
+
 /* eslint-disable max-len */
 export default {
     common: {
@@ -1662,8 +1670,8 @@ export default {
         createAccount: 'Create A New Account',
         logIn: 'Log In',
     },
-    allStates: COMMON_CONST.STATES,
-    allCountries: CONST.ALL_COUNTRIES,
+    allStates: COMMON_CONST.STATES as States,
+    allCountries: CONST.ALL_COUNTRIES as AllCountries,
     accessibilityHints: {
         navigateToChatsList: 'Navigate back to chats list',
         chatWelcomeMessage: 'Chat welcome message',
@@ -1757,4 +1765,4 @@ export default {
             selectSuggestedAddress: 'Please select a suggested address',
         },
     },
-} satisfies Translation;
+};

src/languages/es.ts

@@ -1,7 +1,6 @@
 import CONST from '../CONST';
 import * as ReportActionsUtils from '../libs/ReportActionsUtils';
 import type {
-    Translation,
     AddressLineParams,
     CharacterLimitParams,
     MaxParticipantsReachedParams,
@@ -72,6 +71,7 @@ import type {
     SetTheRequestParams,
     UpdatedTheRequestParams,
     RemovedTheRequestParams,
+    EnglishTranslation,
 } from './types';
 
 /* eslint-disable max-len */
@@ -2249,4 +2249,4 @@ export default {
             selectSuggestedAddress: 'Por favor, selecciona una dirección sugerida',
         },
     },
-} satisfies Translation;
+} satisfies EnglishTranslation;

src/languages/translations.ts

@@ -1,7 +1,7 @@
 import en from './en';
 import es from './es';
 import esES from './es-ES';
-import type {Translation, TranslationFlatObject} from './types';
+import type {TranslationBase, TranslationFlatObject} from './types';
 
 /**
  * Converts an object to it's flattened version.
@@ -12,10 +12,10 @@ import type {Translation, TranslationFlatObject} from './types';
  */
 // Necessary to export so that it is accessible to the unit tests
 // eslint-disable-next-line rulesdir/no-inline-named-export
-export function flattenObject(obj: Translation): TranslationFlatObject {
+export function flattenObject(obj: TranslationBase): TranslationFlatObject {
     const result: Record<string, unknown> = {};
 
-    const recursive = (data: Translation, key: string): void => {
+    const recursive = (data: TranslationBase, key: string): void => {
         // If the data is a function or not a object (eg. a string or array),
         // it's the final value for the key being built and there is no need
         // for more recursion
@@ -27,7 +27,7 @@ export function flattenObject(obj: Translation): TranslationFlatObject {
             // Recursive call to the keys and connect to the respective data
             Object.keys(data).forEach((k) => {
                 isEmpty = false;
-                recursive(data[k] as Translation, key ? `${key}.${k}` : k);
+                recursive(data[k] as TranslationBase, key ? `${key}.${k}` : k);
             });
 
             // Check for when the object is empty but a key exists, so that

src/languages/types.ts

@@ -196,7 +196,7 @@ type UpdatedTheRequestParams = {valueName: string; newValueToDisplay: string; ol
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 type TranslationBaseValue = string | string[] | ((...args: any[]) => string);
 
-type Translation = {[key: string]: TranslationBaseValue | Translation};
+type TranslationBase = {[key: string]: TranslationBaseValue | TranslationBase};
 
 /* Flat Translation Object types */
 // Flattens an object and returns concatenations of all the keys of nested objects
@@ -222,16 +222,17 @@ type TranslateType<TObject, TPath extends string> = TPath extends keyof TObject
         : never
     : never;
 
-type TranslationsType = typeof en;
+type EnglishTranslation = typeof en;
 
-type TranslationPaths = FlattenObject<TranslationsType>;
+type TranslationPaths = FlattenObject<EnglishTranslation>;
 
 type TranslationFlatObject = {
-    [TKey in TranslationPaths]: TranslateType<TranslationsType, TKey>;
+    [TKey in TranslationPaths]: TranslateType<EnglishTranslation, TKey>;
 };
 
 export type {
-    Translation,
+    TranslationBase,
+    EnglishTranslation,
     TranslationFlatObject,
     AddressLineParams,
     CharacterLimitParams,