diff --git a/scripts/check_localizable_resources.js b/scripts/check_localizable_resources.js index 50e1019098..21e3736613 100644 --- a/scripts/check_localizable_resources.js +++ b/scripts/check_localizable_resources.js @@ -33,7 +33,7 @@ async function main() { if (shouldAutoFix) await autofix(error); else - await getErrors(error); + getErrors(); } catch (e) { console.log(e.stack); console.log(`Error: ${e.message}`); @@ -43,11 +43,12 @@ async function main() { main(); -async function getErrors(existingError) { - const toAddError = await checkLocalizedStrings.getAndReportResourcesToAdd(); +function getErrors(existingError) { + const toAddError = checkLocalizedStrings.getAndReportResourcesToAdd(); const toModifyError = checkLocalizedStrings.getAndReportIDSKeysToModify(); const toRemoveError = checkLocalizedStrings.getAndReportResourcesToRemove(); - let error = `${existingError}\n${toAddError || ''}${toModifyError || ''}${toRemoveError || ''}`; + let error = + `${existingError ? `${existingError}\n` : ''}${toAddError || ''}${toModifyError || ''}${toRemoveError || ''}`; if (error === '') { console.log('DevTools localizable resources checker passed.'); diff --git a/scripts/localization_utils/check_localized_strings.js b/scripts/localization_utils/check_localized_strings.js index ab4d65a4bd..90dd6b6af5 100644 --- a/scripts/localization_utils/check_localized_strings.js +++ b/scripts/localization_utils/check_localized_strings.js @@ -188,6 +188,12 @@ function validateGrdpFile(dir, grdpFiles, grdFileContent, shouldAutoFix, renameF * Parse localizable resources. */ async function parseLocalizableResourceMaps() { + if (frontendStrings.size === 0 && IDSkeys.size === 0) + await parseLocalizableResourceMapsHelper(); + return [frontendStrings, IDSkeys]; +} + +async function parseLocalizableResourceMapsHelper() { const grdpToFiles = new Map(); const dirs = devtoolsFrontendDirs || await localizationUtils.getChildDirectoriesFromDirectory(devtoolsFrontendPath); const grdpToFilesPromises = dirs.map(dir => { @@ -485,7 +491,7 @@ function addMessage(expectedIDSKey, actualIDSKey, grdpPath, line, description) { * with grdp s and report error of resources to add, * remove or modify. */ -async function getAndReportResourcesToAdd() { +function getAndReportResourcesToAdd() { const keysToAddToGRD = getMessagesToAdd(); if (keysToAddToGRD.size === 0) return; @@ -625,8 +631,6 @@ function getLongestDescription(messages) { } module.exports = { - frontendStrings, - IDSkeys, parseLocalizableResourceMaps, getAndReportIDSKeysToModify, getAndReportResourcesToAdd,