Merge pull request #3230 from LLK/fix-locale-data

Fix locale data

custom-locales.json

@@ -1,46 +0,0 @@
-{
-    "ab": {
-        "locale": "ab",
-        "parentLocale": "az"
-    },
-    "an": {
-        "locale": "an",
-        "parentLocale": "ca"
-    },
-    "cat": {
-        "locale": "cat",
-        "parentLocale": "en"
-    },
-    "ht": {
-        "locale": "ht",
-        "parentLocale": "fr"
-    },
-    "ja-hr": {
-        "locale": "ja-hr",
-        "parentLocale": "ja"
-    },
-    "rap": {
-        "locale": "rap",
-        "parentLocale": "es"
-    },
-    "la": {
-        "locale": "la",
-        "parentLocale": "it"
-    },
-    "sc": {
-        "locale": "sc",
-        "parentLocale": "it"
-    },
-    "yum": {
-        "locale": "yum",
-        "parentLocale": "en"
-    },
-    "zh-cn": {
-        "locale": "zh-cn",
-        "parentLocale": "zh"
-    },
-    "zh-tw": {
-        "locale": "zh-tw",
-        "parentLocale": "zh"
-    }
-}

src/lib/intl.jsx

@@ -1,21 +1,7 @@
-const requireAll = require('./require-all');
 const ReactIntl = require('react-intl');
 
-const allLocaleData = requireAll(require.context('react-intl/locale-data', true, /^\.\/.*\.js$/));
-const customLocaleData = require('../../custom-locales.json');
-
-/**
-  * Add all locales
-  */
-for (const locale in allLocaleData) {
-    ReactIntl.addLocaleData(allLocaleData[locale]);
-}
-
-/**
- * Add custom locales to react-intl if it doesn't have them.
- */
-for (const customLocale in customLocaleData) {
-    ReactIntl.addLocaleData(customLocaleData[customLocale]);
-}
+// Add locale data to react intl for all supported languages
+const localeData = require('scratch-l10n').localeData;
+ReactIntl.addLocaleData(localeData);
 
 module.exports = ReactIntl;

src/lib/require-all.js

@@ -1,5 +0,0 @@
-const requireAll = requireContext => (
-    requireContext.keys().map(requireContext)
-);
-
-module.exports = requireAll;