From 3eadcbe392f4f93ab20209e4b931a49e00970fbf Mon Sep 17 00:00:00 2001 From: Dirk Baeumer Date: Mon, 25 Sep 2017 13:52:56 +0200 Subject: [PATCH] Fixes #29769: Update the locale.json schema to always be in sync with supported languages --- .../actions => electron-browser}/configureLocale.ts | 8 +++++++- src/vs/workbench/workbench.main.ts | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) rename src/vs/workbench/{browser/actions => electron-browser}/configureLocale.ts (93%) diff --git a/src/vs/workbench/browser/actions/configureLocale.ts b/src/vs/workbench/electron-browser/configureLocale.ts similarity index 93% rename from src/vs/workbench/browser/actions/configureLocale.ts rename to src/vs/workbench/electron-browser/configureLocale.ts index 41ca1f377c5..d360f840752 100644 --- a/src/vs/workbench/browser/actions/configureLocale.ts +++ b/src/vs/workbench/electron-browser/configureLocale.ts @@ -69,6 +69,12 @@ class ConfigureLocaleAction extends Action { const registry = Registry.as(Extensions.WorkbenchActions); registry.registerWorkbenchAction(new SyncActionDescriptor(ConfigureLocaleAction, ConfigureLocaleAction.ID, ConfigureLocaleAction.LABEL), 'Configure Language'); +let enumValues: string[] = ['de', 'en', 'en-US', 'es', 'fr', 'it', 'ja', 'ko', 'ru', 'zh-CN', 'zh-TW']; +import product from 'vs/platform/node/product'; +if (product.quality !== 'stable') { + enumValues.push('hu'); +} + const schemaId = 'vscode://schemas/locale'; // Keep en-US since we generated files with that content. const schema: IJSONSchema = @@ -83,7 +89,7 @@ const schema: IJSONSchema = properties: { locale: { type: 'string', - enum: ['de', 'en', 'en-US', 'es', 'fr', 'it', 'ja', 'ko', 'ru', 'zh-CN', 'zh-TW'], + enum: enumValues, description: nls.localize('JsonSchema.locale', 'The UI Language to use.') } } diff --git a/src/vs/workbench/workbench.main.ts b/src/vs/workbench/workbench.main.ts index d5c4c9ebf03..b162fb6a023 100644 --- a/src/vs/workbench/workbench.main.ts +++ b/src/vs/workbench/workbench.main.ts @@ -27,7 +27,6 @@ import 'vs/workbench/browser/actions/toggleEditorLayout'; import 'vs/workbench/browser/actions/toggleZenMode'; import 'vs/workbench/parts/preferences/browser/preferences.contribution'; import 'vs/workbench/parts/preferences/browser/keybindingsEditorContribution'; -import 'vs/workbench/browser/actions/configureLocale'; import 'vs/workbench/browser/parts/quickopen/quickopen.contribution'; import 'vs/workbench/parts/quickopen/browser/quickopen.contribution'; @@ -73,6 +72,7 @@ import 'vs/workbench/parts/terminal/browser/terminalQuickOpen'; import 'vs/workbench/parts/terminal/electron-browser/terminalPanel'; // can be packaged separately import 'vs/workbench/electron-browser/workbench'; +import 'vs/workbench/electron-browser/configureLocale'; import 'vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution'; -- GitLab