From d7c13794d5ad0aa3c14b5a67c3a7da3cf76c4849 Mon Sep 17 00:00:00 2001
From: Dessalines <tyhou13@gmx.com>
Date: Tue, 22 Sep 2020 10:23:22 -0500
Subject: [PATCH] Revert "Splitting out chinese region translations."

This reverts commit 33d54d31a0dcc32ccb880cec72f8d173bc101e8c.
---
 lemmy-translations    | 2 +-
 src/shared/i18next.ts | 8 ++------
 src/shared/utils.ts   | 4 +---
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/lemmy-translations b/lemmy-translations
index d1f0e61..fcb7155 160000
--- a/lemmy-translations
+++ b/lemmy-translations
@@ -1 +1 @@
-Subproject commit d1f0e61b0269d5c30c61eccab05353070e1d3fd9
+Subproject commit fcb7155d1214e387744c22f844c20b29077b0ff3
diff --git a/src/shared/i18next.ts b/src/shared/i18next.ts
index 263a0fa..3657da3 100644
--- a/src/shared/i18next.ts
+++ b/src/shared/i18next.ts
@@ -9,9 +9,7 @@ import { de } from './translations/de';
 import { fr } from './translations/fr';
 import { sv } from './translations/sv';
 import { ru } from './translations/ru';
-import { zh_CN } from './translations/zh_CN';
-import { zh_TW } from './translations/zh_TW';
-import { zh_HK } from './translations/zh_HK';
+import { zh } from './translations/zh';
 import { nl } from './translations/nl';
 import { it } from './translations/it';
 import { fi } from './translations/fi';
@@ -41,9 +39,7 @@ const resources = {
   ka,
   hi,
   de,
-  zh_CN,
-  zh_TW,
-  zh_HK,
+  zh,
   fr,
   sv,
   ru,
diff --git a/src/shared/utils.ts b/src/shared/utils.ts
index 3fda5bb..0e9f3a1 100644
--- a/src/shared/utils.ts
+++ b/src/shared/utils.ts
@@ -104,9 +104,7 @@ export const languages = [
   { code: 'ja', name: '日本語' },
   { code: 'pl', name: 'Polski' },
   { code: 'pt_BR', name: 'Português Brasileiro' },
-  { code: 'zh_CN', name: '中文' },
-  { code: 'zh_TW', name: '臺灣華語' },
-  { code: 'zh_HK', name: '廣東話' },
+  { code: 'zh', name: '中文' },
   { code: 'fi', name: 'Suomi' },
   { code: 'fr', name: 'Français' },
   { code: 'sv', name: 'Svenska' },
-- 
2.44.1