5 лет назад · f9944d7b8e
--- a/package.json
+++ b/package.json
@@ -54,8 +54,8 @@
 
				     "preserver:prod": "npm run migrate",
			
 
				     "prestart": "npm run build:prod",
			
 
				     "resource": "node bin/download-cdn-resources.js",
			
 
				-    "translations": "rs-i18n -lan zh-CN -t",
			
 
				-    "i18n-json-merge:noTran": "rs-i18n -lan zh-CN",
			
 
				+    "translations": "rs-i18n -lan zh_CN -t",
			
 
				+    "i18n-json-merge:noTran": "rs-i18n -lan zh_CN",
			
 
				     "server:nolazy": "env-cmd -f config/env.dev.js node-dev --nolazy --inspect src/server/app.js",
			
 
				     "server:dev": "env-cmd -f config/env.dev.js node-dev --inspect src/server/app.js",
			
 
				     "server:prod:ci": "npm run server:prod -- --ci",
			
--- a/resource/locales/en_US/_conf.json
+++ b/resource/locales/en_US/_conf.json
--- a/resource/locales/en_US/admin/admin.json
+++ b/resource/locales/en_US/admin/admin.json
--- a/resource/locales/en_US/admin/userInvitation.txt
+++ b/resource/locales/en_US/admin/userInvitation.txt
--- a/resource/locales/en_US/admin/userWaitingActivation.txt
+++ b/resource/locales/en_US/admin/userWaitingActivation.txt
--- a/resource/locales/en_US/notifications/comment.txt
+++ b/resource/locales/en_US/notifications/comment.txt
--- a/resource/locales/en_US/notifications/pageCreate.txt
+++ b/resource/locales/en_US/notifications/pageCreate.txt
--- a/resource/locales/en_US/notifications/pageDelete.txt
+++ b/resource/locales/en_US/notifications/pageDelete.txt
--- a/resource/locales/en_US/notifications/pageEdit.txt
+++ b/resource/locales/en_US/notifications/pageEdit.txt
--- a/resource/locales/en_US/notifications/pageLike.txt
+++ b/resource/locales/en_US/notifications/pageLike.txt
--- a/resource/locales/en_US/notifications/pageMove.txt
+++ b/resource/locales/en_US/notifications/pageMove.txt
--- a/resource/locales/en_US/sandbox-bootstrap4.md
+++ b/resource/locales/en_US/sandbox-bootstrap4.md
--- a/resource/locales/en_US/sandbox-diagrams.md
+++ b/resource/locales/en_US/sandbox-diagrams.md
--- a/resource/locales/en_US/sandbox-math.md
+++ b/resource/locales/en_US/sandbox-math.md
--- a/resource/locales/en_US/sandbox.md
+++ b/resource/locales/en_US/sandbox.md
--- a/resource/locales/en_US/translation.json
+++ b/resource/locales/en_US/translation.json
--- a/resource/locales/en_US/welcome.md
+++ b/resource/locales/en_US/welcome.md
--- a/resource/locales/ja_JP/_conf.json
+++ b/resource/locales/ja_JP/_conf.json
@@ -1,3 +1,4 @@
 
				 {
			
 
				+  "aliases": ["ja"],
			
 
				   "name": "日本語"
			
 
				 }
			
