From 9a61b0ef22eed244be422bfb24155656c4669044 Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Fri, 5 Jan 2018 12:43:50 +0900
Subject: [PATCH] Fix RFC 5646 Regular Expression (#6190)
---
app/javascript/mastodon/locales/whitelist_sr-Latn.json | 2 ++
config/webpack/translationRunner.js | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
create mode 100644 app/javascript/mastodon/locales/whitelist_sr-Latn.json
diff --git a/app/javascript/mastodon/locales/whitelist_sr-Latn.json b/app/javascript/mastodon/locales/whitelist_sr-Latn.json
new file mode 100644
index 0000000000..0d4f101c7a
--- /dev/null
+++ 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
index d616c78391..e6543fbb7f 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');
--
GitLab