Fixed pulled translations path problem. Code tidy up.

This commit is contained in:
Michel Kaporin
2017-03-31 15:24:26 +02:00
parent 33653d1296
commit 47e5d4353a
3 changed files with 7 additions and 7 deletions

View File

@@ -340,7 +340,7 @@ gulp.task('vscode-linux-ia32-min', ['minify-vscode', 'clean-vscode-linux-ia32'],
gulp.task('vscode-linux-x64-min', ['minify-vscode', 'clean-vscode-linux-x64'], packageTask('linux', 'x64', { minified: true }));
gulp.task('vscode-linux-arm-min', ['minify-vscode', 'clean-vscode-linux-arm'], packageTask('linux', 'arm', { minified: true }));
const apiUrl = process.env.TRANSIFEX_API_URL;
const apiHostname = process.env.TRANSIFEX_API_URL;
const apiName = process.env.TRANSIFEX_API_NAME;
const apiToken = process.env.TRANSIFEX_API_TOKEN;
@@ -353,13 +353,13 @@ gulp.task('vscode-translations-update', function() {
gulp.src(pathToMetadata).pipe(i18n.prepareXlfFiles()),
gulp.src(pathToSetup).pipe(i18n.prepareXlfFiles()),
gulp.src(pathToExtensions).pipe(i18n.prepareXlfFiles('vscode-extensions'))
).pipe(i18n.pushXlfFiles(apiUrl, apiName, apiToken));
).pipe(i18n.pushXlfFiles(apiHostname, apiName, apiToken));
});
gulp.task('vscode-translations-pull', function() {
return es.merge(
i18n.pullXlfFiles('vscode-editor-workbench', apiUrl, apiName, apiToken),
i18n.pullXlfFiles('vscode-extensions', apiUrl, apiName, apiToken)
i18n.pullXlfFiles('vscode-editor-workbench', apiHostname, apiName, apiToken),
i18n.pullXlfFiles('vscode-extensions', apiHostname, apiName, apiToken)
).pipe(i18n.prepareJsonFiles()).pipe(vfs.dest('./i18n'));
});

View File

@@ -545,7 +545,7 @@ function importBundleJson(file, json, stream) {
log('Error:', "There is a mismatch between keys and messages in " + file.relative);
}
var xlf = bundleXlfs[resource] ? bundleXlfs[resource] : bundleXlfs[resource] = new XLF(project);
xlf.addFile(source, keys, messages);
xlf.addFile('src/' + source, keys, messages);
}
for (var resource in bundleXlfs) {
var newFilePath = bundleXlfs[resource].project + "/" + resource.replace(/\//g, '_') + ".xlf";
@@ -987,4 +987,4 @@ function encodeEntities(value) {
function decodeEntities(value) {
return value.replace(/&lt;/g, '<').replace(/&gt;/g, '>').replace(/&amp;/g, '&');
}
exports.decodeEntities = decodeEntities;
exports.decodeEntities = decodeEntities;

View File

@@ -613,7 +613,7 @@ function importBundleJson(file: File, json: BundledFormat, stream: ThroughStream
}
let xlf = bundleXlfs[resource] ? bundleXlfs[resource] : bundleXlfs[resource] = new XLF(project);
xlf.addFile(source, keys, messages);
xlf.addFile('src/' + source, keys, messages);
}
for (let resource in bundleXlfs) {