]> cat aescling's git repositories - mastodon.git/commitdiff
Fix RFC 5646 Regular Expression (#6190)
authorYamagishi Kazutoshi <ykzts@desire.sh>
Fri, 5 Jan 2018 03:43:50 +0000 (12:43 +0900)
committerEugen Rochko <eugen@zeonfederated.com>
Fri, 5 Jan 2018 03:43:50 +0000 (04:43 +0100)
app/javascript/mastodon/locales/whitelist_sr-Latn.json [new file with mode: 0644]
config/webpack/translationRunner.js

diff --git a/app/javascript/mastodon/locales/whitelist_sr-Latn.json b/app/javascript/mastodon/locales/whitelist_sr-Latn.json
new file mode 100644 (file)
index 0000000..0d4f101
--- /dev/null
@@ -0,0 +1,2 @@
+[
+]
index d616c78391e3980bb93aa4dc98af4da8793b99b7..e6543fbb7f7b9a2e55566ee9d1210bb32eceb467 100644 (file)
@@ -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');