pr

core/scripts/i18n/collect-strings.js

@@ -161,7 +161,7 @@ function parseExampleJsDoc(rawExample) {
  * @return {IncrementalCtc}
  */
 function convertMessageToCtc(lhlMessage, examples = {}) {
-  _lhlValidityChecks(escapeIcuMessage(lhlMessage));
+  _lhlValidityChecks(lhlMessage);
 
   /** @type {IncrementalCtc} */
   const ctc = {
@@ -192,7 +192,7 @@ function convertMessageToCtc(lhlMessage, examples = {}) {
 function _lhlValidityChecks(lhlMessage) {
   let parsedMessageElements;
   try {
-    parsedMessageElements = MessageParser.parse(lhlMessage, {ignoreTag: true});
+    parsedMessageElements = MessageParser.parse(escapeIcuMessage(lhlMessage), {ignoreTag: true});
   } catch (err) {
     if (err.name !== 'SyntaxError') throw err;
     throw new Error(`[${err.message}] Did not find the expected syntax in message: ${err.originalMessage}`);

shared/localization/format.js

@@ -12,7 +12,7 @@ import {getModuleDirectory} from '../esm-utils.js';
 import {isObjectOfUnknownValues, isObjectOrArrayOfUnknownValues} from '../type-verifiers.js';
 import {locales} from './locales.js';
 
-// From @formatjs/icu-messageformat-parser
+// From @formatjs/icu-messageformat-parser - copy here so we don't need to bundle all that.
 const TYPE = /** @type {const} */ ({
   literal: 0,
   argument: 1,
@@ -196,6 +196,8 @@ function escapeIcuMessage(message) {
  * @return {string}
  */
 function formatMessage(message, values, locale) {
+  message = escapeIcuMessage(message);
+
   // Parsing and formatting can be slow. Don't attempt if the string can't
   // contain ICU placeholders, in which case formatting is already complete.
 
@@ -243,7 +245,7 @@ function _localizeIcuMessage(icuMessage, locale) {
     return icuMessage.formattedDefault;
   }
 
-  return formatMessage(escapeIcuMessage(localeMessage.message), icuMessage.values, locale);
+  return formatMessage(localeMessage.message, icuMessage.values, locale);
 }
 
 /**