diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-01-05 22:17:12 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-01-05 22:17:12 +0000 |
| commit | f6adb409fd8f4bf42c1da54cc1e7e42886612c14 (patch) | |
| tree | 01ab66d37a57fbe59546f6376e16c8398b5198d8 /config/webpack | |
| parent | f41b33eb0177b23bd72fede7df94af43da0c7c6b (diff) | |
| parent | 10f6793fd0af3690a37c868b7bb4418418dc3a7a (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'config/webpack')
| -rw-r--r-- | config/webpack/translationRunner.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/webpack/translationRunner.js b/config/webpack/translationRunner.js index d616c7839..e6543fbb7 100644 --- a/config/webpack/translationRunner.js +++ b/config/webpack/translationRunner.js @@ -2,7 +2,7 @@ const fs = require('fs'); const path = require('path'); const { default: manageTranslations } = require('react-intl-translations-manager'); -const RFC5646_REGEXP = /^[a-z]{2,3}(?:|-[A-Z]+)$/; +const RFC5646_REGEXP = /^[a-z]{2,3}(?:-(?:x|[A-Za-z]{2,4}))*$/; const rootDirectory = path.resolve(__dirname, '..', '..'); const translationsDirectory = path.resolve(rootDirectory, 'app', 'javascript', 'mastodon', 'locales'); |