From b67d78923c8ba46a0ca70a961e92fa108b7959b2 Mon Sep 17 00:00:00 2001 From: "David Humphrey (:humph) david.humphrey@senecacollege.ca" Date: Mon, 13 Feb 2017 15:59:31 -0500 Subject: [PATCH] Fix Gruntfile and localization scripts to pass build, fixes https://github.com/mozilla/thimble.mozilla.org/issues/1670 --- Gruntfile.js | 6 ++++-- scripts/properties2js.js | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index d2c9a1527..561b27bfc 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -93,9 +93,11 @@ module.exports = function (grunt) { /* extensions and CodeMirror modes */ '!extensions/default/*/unittests.js', - 'extensions/default/*/**/*.*', + 'extensions/default/*/**/*.js', '!extensions/extra/*/unittests.js', - 'extensions/extra/*/**/*.*', + 'extensions/extra/*/**/*.js', + '!extensions/**/node_modules/**/*.js', + '!extensions/**/test/**/*.js', '!**/unittest-files/**', 'thirdparty/CodeMirror/addon/{,*/}*.js', 'thirdparty/CodeMirror/keymap/{,*/}*.js', diff --git a/scripts/properties2js.js b/scripts/properties2js.js index 247fda3a0..5ae771074 100644 --- a/scripts/properties2js.js +++ b/scripts/properties2js.js @@ -94,7 +94,7 @@ function localizeBrackets(locale) { return Promise.resolve(); } - if(isNewLocale) { + if(isNewLocale && (destLocales.indexOf(localeDir) === -1)) { destLocales.push(localeDir); }