Skip to content

Commit adca369

Browse files
authored
Merge branch 'main' into localization
2 parents f086e5c + 9b398b1 commit adca369

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

Extension/gulpfile.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,10 @@ const generateLocalizedJsonSchemaFiles = () => {
549549
keyPrefix = keyPrefix.replace(/\\/g, "/");
550550
let descriptionCallback = (path, value, parent) => {
551551
if (stringTable[keyPrefix + path]) {
552-
parent.description = stringTable[keyPrefix + path];
552+
if (!parent.markdownDescription)
553+
parent.description = stringTable[keyPrefix + path];
554+
else
555+
parent.markdownDescription = stringTable[keyPrefix + path];
553556
}
554557
};
555558
traverseJson(jsonTree, descriptionCallback, "");

Extension/src/telemetry.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ export function activate(): void {
6565
if (packageInfo) {
6666
let targetPopulation: TargetPopulation;
6767
const userVersion: PackageVersion = new PackageVersion(packageInfo.version);
68-
if (userVersion.suffix === "") {
68+
if (!userVersion.suffix) {
6969
targetPopulation = TargetPopulation.Public;
7070
} else if (userVersion.suffix === "insiders") {
7171
targetPopulation = TargetPopulation.Insiders;

0 commit comments

Comments
 (0)