add en locale

.gitignore

@@ -22,6 +22,7 @@ media/
 node_modules/
 static/
 tmp/
+locales/en/
 
 # Files to ignore within specific directories
 addon/*.rdf

frontend/config.js

@@ -8,9 +8,10 @@ module.exports = {
   ENABLE_DEV_CONTENT: (process.env.ENABLE_DEV_CONTENT === '1'),
   AVAILABLE_LOCALES: (process.env.ENABLE_DEV_LOCALES === '1') ?
     // All locales on Pontoon for local & dev
-    fs.readdirSync('./locales').join(',') :
+    // en is copied from en-US at build time, so we have to add it special
+    'en,' + fs.readdirSync('./locales').join(',')  :
     // Enabled locales for stage & production - update as they reach 100%
-    'en-US,cs,de,dsb,es-ES,fr,fy-NL,hsb,hu,it,nl,pt-BR,ru,sv-SE,uk,zh-CN,zh-TW',
+    'en-US,en,cs,de,dsb,es-ES,fr,fy-NL,hsb,hu,it,nl,pt-BR,ru,sv-SE,uk,zh-CN,zh-TW',
 
   // TODO: Move addon build to a better path
   ADDON_SRC_PATH: './addon/',

frontend/tasks/content.js

@@ -22,6 +22,17 @@ gulp.task('content-experiments-data', function generateStaticAPITask() {
     .pipe(gulp.dest(config.DEST_PATH));
 });
 
+// The next two tasks are hacks to copy the en-US locale 
+// to an en locale. See issue #2006 for background.
+gulp.task('content-watch-en', () => {
+   gulp.watch('./locales/en-US/**/*', ['content-build-en']);
+});
+
+gulp.task('content-build-en', () => {
+  return gulp.src('./locales/en-US/**/*')
+    .pipe(gulp.dest('./locales/en'));
+});
+
 gulp.task('import-api-content', (done) => {
   fetch(config.PRODUCTION_EXPERIMENTS_URL)
     .then(response => response.json())

gulpfile.js

@@ -26,20 +26,23 @@ gulp.task('clean', () => del([
   config.DJANGO_OLD_STATIC
 ]));
 
-gulp.task('build', [
-  'addon-copy-locales',
+gulp.task('build', done => runSequence(
   'content-build',
+  'content-build-en',
+  'addon-copy-locales',
   'scripts-build',
   'styles-build',
   'images-build',
   'assets-build',
-  'pages-build'
-]);
+  'pages-build',
+  done
+));
 
 gulp.task('watch', [
-  'addon-watch-locales',
   'self-watch',
   'content-watch',
+  'content-watch-en',
+  'addon-watch-locales',
   'scripts-watch',
   'styles-watch',
   'images-watch',