From 0a17fca46e48d0a238b3392555a7a3b5470a0f73 Mon Sep 17 00:00:00 2001 From: Jonas Jenwald Date: Sat, 19 Oct 2019 18:00:15 +0200 Subject: [PATCH] Ensure that we'll never, accidentally, try and fetch the default en-US locale (PR 11213 follow-up) --- external/importL10n/locales.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/external/importL10n/locales.js b/external/importL10n/locales.js index d5dcc96af..0a0e7cb72 100644 --- a/external/importL10n/locales.js +++ b/external/importL10n/locales.js @@ -22,6 +22,8 @@ var path = require('path'); // Fetches all languages that have an *active* translation in mozilla-central. // This is used in gulpfile.js for the `importl10n` command. +var DEFAULT_LOCALE = 'en-US'; + var EXCLUDE_LANG_CODES = ['ca-valencia', 'ja-JP-mac']; function normalizeText(s) { @@ -105,7 +107,8 @@ async function downloadL10n(root, callback) { var langCodes = await downloadLanguageCodes(); for (var langCode of langCodes) { - if (!langCode || EXCLUDE_LANG_CODES.includes(langCode)) { + if (!langCode || langCode === DEFAULT_LOCALE || + EXCLUDE_LANG_CODES.includes(langCode)) { continue; } await downloadLanguageFiles(root, langCode); @@ -115,7 +118,7 @@ async function downloadL10n(root, callback) { for (var entry of fs.readdirSync(root)) { var dirPath = path.join(root, entry), stat = fs.lstatSync(dirPath); - if (stat.isDirectory() && entry !== 'en-US' && + if (stat.isDirectory() && entry !== DEFAULT_LOCALE && (!langCodes.includes(entry) || EXCLUDE_LANG_CODES.includes(entry))) { removeCodes.push(entry); }