diff --git a/custom-locales.json b/custom-locales.json deleted file mode 100644 index c7281d3db..000000000 --- a/custom-locales.json +++ /dev/null @@ -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" - } -} diff --git a/src/lib/intl.jsx b/src/lib/intl.jsx index c29c53fab..93f61a717 100644 --- a/src/lib/intl.jsx +++ b/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; diff --git a/src/lib/require-all.js b/src/lib/require-all.js deleted file mode 100644 index 415eeecb9..000000000 --- a/src/lib/require-all.js +++ /dev/null @@ -1,5 +0,0 @@ -const requireAll = requireContext => ( - requireContext.keys().map(requireContext) -); - -module.exports = requireAll;