From 9783a1969a916e61338f5a266c963f484d0532d1 Mon Sep 17 00:00:00 2001 From: "Brian R. Bondy" Date: Sun, 14 Oct 2018 10:24:46 -0400 Subject: [PATCH] Upload non-generated strings to Transifex too Fix https://github.com/brave/brave-browser/issues/1568 This was accidentally removed in the past in b390ac4a3c648770a3058a9a667e5be8b63256b0 because it was accidentally commented out before that. --- lib/l10nUtil.js | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/lib/l10nUtil.js b/lib/l10nUtil.js index 4b1f9ba27dc8..7c04310aab29 100644 --- a/lib/l10nUtil.js +++ b/lib/l10nUtil.js @@ -47,6 +47,15 @@ const braveProfileSettingsPartPath = path.resolve(path.join(srcDir, 'brave', 'ap const chromiumVRStringsPartPath = path.resolve(path.join(srcDir, 'chrome', 'app', 'vr_strings.grdp')) const braveVRStringsPartPath = path.resolve(path.join(srcDir, 'brave', 'app', 'vr_strings.grdp')) +// The following are not generated files but still need to be tracked so they get sent to transifex +// These xtb files don't need to be copied anywhere. +// brave_generated_resources.grd maps to brave/app/resources/brave_generated_resources*.xtb, +// brave_component_resources.grd maps to brave/components/resources/strings/brave_components_resources*.xtb +// messages.json localization is handled inside of brave-extension. +const braveSpecificGeneratedResourcesPath = path.resolve(path.join(srcDir, 'brave', 'app', 'brave_generated_resources.grd')) +const braveComponentsResourcesPath = path.resolve(path.join(srcDir, 'brave', 'components', 'resources', 'brave_components_resources.grd')) +const braveExtensionMessagesPath = path.resolve(path.join(srcDir, 'brave', 'vendor', 'brave-extension', 'app', '_locales', 'en_US', 'messages.json')) + // When adding new grd or grd files, never add a grdp part path without a parent grd path. // Group them with a leading and trailing newline to keep this file organized. @@ -63,19 +72,24 @@ const chromiumToAutoGeneratedBraveMapping = { [chromiumMdExtensionsPartPath]: braveMdExtensionsPartPath, [chromiumPrintingStringsPartPath]: bravePrintingStringsPartPath, [chromiumProfileSettingsPartPath]: braveProfileSettingsPartPath, - [chromiumVRStringsPartPath]: braveVRStringsPartPath, + [chromiumVRStringsPartPath]: braveVRStringsPartPath } // Same as with chromiumToAutoGeneratedBraveMapping but maps in the opposite direction module.exports.autoGeneratedBraveToChromiumMapping = Object.keys(chromiumToAutoGeneratedBraveMapping) .reduce((obj, key) => ({ ...obj, [chromiumToAutoGeneratedBraveMapping[key]]: key }), {}) +// All paths which are not generated +module.exports.braveNonGeneratedPaths = [ + braveSpecificGeneratedResourcesPath, braveComponentsResourcesPath, braveExtensionMessagesPath +] + // All paths which are generated module.exports.braveAutoGeneratedPaths = Object.values(chromiumToAutoGeneratedBraveMapping) // Brave specific strings and Chromium mapped Brave strings will be here. // But you only need to add the Brave specific strings manually here. -module.exports.allBravePaths = module.exports.braveAutoGeneratedPaths +module.exports.allBravePaths = module.exports.braveNonGeneratedPaths.concat(module.exports.braveAutoGeneratedPaths) // Get all GRD and JSON paths whether they are generatd or not // Push and pull scripts for l10n use this.