From 348f6f68cd00ce4498dc1cf5983cbfac6e00258d Mon Sep 17 00:00:00 2001
From: Lukas <lukas@slucky.de>
Date: Wed, 13 Apr 2022 12:05:15 +0200
Subject: [PATCH] fix chinese i18n types (#2080)

---
 front/src/i18n/zh-CN/audio.ts     | 4 ++--
 front/src/i18n/zh-CN/camera.ts    | 4 ++--
 front/src/i18n/zh-CN/chat.ts      | 4 ++--
 front/src/i18n/zh-CN/companion.ts | 4 ++--
 front/src/i18n/zh-CN/emoji.ts     | 4 ++--
 front/src/i18n/zh-CN/error.ts     | 4 ++--
 front/src/i18n/zh-CN/follow.ts    | 4 ++--
 front/src/i18n/zh-CN/index.ts     | 6 ++++--
 front/src/i18n/zh-CN/login.ts     | 4 ++--
 front/src/i18n/zh-CN/menu.ts      | 4 ++--
 front/src/i18n/zh-CN/report.ts    | 4 ++--
 front/src/i18n/zh-CN/trigger.ts   | 4 ++--
 front/src/i18n/zh-CN/warning.ts   | 4 ++--
 front/src/i18n/zh-CN/woka.ts      | 4 ++--
 14 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/front/src/i18n/zh-CN/audio.ts b/front/src/i18n/zh-CN/audio.ts
index b6127f8d..7f8a8915 100644
--- a/front/src/i18n/zh-CN/audio.ts
+++ b/front/src/i18n/zh-CN/audio.ts
@@ -1,6 +1,6 @@
-import type { BaseTranslation } from "../i18n-types";
+import type { Translation } from "../i18n-types";
 
-const audio: BaseTranslation = {
+const audio: NonNullable<Translation["audio"]> = {
     manager: {
         reduce: "说话时降低音乐音量",
         allow: "播放声音",
diff --git a/front/src/i18n/zh-CN/camera.ts b/front/src/i18n/zh-CN/camera.ts
index cb0b6026..fbe186dc 100644
--- a/front/src/i18n/zh-CN/camera.ts
+++ b/front/src/i18n/zh-CN/camera.ts
@@ -1,6 +1,6 @@
-import type { BaseTranslation } from "../i18n-types";
+import type { Translation } from "../i18n-types";
 
-const camera: BaseTranslation = {
+const camera: NonNullable<Translation["camera"]> = {
     enable: {
         title: "开启你的摄像头和麦克风",
         start: "出发!",
diff --git a/front/src/i18n/zh-CN/chat.ts b/front/src/i18n/zh-CN/chat.ts
index 5b1ccad1..5bca4570 100644
--- a/front/src/i18n/zh-CN/chat.ts
+++ b/front/src/i18n/zh-CN/chat.ts
@@ -1,6 +1,6 @@
-import type { BaseTranslation } from "../i18n-types";
+import type { Translation } from "../i18n-types";
 
-const chat: BaseTranslation = {
+const chat: NonNullable<Translation["chat"]> = {
     intro: "聊天历史:",
     enter: "输入消息...",
     menu: {
diff --git a/front/src/i18n/zh-CN/companion.ts b/front/src/i18n/zh-CN/companion.ts
index 2cf78080..aacb69f4 100644
--- a/front/src/i18n/zh-CN/companion.ts
+++ b/front/src/i18n/zh-CN/companion.ts
@@ -1,6 +1,6 @@
-import type { BaseTranslation } from "../i18n-types";
+import type { Translation } from "../i18n-types";
 
-const companion: BaseTranslation = {
+const companion: NonNullable<Translation["companion"]> = {
     select: {
         title: "选择你的伙伴",
         any: "没有伙伴",
diff --git a/front/src/i18n/zh-CN/emoji.ts b/front/src/i18n/zh-CN/emoji.ts
index b0f18410..43c69a81 100644
--- a/front/src/i18n/zh-CN/emoji.ts
+++ b/front/src/i18n/zh-CN/emoji.ts
@@ -1,6 +1,6 @@
-import type { BaseTranslation } from "../i18n-types";
+import type { Translation } from "../i18n-types";
 
-const emoji: BaseTranslation = {
+const emoji: NonNullable<Translation["emoji"]> = {
     search: "搜索 emojis...",
     categories: {
         recents: "最近的 Emojis",
diff --git a/front/src/i18n/zh-CN/error.ts b/front/src/i18n/zh-CN/error.ts
index a76654f3..d5dc2453 100644
--- a/front/src/i18n/zh-CN/error.ts
+++ b/front/src/i18n/zh-CN/error.ts
@@ -1,6 +1,6 @@
-import type { BaseTranslation } from "../i18n-types";
+import type { Translation } from "../i18n-types";
 
-const error: BaseTranslation = {
+const error: NonNullable<Translation["error"]> = {
     accessLink: {
         title: "访问链接错误",
         subTitle: "找不到地图。请检查你的访问链接。",
diff --git a/front/src/i18n/zh-CN/follow.ts b/front/src/i18n/zh-CN/follow.ts
index 52754d00..f82f9934 100644
--- a/front/src/i18n/zh-CN/follow.ts
+++ b/front/src/i18n/zh-CN/follow.ts
@@ -1,6 +1,6 @@
-import type { BaseTranslation } from "../i18n-types";
+import type { Translation } from "../i18n-types";
 
-const follow: BaseTranslation = {
+const follow: NonNullable<Translation["follow"]> = {
     interactStatus: {
         following: "跟随 {leader}",
         waitingFollowers: "等待跟随者确认",
diff --git a/front/src/i18n/zh-CN/index.ts b/front/src/i18n/zh-CN/index.ts
index f77c5789..23e2a24c 100644
--- a/front/src/i18n/zh-CN/index.ts
+++ b/front/src/i18n/zh-CN/index.ts
@@ -1,4 +1,5 @@
-import type { BaseTranslation } from "../i18n-types";
+import en_US from "../en-US";
+import type { Translation } from "../i18n-types";
 import audio from "./audio";
 import camera from "./camera";
 import chat from "./chat";
@@ -13,7 +14,8 @@ import warning from "./warning";
 import emoji from "./emoji";
 import trigger from "./trigger";
 
-const zh_CN: BaseTranslation = {
+const zh_CN: Translation = {
+    ...(en_US as Translation),
     language: "中文",
     country: "中国",
     audio,
diff --git a/front/src/i18n/zh-CN/login.ts b/front/src/i18n/zh-CN/login.ts
index cf788e2e..e5f5f99e 100644
--- a/front/src/i18n/zh-CN/login.ts
+++ b/front/src/i18n/zh-CN/login.ts
@@ -1,6 +1,6 @@
-import type { BaseTranslation } from "../i18n-types";
+import type { Translation } from "../i18n-types";
 
-const login: BaseTranslation = {
+const login: NonNullable<Translation["login"]> = {
     input: {
         name: {
             placeholder: "输入你的名字",
diff --git a/front/src/i18n/zh-CN/menu.ts b/front/src/i18n/zh-CN/menu.ts
index e375c73c..be1d63d5 100644
--- a/front/src/i18n/zh-CN/menu.ts
+++ b/front/src/i18n/zh-CN/menu.ts
@@ -1,6 +1,6 @@
-import type { BaseTranslation } from "../i18n-types";
+import type { Translation } from "../i18n-types";
 
-const menu: BaseTranslation = {
+const menu: NonNullable<Translation["menu"]> = {
     title: "菜单",
     icon: {
         open: {
diff --git a/front/src/i18n/zh-CN/report.ts b/front/src/i18n/zh-CN/report.ts
index 268a2236..85ebc4cd 100644
--- a/front/src/i18n/zh-CN/report.ts
+++ b/front/src/i18n/zh-CN/report.ts
@@ -1,6 +1,6 @@
-import type { BaseTranslation } from "../i18n-types";
+import type { Translation } from "../i18n-types";
 
-const report: BaseTranslation = {
+const report: NonNullable<Translation["report"]> = {
     block: {
         title: "屏蔽",
         content: "屏蔽任何来自 {userName} 的通信。该操作是可逆的。",
diff --git a/front/src/i18n/zh-CN/trigger.ts b/front/src/i18n/zh-CN/trigger.ts
index d6b0e8d7..2be48e6a 100644
--- a/front/src/i18n/zh-CN/trigger.ts
+++ b/front/src/i18n/zh-CN/trigger.ts
@@ -1,6 +1,6 @@
-import type { BaseTranslation } from "../i18n-types";
+import type { Translation } from "../i18n-types";
 
-const trigger: BaseTranslation = {
+const trigger: NonNullable<Translation["trigger"]> = {
     cowebsite: "按空格键或点击这里打开网页",
     jitsiRoom: "按空格键或点击这里进入Jitsi Meet会议",
     newTab: "按空格键或点击这里在新标签打开网页",
diff --git a/front/src/i18n/zh-CN/warning.ts b/front/src/i18n/zh-CN/warning.ts
index 679a7b90..628fa671 100644
--- a/front/src/i18n/zh-CN/warning.ts
+++ b/front/src/i18n/zh-CN/warning.ts
@@ -1,9 +1,9 @@
-import type { BaseTranslation } from "../i18n-types";
+import type { Translation } from "../i18n-types";
 import { ADMIN_URL } from "../../Enum/EnvironmentVariable";
 
 const upgradeLink = ADMIN_URL + "/pricing";
 
-const warning: BaseTranslation = {
+const warning: NonNullable<Translation["warning"]> = {
     title: "警告!",
     content: `该世界已接近容量限制！你可以 <a href="${upgradeLink}" target="_blank">点击这里</a> 升级它的容量`,
     limit: "该世界已接近容量限制!",
diff --git a/front/src/i18n/zh-CN/woka.ts b/front/src/i18n/zh-CN/woka.ts
index 2b30e676..cbdfd34c 100644
--- a/front/src/i18n/zh-CN/woka.ts
+++ b/front/src/i18n/zh-CN/woka.ts
@@ -1,6 +1,6 @@
-import type { BaseTranslation } from "../i18n-types";
+import type { Translation } from "../i18n-types";
 
-const woka: BaseTranslation = {
+const woka: NonNullable<Translation["woka"]> = {
     customWoka: {
         title: "自定义你的WOKA",
         navigation: {