Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't localize the VS Clang kit name #1632

Merged
merged 1 commit into from
Jan 26, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/drivers/driver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ export abstract class CMakeDriver implements vscode.Disposable {
* @param keywordSetting Variant Keywords for identification of a variant option
*/
async setVariant(opts: VariantOption, keywordSetting: Map<string, string>|null) {
log.debug(localize('setting.new.variant', 'Setting new variant {0}', opts.long || '(Unnamed)'));
log.debug(localize('setting.new.variant', 'Setting new variant {0}', opts.short || '(Unnamed)'));
this._variantBuildType = opts.buildType || this._variantBuildType;
this._variantConfigureSettings = opts.settings || this._variantConfigureSettings;
this._variantLinkage = opts.linkage || null;
Expand Down
4 changes: 1 addition & 3 deletions src/kit.ts
Original file line number Diff line number Diff line change
Expand Up @@ -904,9 +904,7 @@ async function scanDirForClangForMSVCKits(dir: string, vsInstalls: VSInstallatio
if (binPath.startsWith(`${vs.installationPath}\\VC\\Tools\\Llvm\\${clangArch}bin`) &&
util.checkFileExists(util.lightNormalizePath(binPath))) {
clangKits.push({
name: localize({key: 'clang.for.vsmsvc',
comment: ["Clang should stay at the beginning of the string as it is used in UI sorting"]},
'Clang {0} {1} with {2} ({3})', version.version, clang_cli, install_name, vs_arch),
name: `Clang ${version.version} ${clang_cli} (${install_name} - ${vs_arch})`,
visualStudio: kitVSName(vs),
visualStudioArchitecture: vs_arch,
compilers: {
Expand Down