--- a/resource/locales/ja_JP/admin/admin.json
+++ b/resource/locales/ja_JP/admin/admin.json
--- a/resource/locales/ja_JP/admin/userInvitation.txt
+++ b/resource/locales/ja_JP/admin/userInvitation.txt
--- a/resource/locales/ja_JP/admin/userWaitingActivation.txt
+++ b/resource/locales/ja_JP/admin/userWaitingActivation.txt
--- a/resource/locales/ja_JP/notifications/comment.txt
+++ b/resource/locales/ja_JP/notifications/comment.txt
--- a/resource/locales/ja_JP/notifications/pageCreate.txt
+++ b/resource/locales/ja_JP/notifications/pageCreate.txt
--- a/resource/locales/ja_JP/notifications/pageDelete.txt
+++ b/resource/locales/ja_JP/notifications/pageDelete.txt
--- a/resource/locales/ja_JP/notifications/pageEdit.txt
+++ b/resource/locales/ja_JP/notifications/pageEdit.txt
--- a/resource/locales/ja_JP/notifications/pageLike.txt
+++ b/resource/locales/ja_JP/notifications/pageLike.txt
--- a/resource/locales/ja_JP/notifications/pageMove.txt
+++ b/resource/locales/ja_JP/notifications/pageMove.txt
--- a/resource/locales/ja_JP/sandbox-bootstrap4.md
+++ b/resource/locales/ja_JP/sandbox-bootstrap4.md
--- a/resource/locales/ja_JP/sandbox-diagrams.md
+++ b/resource/locales/ja_JP/sandbox-diagrams.md
--- a/resource/locales/ja_JP/sandbox-math.md
+++ b/resource/locales/ja_JP/sandbox-math.md
--- a/resource/locales/ja_JP/sandbox.md
+++ b/resource/locales/ja_JP/sandbox.md
--- a/resource/locales/ja_JP/translation.json
+++ b/resource/locales/ja_JP/translation.json
--- a/resource/locales/ja_JP/welcome.md
+++ b/resource/locales/ja_JP/welcome.md
--- a/resource/locales/zh_CN/_conf.json
+++ b/resource/locales/zh_CN/_conf.json
--- a/resource/locales/zh_CN/admin/admin.json
+++ b/resource/locales/zh_CN/admin/admin.json
--- a/resource/locales/zh_CN/admin/userInvitation.txt
+++ b/resource/locales/zh_CN/admin/userInvitation.txt
--- a/resource/locales/zh_CN/admin/userWaitingActivation.txt
+++ b/resource/locales/zh_CN/admin/userWaitingActivation.txt
--- a/resource/locales/zh_CN/notifications/comment.txt
+++ b/resource/locales/zh_CN/notifications/comment.txt
--- a/resource/locales/zh_CN/notifications/pageCreate.txt
+++ b/resource/locales/zh_CN/notifications/pageCreate.txt
--- a/resource/locales/zh_CN/notifications/pageDelete.txt
+++ b/resource/locales/zh_CN/notifications/pageDelete.txt
--- a/resource/locales/zh_CN/notifications/pageEdit.txt
+++ b/resource/locales/zh_CN/notifications/pageEdit.txt
--- a/resource/locales/zh_CN/notifications/pageLike.txt
+++ b/resource/locales/zh_CN/notifications/pageLike.txt
--- a/resource/locales/zh_CN/notifications/pageMove.txt
+++ b/resource/locales/zh_CN/notifications/pageMove.txt
--- a/resource/locales/zh_CN/sandbox-bootstrap4.md
+++ b/resource/locales/zh_CN/sandbox-bootstrap4.md
--- a/resource/locales/zh_CN/sandbox-diagrams.md
+++ b/resource/locales/zh_CN/sandbox-diagrams.md
--- a/resource/locales/zh_CN/sandbox-math.md
+++ b/resource/locales/zh_CN/sandbox-math.md
--- a/resource/locales/zh_CN/sandbox.md
+++ b/resource/locales/zh_CN/sandbox.md
--- a/resource/locales/zh_CN/translation.json
+++ b/resource/locales/zh_CN/translation.json
--- a/resource/locales/zh_CN/welcome.md
+++ b/resource/locales/zh_CN/welcome.md
--- a/rs-i18n.env
+++ b/rs-i18n.env
@@ -5,5 +5,5 @@ RS_I18N_BASE_LANGUAGE=en-US
 
				 RS_I18N_TARGET_FILE_SUFFIX= '.json'
			
 
				 RS_I18N_DEBUG_FORMAT=__{%s}__
			
 
				 
			
 
				-RS_I18N_LAN_zh-CN=zh
			
 
				+RS_I18N_LAN_zh_CN=zh
			
 
				 RS_I18N_LAN_ja=jp