From 6acc9f4a75ebb33c6100df18937df627274c0cec Mon Sep 17 00:00:00 2001 From: Alex Ma Date: Thu, 10 Aug 2023 09:32:13 -0700 Subject: [PATCH] [Loc] cleanup and update localization build filters. (#24114) * cleaned up build files * made small adjustments to locfunc --- build/gulpfile.vscode.js | 7 +++--- build/lib/locFunc.js | 14 +++++++----- build/lib/locFunc.ts | 13 ++++++----- resources/xlf/LocProject.json | 42 +++++++++++++++++++++++++---------- 4 files changed, 49 insertions(+), 27 deletions(-) diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js index 65df3a1c20..b182aa8a14 100644 --- a/build/gulpfile.vscode.js +++ b/build/gulpfile.vscode.js @@ -163,10 +163,11 @@ const extensionsFilter = filter([ '**/azurecore.xlf', '**/azuremonitor.xlf', '**/cms.xlf', + '**/context-monitor.xlf', '**/dacpac.xlf', + '**/data-workspace.xlf', '**/datavirtualization.xlf', '**/git.xlf', - '**/data-workspace.xlf', '**/import.xlf', '**/kusto.xlf', '**/machine-learning.xlf', @@ -174,14 +175,14 @@ const extensionsFilter = filter([ '**/notebook.xlf', '**/profiler.xlf', '**/query-history.xlf', + '**/query-store.xlf', '**/resource-deployment.xlf', '**/schema-compare.xlf', '**/server-report.xlf', '**/sql-assessment.xlf', '**/sql-bindings.xlf', '**/sql-database-projects.xlf', - '**/sql-migration.xlf', - '**/xml-language-features.xlf' + '**/sql-migration.xlf' ]); // Copy ADS extension XLFs into English resource folder. diff --git a/build/lib/locFunc.js b/build/lib/locFunc.js index f478f43557..967af9dc2a 100644 --- a/build/lib/locFunc.js +++ b/build/lib/locFunc.js @@ -139,11 +139,13 @@ function modifyI18nPackFiles(existingTranslationFolder, resultingTranslationPath for (let extension in extensionsPacks) { const translatedExtFile = i18n.createI18nFile(`extensions/${extension}`, extensionsPacks[extension]); this.queue(translatedExtFile); - // exclude altered vscode extensions from having a new path even if we provide a new I18n file. - if (alteredVSCodeExtensions.indexOf(extension) === -1) { - let adsExtensionId = 'Microsoft.' + extension; - resultingTranslationPaths.push({ id: adsExtensionId, resourceName: `extensions/${extension}.i18n.json` }); + let adsExtensionId = 'Microsoft.' + extension; + // Exclude altered vscode extensions from having a new id, as it's identified this way in ADS. + // We will use ADS's i18n file for actual translations. + if (alteredVSCodeExtensions.indexOf(extension) !== -1) { + adsExtensionId = 'vscode.' + extension; } + resultingTranslationPaths.push({ id: adsExtensionId, resourceName: `extensions/${extension}.i18n.json` }); } this.queue(null); }) @@ -169,12 +171,12 @@ const VSCODEExtensions = [ "builtin-notebook-renderers", "configuration-editing", "docker", - "git", "git-base", "github", "github-authentication", "image-preview", "ipynb", + "javascript", "json", "json-language-features", "markdown", @@ -395,4 +397,4 @@ function renameVscodeLangpacks() { return Promise.resolve(); } exports.renameVscodeLangpacks = renameVscodeLangpacks; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"locFunc.js","sourceRoot":"","sources":["locFunc.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"locFunc.js","sourceRoot":"","sources":["locFunc.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/build/lib/locFunc.ts b/build/lib/locFunc.ts index 4cf77b8ad1..1ee173ef60 100644 --- a/build/lib/locFunc.ts +++ b/build/lib/locFunc.ts @@ -154,12 +154,13 @@ export function modifyI18nPackFiles(existingTranslationFolder: string, resulting for (let extension in extensionsPacks) { const translatedExtFile = i18n.createI18nFile(`extensions/${extension}`, extensionsPacks[extension]); this.queue(translatedExtFile); - - // exclude altered vscode extensions from having a new path even if we provide a new I18n file. - if (alteredVSCodeExtensions.indexOf(extension) === -1) { - let adsExtensionId = 'Microsoft.' + extension; - resultingTranslationPaths.push({ id: adsExtensionId, resourceName: `extensions/${extension}.i18n.json` }); + let adsExtensionId = 'Microsoft.' + extension; + // Exclude altered vscode extensions from having a new id, as it's identified this way in ADS. + // We will use ADS's i18n file for actual translations. + if (alteredVSCodeExtensions.indexOf(extension) !== -1) { + adsExtensionId = 'vscode.' + extension; } + resultingTranslationPaths.push({ id: adsExtensionId, resourceName: `extensions/${extension}.i18n.json` }); } this.queue(null); }) @@ -186,12 +187,12 @@ const VSCODEExtensions = [ "builtin-notebook-renderers", // notebook renderers "configuration-editing", "docker", - "git", "git-base", "github", "github-authentication", "image-preview", "ipynb", + "javascript", "json", "json-language-features", "markdown", // markdown-basics diff --git a/resources/xlf/LocProject.json b/resources/xlf/LocProject.json index d57cedb6c9..e1c641ce5b 100644 --- a/resources/xlf/LocProject.json +++ b/resources/xlf/LocProject.json @@ -38,12 +38,24 @@ "LclFile": "resources\\localization\\LCL\\{Lang}\\azurecore.xlf.lcl", "CopyOption": "LangIDOnPath", "OutputPath": "resources\\xlf" + }, + { + "SourceFile": "resources\\xlf\\en\\azuremonitor.xlf", + "LclFile": "resources\\localization\\LCL\\{Lang}\\azuremonitor.xlf.lcl", + "CopyOption": "LangIDOnPath", + "OutputPath": "resources\\xlf" }, { "SourceFile": "resources\\xlf\\en\\cms.xlf", "LclFile": "resources\\localization\\LCL\\{Lang}\\cms.xlf.lcl", "CopyOption": "LangIDOnPath", "OutputPath": "resources\\xlf" + }, + { + "SourceFile": "resources\\xlf\\en\\context-builder.xlf", + "LclFile": "resources\\localization\\LCL\\{Lang}\\context-builder.xlf.lcl", + "CopyOption": "LangIDOnPath", + "OutputPath": "resources\\xlf" }, { "SourceFile": "resources\\xlf\\en\\dacpac.xlf", @@ -56,6 +68,12 @@ "LclFile": "resources\\localization\\LCL\\{Lang}\\data-workspace.xlf.lcl", "CopyOption": "LangIDOnPath", "OutputPath": "resources\\xlf" + }, + { + "SourceFile": "resources\\xlf\\en\\datavirtualization.xlf", + "LclFile": "resources\\localization\\LCL\\{Lang}\\datavirtualization.xlf.lcl", + "CopyOption": "LangIDOnPath", + "OutputPath": "resources\\xlf" }, { "SourceFile": "resources\\xlf\\en\\git.xlf", @@ -104,6 +122,12 @@ "LclFile": "resources\\localization\\LCL\\{Lang}\\query-history.xlf.lcl", "CopyOption": "LangIDOnPath", "OutputPath": "resources\\xlf" + }, + { + "SourceFile": "resources\\xlf\\en\\query-store.xlf", + "LclFile": "resources\\localization\\LCL\\{Lang}\\query-store.xlf.lcl", + "CopyOption": "LangIDOnPath", + "OutputPath": "resources\\xlf" }, { "SourceFile": "resources\\xlf\\en\\resource-deployment.xlf", @@ -128,6 +152,12 @@ "LclFile": "resources\\localization\\LCL\\{Lang}\\sql-assessment.xlf.lcl", "CopyOption": "LangIDOnPath", "OutputPath": "resources\\xlf" + }, + { + "SourceFile": "resources\\xlf\\en\\sql-bindings.xlf", + "LclFile": "resources\\localization\\LCL\\{Lang}\\sql-bindings.xlf.lcl", + "CopyOption": "LangIDOnPath", + "OutputPath": "resources\\xlf" }, { "SourceFile": "resources\\xlf\\en\\sql-database-projects.xlf", @@ -140,18 +170,6 @@ "LclFile": "resources\\localization\\LCL\\{Lang}\\sql-migration.xlf.lcl", "CopyOption": "LangIDOnPath", "OutputPath": "resources\\xlf" - }, - { - "SourceFile": "resources\\xlf\\en\\sql.xlf", - "LclFile": "resources\\localization\\LCL\\{Lang}\\sql.xlf.lcl", - "CopyOption": "LangIDOnPath", - "OutputPath": "resources\\xlf" - }, - { - "SourceFile": "resources\\xlf\\en\\xml-language-features.xlf", - "LclFile": "resources\\localization\\LCL\\{Lang}\\xml-language-features.xlf.lcl", - "CopyOption": "LangIDOnPath", - "OutputPath": "resources\\xlf" } ] }