Skip to content

Commit 9f19813

Browse files
authored
Switching to new vscode localization api and library. (#18023)
* new loc * Updating l10n directory * Adding new xliff files * updating git ignore * remove old loc from nls * removing old loc files * remove old loc gulp taks * Updating vscode ignore and package.json * Reversing some change * Adding loc to webview Fixing task fixing enu xlf file * simple example for webview localization * Adding back loc projects * Fixing loc * Adding bundle l10n files * Adding an example for webview translation * fixing loc tasks * Fixing new loc strings * undo change * Adding missing strings * Adding more info to loc readme * Removing format strings from loc * adding official documentation. * Adding comment to explain the localization hook * Adding more docs * fixing tests * fixing names * Trying inline loc * Adding missing files * Fixing typos * FIxing loc * Delete src/connectionconfig/connectionDialogWebViewController.ts * fixing doc
1 parent af63eb2 commit 9f19813

File tree

120 files changed

+20800
-52997
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

120 files changed

+20800
-52997
lines changed

.vscodeignore

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ coverage
55
coverage-remapped
66
lib
77
localization
8+
! localization/l10n
89
out/test
910
packages
1011
samples

gulpfile.js

+3-30
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ const config = require('./tasks/config');
88
const concat = require('gulp-concat');
99
const minifier = require('gulp-uglify/minifier');
1010
const uglifyjs = require('uglify-js');
11-
const nls = require('vscode-nls-dev');
1211
const argv = require('yargs').argv;
1312
const min = (argv.min === undefined) ? false : true;
1413
const prod = (argv.prod === undefined) ? false : true;
@@ -162,23 +161,7 @@ async function generateExtensionBundle() {
162161
await ctx.dispose();
163162
}
164163

165-
function transformExtensionLocalization(patterns) {
166-
return gulp.src(patterns)
167-
.pipe(nls.rewriteLocalizeCalls())
168-
.pipe(nls.createAdditionalLanguageFiles(nls.coreLanguages, config.paths.project.root + '/localization/i18n', undefined, false))
169-
.pipe(srcmap.write('.', { includeContent: false, sourceRoot: '../src' }))
170-
.pipe(gulp.dest('out/src/'));
171-
}
172-
173-
gulp.task('ext:bundle-src', gulp.series(generateExtensionBundle, () => transformExtensionLocalization(
174-
[
175-
'out/src/extension.js',
176-
'out/src/languageService/serviceInstallerUtil.js',
177-
'out/src/telemetry/telemetryInterfaces.js',
178-
'out/src/protocol.js',
179-
'out/src/models/interfaces.js'
180-
]
181-
)));
164+
gulp.task('ext:bundle-src', gulp.series(generateExtensionBundle));
182165

183166
gulp.task('ext:compile-src', (done) => {
184167
return gulp.src([
@@ -194,8 +177,6 @@ gulp.task('ext:compile-src', (done) => {
194177
process.exit(1);
195178
}
196179
})
197-
.pipe(nls.rewriteLocalizeCalls())
198-
.pipe(nls.createAdditionalLanguageFiles(nls.coreLanguages, config.paths.project.root + '/localization/i18n', undefined, false))
199180
.pipe(srcmap.write('.', { includeContent: false, sourceRoot: '../src' }))
200181
.pipe(gulp.dest('out/src/'));
201182
});
@@ -207,8 +188,6 @@ return gulp.src([
207188
config.paths.project.root + '/typings/**/*.d.ts'])
208189
.pipe(srcmap.init())
209190
.pipe(tsProject())
210-
.pipe(nls.rewriteLocalizeCalls())
211-
.pipe(nls.createAdditionalLanguageFiles(nls.coreLanguages, config.paths.project.root + '/localization/i18n', undefined, false))
212191
.pipe(srcmap.write('.', { includeContent: false, sourceRoot: '../src' }))
213192
.pipe(gulp.dest('out/src/views/htmlcontent'));
214193
});
@@ -268,11 +247,7 @@ async function generateReactWebviewsBundle() {
268247

269248
// Compile react views
270249
gulp.task('ext:compile-reactviews',
271-
gulp.series(generateReactWebviewsBundle, function transformReactWebviewsLocalization() {
272-
return transformExtensionLocalization([
273-
'out/react-webviews/assets/*.js',
274-
])
275-
})
250+
gulp.series(generateReactWebviewsBundle)
276251
);
277252

278253

@@ -423,9 +398,7 @@ gulp.task('ext:copy-js', () => {
423398
// Copy the files which aren't used in compilation
424399
gulp.task('ext:copy', gulp.series('ext:copy-tests', 'ext:copy-js', 'ext:copy-config', 'ext:copy-systemjs-config', 'ext:copy-dependencies', 'ext:copy-html', 'ext:copy-css', 'ext:copy-images'));
425400

426-
gulp.task('ext:localization', gulp.series('ext:localization:generate-eng-package.nls', 'ext:localization:xliff-to-ts', 'ext:localization:xliff-to-json', 'ext:localization:xliff-to-package.nls'));
427-
428-
gulp.task('ext:build', gulp.series('ext:localization', 'ext:copy', 'ext:clean-library-ts-files', 'ext:compile', 'ext:compile-view', 'ext:compile-reactviews')); // removed lint before copy
401+
gulp.task('ext:build', gulp.series('ext:generate-runtime-localization-files', 'ext:copy', 'ext:clean-library-ts-files', 'ext:compile', 'ext:compile-view', 'ext:compile-reactviews')); // removed lint before copy
429402

430403
gulp.task('ext:test', async () => {
431404
let workspace = process.env['WORKSPACE'];

0 commit comments

Comments
 (0)