From 9cf78cc9fe9e87a3d7b0e5159061584ad1e56339 Mon Sep 17 00:00:00 2001 From: Jabba <71508279+JabbaDesilijicTiure@users.noreply.github.com> Date: Fri, 18 Sep 2020 12:49:48 +0000 Subject: [PATCH 01/17] Rename zh.json to zh-hans.json --- src/Translate/languages/{zh.json => zh-hans.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/Translate/languages/{zh.json => zh-hans.json} (100%) diff --git a/src/Translate/languages/zh.json b/src/Translate/languages/zh-hans.json similarity index 100% rename from src/Translate/languages/zh.json rename to src/Translate/languages/zh-hans.json From 619d0f72608f4867b10c5d911d35ee575c7e38d4 Mon Sep 17 00:00:00 2001 From: Jabba <71508279+JabbaDesilijicTiure@users.noreply.github.com> Date: Fri, 18 Sep 2020 12:50:15 +0000 Subject: [PATCH 02/17] Rename zh-tw.json to zh-hant.json --- src/Translate/languages/{zh-tw.json => zh-hant.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/Translate/languages/{zh-tw.json => zh-hant.json} (100%) diff --git a/src/Translate/languages/zh-tw.json b/src/Translate/languages/zh-hant.json similarity index 100% rename from src/Translate/languages/zh-tw.json rename to src/Translate/languages/zh-hant.json From ce561c6288c31d82064b67c294f9446278cbb356 Mon Sep 17 00:00:00 2001 From: Jabba <71508279+JabbaDesilijicTiure@users.noreply.github.com> Date: Fri, 18 Sep 2020 12:51:03 +0000 Subject: [PATCH 03/17] Rename jp.json to ja.json --- src/Translate/languages/{jp.json => ja.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/Translate/languages/{jp.json => ja.json} (100%) diff --git a/src/Translate/languages/jp.json b/src/Translate/languages/ja.json similarity index 100% rename from src/Translate/languages/jp.json rename to src/Translate/languages/ja.json From f1830a910327c1fa6a79238e18047e73dc493a71 Mon Sep 17 00:00:00 2001 From: Jabba <71508279+JabbaDesilijicTiure@users.noreply.github.com> Date: Fri, 18 Sep 2020 12:55:51 +0000 Subject: [PATCH 04/17] Rename zh.json to zh-hans.json --- plugins/OptionalManager/languages/{zh.json => zh-hans.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename plugins/OptionalManager/languages/{zh.json => zh-hans.json} (100%) diff --git a/plugins/OptionalManager/languages/zh.json b/plugins/OptionalManager/languages/zh-hans.json similarity index 100% rename from plugins/OptionalManager/languages/zh.json rename to plugins/OptionalManager/languages/zh-hans.json From 2409ee08f424ea3f2ef1e5da742492593227ba1e Mon Sep 17 00:00:00 2001 From: Jabba <71508279+JabbaDesilijicTiure@users.noreply.github.com> Date: Fri, 18 Sep 2020 12:56:14 +0000 Subject: [PATCH 05/17] Rename zh-tw.json to zh-hant.json --- plugins/OptionalManager/languages/{zh-tw.json => zh-hant.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename plugins/OptionalManager/languages/{zh-tw.json => zh-hant.json} (100%) diff --git a/plugins/OptionalManager/languages/zh-tw.json b/plugins/OptionalManager/languages/zh-hant.json similarity index 100% rename from plugins/OptionalManager/languages/zh-tw.json rename to plugins/OptionalManager/languages/zh-hant.json From a214e9c67931d6d2a8b55b5b4b427b127b5978f4 Mon Sep 17 00:00:00 2001 From: Jabba <71508279+JabbaDesilijicTiure@users.noreply.github.com> Date: Fri, 18 Sep 2020 12:57:36 +0000 Subject: [PATCH 06/17] Rename zh.json to zh-hans.json --- plugins/ContentFilter/languages/{zh.json => zh-hans.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename plugins/ContentFilter/languages/{zh.json => zh-hans.json} (100%) diff --git a/plugins/ContentFilter/languages/zh.json b/plugins/ContentFilter/languages/zh-hans.json similarity index 100% rename from plugins/ContentFilter/languages/zh.json rename to plugins/ContentFilter/languages/zh-hans.json From 1620c9220adee70177c047056c3ab317936678a1 Mon Sep 17 00:00:00 2001 From: Jabba <71508279+JabbaDesilijicTiure@users.noreply.github.com> Date: Fri, 18 Sep 2020 12:57:57 +0000 Subject: [PATCH 07/17] Rename zh-tw.json to zh-hant.json --- plugins/ContentFilter/languages/{zh-tw.json => zh-hant.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename plugins/ContentFilter/languages/{zh-tw.json => zh-hant.json} (100%) diff --git a/plugins/ContentFilter/languages/zh-tw.json b/plugins/ContentFilter/languages/zh-hant.json similarity index 100% rename from plugins/ContentFilter/languages/zh-tw.json rename to plugins/ContentFilter/languages/zh-hant.json From d2796eb6403f5703e2c9ce7d3f3f81ae74342c7f Mon Sep 17 00:00:00 2001 From: Jabba <71508279+JabbaDesilijicTiure@users.noreply.github.com> Date: Fri, 18 Sep 2020 12:58:52 +0000 Subject: [PATCH 08/17] Rename zh.json to zh-hans.json --- plugins/MergerSite/languages/{zh.json => zh-hans.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename plugins/MergerSite/languages/{zh.json => zh-hans.json} (100%) diff --git a/plugins/MergerSite/languages/zh.json b/plugins/MergerSite/languages/zh-hans.json similarity index 100% rename from plugins/MergerSite/languages/zh.json rename to plugins/MergerSite/languages/zh-hans.json From 786a712616e7816d4577cd846d7461d807cf3c58 Mon Sep 17 00:00:00 2001 From: Jabba <71508279+JabbaDesilijicTiure@users.noreply.github.com> Date: Fri, 18 Sep 2020 12:59:28 +0000 Subject: [PATCH 09/17] Rename zh-tw.json to zh-hant.json --- plugins/MergerSite/languages/{zh-tw.json => zh-hant.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename plugins/MergerSite/languages/{zh-tw.json => zh-hant.json} (100%) diff --git a/plugins/MergerSite/languages/zh-tw.json b/plugins/MergerSite/languages/zh-hant.json similarity index 100% rename from plugins/MergerSite/languages/zh-tw.json rename to plugins/MergerSite/languages/zh-hant.json From 3d387a35b05d6af8a5ab9099161fa12b8cf3a332 Mon Sep 17 00:00:00 2001 From: Jabba <71508279+JabbaDesilijicTiure@users.noreply.github.com> Date: Fri, 18 Sep 2020 13:00:47 +0000 Subject: [PATCH 10/17] Rename zh.json to zh-hans.json --- plugins/Trayicon/languages/{zh.json => zh-hans.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename plugins/Trayicon/languages/{zh.json => zh-hans.json} (100%) diff --git a/plugins/Trayicon/languages/zh.json b/plugins/Trayicon/languages/zh-hans.json similarity index 100% rename from plugins/Trayicon/languages/zh.json rename to plugins/Trayicon/languages/zh-hans.json From 84183f099b8083a6596305cd3c48626f584aee11 Mon Sep 17 00:00:00 2001 From: Jabba <71508279+JabbaDesilijicTiure@users.noreply.github.com> Date: Fri, 18 Sep 2020 13:01:06 +0000 Subject: [PATCH 11/17] Rename zh-tw.json to zh-hant.json --- plugins/Trayicon/languages/{zh-tw.json => zh-hant.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename plugins/Trayicon/languages/{zh-tw.json => zh-hant.json} (100%) diff --git a/plugins/Trayicon/languages/zh-tw.json b/plugins/Trayicon/languages/zh-hant.json similarity index 100% rename from plugins/Trayicon/languages/zh-tw.json rename to plugins/Trayicon/languages/zh-hant.json From ae847b8bc9a95d7857f6309f30fa57aae8622b2d Mon Sep 17 00:00:00 2001 From: Jabba <71508279+JabbaDesilijicTiure@users.noreply.github.com> Date: Fri, 18 Sep 2020 13:03:14 +0000 Subject: [PATCH 12/17] Rename jp.json to ja.json --- plugins/Sidebar/languages/{jp.json => ja.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename plugins/Sidebar/languages/{jp.json => ja.json} (100%) diff --git a/plugins/Sidebar/languages/jp.json b/plugins/Sidebar/languages/ja.json similarity index 100% rename from plugins/Sidebar/languages/jp.json rename to plugins/Sidebar/languages/ja.json From 93927507688d03ee5eb35f08127a588e3dff0a2e Mon Sep 17 00:00:00 2001 From: Jabba <71508279+JabbaDesilijicTiure@users.noreply.github.com> Date: Fri, 18 Sep 2020 13:03:38 +0000 Subject: [PATCH 13/17] Rename zh.json to zh-hans.json --- plugins/Sidebar/languages/{zh.json => zh-hans.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename plugins/Sidebar/languages/{zh.json => zh-hans.json} (100%) diff --git a/plugins/Sidebar/languages/zh.json b/plugins/Sidebar/languages/zh-hans.json similarity index 100% rename from plugins/Sidebar/languages/zh.json rename to plugins/Sidebar/languages/zh-hans.json From 05ea0aaec88f59c635087b0889c3966f3a518dd7 Mon Sep 17 00:00:00 2001 From: Jabba <71508279+JabbaDesilijicTiure@users.noreply.github.com> Date: Fri, 18 Sep 2020 13:03:57 +0000 Subject: [PATCH 14/17] Rename zh-tw.json to zh-hant.json --- plugins/Sidebar/languages/{zh-tw.json => zh-hant.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename plugins/Sidebar/languages/{zh-tw.json => zh-hant.json} (100%) diff --git a/plugins/Sidebar/languages/zh-tw.json b/plugins/Sidebar/languages/zh-hant.json similarity index 100% rename from plugins/Sidebar/languages/zh-tw.json rename to plugins/Sidebar/languages/zh-hant.json From 1dbb20f2893174f8b7e04ed9d6ed9b26b929a42b Mon Sep 17 00:00:00 2001 From: Jabba <71508279+JabbaDesilijicTiure@users.noreply.github.com> Date: Fri, 18 Sep 2020 13:06:48 +0000 Subject: [PATCH 15/17] Rename zh.json to zh-hans.json --- plugins/UiConfig/languages/{zh.json => zh-hans.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename plugins/UiConfig/languages/{zh.json => zh-hans.json} (100%) diff --git a/plugins/UiConfig/languages/zh.json b/plugins/UiConfig/languages/zh-hans.json similarity index 100% rename from plugins/UiConfig/languages/zh.json rename to plugins/UiConfig/languages/zh-hans.json From 40dddf1ea437d8bc365c5fb49a3bebf8523c117b Mon Sep 17 00:00:00 2001 From: Jabba <71508279+JabbaDesilijicTiure@users.noreply.github.com> Date: Fri, 18 Sep 2020 13:08:29 +0000 Subject: [PATCH 16/17] Rename README-zh-cn.md to README-zh-hans.md --- README-zh-cn.md => README-zh-hans.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename README-zh-cn.md => README-zh-hans.md (100%) diff --git a/README-zh-cn.md b/README-zh-hans.md similarity index 100% rename from README-zh-cn.md rename to README-zh-hans.md From 1b1539e6ac62652e6661b63039e0525cdb95bb7d Mon Sep 17 00:00:00 2001 From: Jabba <71508279+JabbaDesilijicTiure@users.noreply.github.com> Date: Fri, 18 Sep 2020 13:11:45 +0000 Subject: [PATCH 17/17] Update Config.py --- src/Config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Config.py b/src/Config.py index 87c11553..6fd895e7 100644 --- a/src/Config.py +++ b/src/Config.py @@ -98,7 +98,7 @@ class Config(object): try: language, enc = locale.getdefaultlocale() language = language.lower().replace("_", "-") - if language not in ["pt-br", "zh-tw"]: + if language not in ["zh-hant", "zh-hans", "pt-br"]: language = language.split("-")[0] except Exception: language = "en"