mastofe

commit: 9a61b0ef22eed244be422bfb24155656c4669044
parent: d872902997c29e228001b71a4a3ede589e346f5d
Author: Yamagishi Kazutoshi <ykzts@desire.sh>
Date:   Fri,  5 Jan 2018 12:43:50 +0900

Fix RFC 5646 Regular Expression (#6190)


Diffstat:
A
app/javascript/mastodon/locales/whitelist_sr-Latn.json
2
++
M
config/webpack/translationRunner.js
2
+-

2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/app/javascript/mastodon/locales/whitelist_sr-Latn.json b/app/javascript/mastodon/locales/whitelist_sr-Latn.json
@@ -0,0 +1,2 @@
+[
+]
diff --git 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');