Merge branch 'develop'

misskey-dev · Dec 14, 2021 · 8451436 · 8451436
2 parents 3762895 + 6319dd1
commit 8451436
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/locales/index.js b/locales/index.js
@@ -46,7 +46,10 @@ const primaries = {
 	'zh': 'CN',
 };
 
-const locales = languages.reduce((a, c) => (a[c] = yaml.load(fs.readFileSync(`${__dirname}/${c}.yml`, 'utf-8')) || {}, a), {});
+// 何故か文字列にバックスペース文字が混入することがあり、YAMLが壊れるので取り除く
+const clean = (text) => text.replace(new RegExp(String.fromCodePoint(0x08), 'g'), '');
+
+const locales = languages.reduce((a, c) => (a[c] = yaml.load(clean(fs.readFileSync(`${__dirname}/${c}.yml`, 'utf-8'))) || {}, a), {});
 
 module.exports = Object.entries(locales)
 	.reduce((a, [k ,v]) => (a[k] = (() => {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.99.0",
+	"version": "12.99.1",
 	"codename": "indigo",
 	"repository": {
 		"type": "git",