about summary refs log tree commit diff
path: root/config/webpack
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2018-01-05 17:31:56 -0600
committerDavid Yip <yipdw@member.fsf.org>2018-01-05 17:31:56 -0600
commit03aeab857f0972e74910307f1a5954353eb70a28 (patch)
treeb0b6243ee40684a949cff440bb56dcad7eec8674 /config/webpack
parentf441770e50621ac59a7b022ee2127964935b2b8d (diff)
parentf6adb409fd8f4bf42c1da54cc1e7e42886612c14 (diff)
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
Diffstat (limited to 'config/webpack')
-rw-r--r--config/webpack/translationRunner.js2
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');