Revert "[i18n] integrate new translations + new i18n check #70193 (#70423)"

This reverts commit 2212beba68.

src/dev/i18n/integrate_locale_files.test.ts

@@ -21,7 +21,7 @@ import { mockMakeDirAsync, mockWriteFileAsync } from './integrate_locale_files.t
 
 import path from 'path';
 import { integrateLocaleFiles, verifyMessages } from './integrate_locale_files';
-// @ts-expect-error
+// @ts-ignore
 import { normalizePath } from './utils';
 
 const localePath = path.resolve(__dirname, '__fixtures__', 'integrate_locale_files', 'fr.json');
@@ -36,7 +36,6 @@ const defaultIntegrateOptions = {
   sourceFileName: localePath,
   dryRun: false,
   ignoreIncompatible: false,
-  ignoreMalformed: false,
   ignoreMissing: false,
   ignoreUnused: false,
   config: {

src/dev/i18n/integrate_locale_files.ts

@@ -31,8 +31,7 @@ import {
   normalizePath,
   readFileAsync,
   writeFileAsync,
-  verifyICUMessage,
-  // @ts-expect-error
+  // @ts-ignore
 } from './utils';
 
 import { I18nConfig } from './config';
@@ -42,7 +41,6 @@ export interface IntegrateOptions {
   sourceFileName: string;
   targetFileName?: string;
   dryRun: boolean;
-  ignoreMalformed: boolean;
   ignoreIncompatible: boolean;
   ignoreUnused: boolean;
   ignoreMissing: boolean;
@@ -107,23 +105,6 @@ export function verifyMessages(
     }
   }
 
-  for (const messageId of localizedMessagesIds) {
-    const defaultMessage = defaultMessagesMap.get(messageId);
-    if (defaultMessage) {
-      try {
-        const message = localizedMessagesMap.get(messageId)!;
-        verifyICUMessage(message);
-      } catch (err) {
-        if (options.ignoreMalformed) {
-          localizedMessagesMap.delete(messageId);
-          options.log.warning(`Malformed translation ignored (${messageId}): ${err}`);
-        } else {
-          errorMessage += `\nMalformed translation (${messageId}): ${err}\n`;
-        }
-      }
-    }
-  }
-
   if (errorMessage) {
     throw createFailError(errorMessage);
   }

src/dev/i18n/tasks/check_compatibility.ts

@@ -22,14 +22,13 @@ import { integrateLocaleFiles, I18nConfig } from '..';
 
 export interface I18nFlags {
   fix: boolean;
-  ignoreMalformed: boolean;
   ignoreIncompatible: boolean;
   ignoreUnused: boolean;
   ignoreMissing: boolean;
 }
 
 export function checkCompatibility(config: I18nConfig, flags: I18nFlags, log: ToolingLog) {
-  const { fix, ignoreIncompatible, ignoreUnused, ignoreMalformed, ignoreMissing } = flags;
+  const { fix, ignoreIncompatible, ignoreUnused, ignoreMissing } = flags;
   return config.translations.map((translationsPath) => ({
     task: async ({ messages }: { messages: Map<string, { message: string }> }) => {
       // If `fix` is set we should try apply all possible fixes and override translations file.
@@ -38,7 +37,6 @@ export function checkCompatibility(config: I18nConfig, flags: I18nFlags, log: To
         ignoreIncompatible: fix || ignoreIncompatible,
         ignoreUnused: fix || ignoreUnused,
         ignoreMissing: fix || ignoreMissing,
-        ignoreMalformed: fix || ignoreMalformed,
         sourceFileName: translationsPath,
         targetFileName: fix ? translationsPath : undefined,
         config,

src/dev/i18n/utils.js

@@ -208,28 +208,6 @@ export function checkValuesProperty(prefixedValuesKeys, defaultMessage, messageI
   }
 }
 
-/**
- * Verifies valid ICU message.
- * @param message ICU message.
- * @param messageId ICU message id
- * @returns {undefined}
- */
-export function verifyICUMessage(message) {
-  try {
-    parser.parse(message);
-  } catch (error) {
-    if (error.name === 'SyntaxError') {
-      const errorWithContext = createParserErrorMessage(message, {
-        loc: {
-          line: error.location.start.line,
-          column: error.location.start.column - 1,
-        },
-        message: error.message,
-      });
-      throw errorWithContext;
-    }
-  }
-}
 /**
  * Extracts value references from the ICU message.
  * @param message ICU message.

src/dev/run_i18n_check.ts

@@ -36,7 +36,6 @@ run(
   async ({
     flags: {
       'ignore-incompatible': ignoreIncompatible,
-      'ignore-malformed': ignoreMalformed,
       'ignore-missing': ignoreMissing,
       'ignore-unused': ignoreUnused,
       'include-config': includeConfig,
@@ -49,13 +48,12 @@ run(
       fix &&
       (ignoreIncompatible !== undefined ||
         ignoreUnused !== undefined ||
-        ignoreMalformed !== undefined ||
         ignoreMissing !== undefined)
     ) {
       throw createFailError(
         `${chalk.white.bgRed(
           ' I18N ERROR '
-        )} none of the --ignore-incompatible, --ignore-malformed, --ignore-unused or --ignore-missing is allowed when --fix is set.`
+        )} none of the --ignore-incompatible, --ignore-unused or --ignore-missing is allowed when --fix is set.`
       );
     }
 
@@ -101,7 +99,6 @@ run(
               checkCompatibility(
                 config,
                 {
-                  ignoreMalformed: !!ignoreMalformed,
                   ignoreIncompatible: !!ignoreIncompatible,
                   ignoreUnused: !!ignoreUnused,
                   ignoreMissing: !!ignoreMissing,

src/dev/run_i18n_integrate.ts

@@ -31,7 +31,6 @@ run(
       'ignore-incompatible': ignoreIncompatible = false,
       'ignore-missing': ignoreMissing = false,
       'ignore-unused': ignoreUnused = false,
-      'ignore-malformed': ignoreMalformed = false,
       'include-config': includeConfig,
       path,
       source,
@@ -67,13 +66,12 @@ run(
       typeof ignoreIncompatible !== 'boolean' ||
       typeof ignoreUnused !== 'boolean' ||
       typeof ignoreMissing !== 'boolean' ||
-      typeof ignoreMalformed !== 'boolean' ||
       typeof dryRun !== 'boolean'
     ) {
       throw createFailError(
         `${chalk.white.bgRed(
           ' I18N ERROR '
-        )} --ignore-incompatible, --ignore-unused, --ignore-malformed, --ignore-missing, and --dry-run can't have values`
+        )} --ignore-incompatible, --ignore-unused, --ignore-missing, and --dry-run can't have values`
       );
     }
 
@@ -99,7 +97,6 @@ run(
             ignoreIncompatible,
             ignoreUnused,
             ignoreMissing,
-            ignoreMalformed,
             config,
             log,
           });