From 893d898d0aa77ef02e0228ff1654ccd03694b450 Mon Sep 17 00:00:00 2001 From: Lim Chunwei Date: Mon, 25 Oct 2021 19:10:47 +0800 Subject: [PATCH 1/3] Simplified Chinese and Traditional Chinese translations (#68) --- SpaceCadetPinball/SpaceCadetPinball.rc | Bin 82058 -> 159712 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/SpaceCadetPinball/SpaceCadetPinball.rc b/SpaceCadetPinball/SpaceCadetPinball.rc index d1661ebcfb5eaaf86f0d66f9ee28f56fb2a44a11..3104c071bad3cf903afccd9d825fce6b76c29847 100644 GIT binary patch delta 13520 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 delta 17 YcmaEGpR=oxwP6cmnBDd@xlATZ07iNSssI20 From cf215aaa6a2e7ec618a3d29ff071e18effb956fe Mon Sep 17 00:00:00 2001 From: Muzychenko Andrey <33288308+k4zmu2a@users.noreply.github.com> Date: Mon, 25 Oct 2021 17:30:39 +0300 Subject: [PATCH 2/3] =?UTF-8?q?Added=20Traditional=20Chinese=20and=20Simpl?= =?UTF-8?q?ified=20Chinese=20languages=20to=20options.=20They=20don?= =?UTF-8?q?=E2=80=99t=20work=20without=20Chinese=20locale.=20Ref=20#68.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SpaceCadetPinball/gdrv.cpp | 6 ++++++ SpaceCadetPinball/options.cpp | 2 ++ SpaceCadetPinball/options.h | 2 ++ SpaceCadetPinball/resource.h | 2 +- 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/SpaceCadetPinball/gdrv.cpp b/SpaceCadetPinball/gdrv.cpp index 1cd1ba2..78ac18f 100644 --- a/SpaceCadetPinball/gdrv.cpp +++ b/SpaceCadetPinball/gdrv.cpp @@ -457,6 +457,12 @@ void gdrv::grtext_draw_ttext_in_box(LPCSTR text, int xOff, int yOff, int width, case Languages::Russian: charset = RUSSIAN_CHARSET; break; + case Languages::TraditionalChinese: + charset = CHINESEBIG5_CHARSET; + break; + case Languages::SimplifiedChinese: + charset = GB2312_CHARSET; + break; } // Default font does not scale well diff --git a/SpaceCadetPinball/options.cpp b/SpaceCadetPinball/options.cpp index 6122f79..180e22f 100644 --- a/SpaceCadetPinball/options.cpp +++ b/SpaceCadetPinball/options.cpp @@ -72,6 +72,8 @@ LanguageMenuEntry options::LanguageMenu[] { {L"English", Languages::English}, {L"Русский", Languages::Russian}, + {L"正體字", Languages::SimplifiedChinese}, + {L"简化字", Languages::TraditionalChinese}, }; void options::ReadOptions() diff --git a/SpaceCadetPinball/options.h b/SpaceCadetPinball/options.h index 37e78f4..5ff3305 100644 --- a/SpaceCadetPinball/options.h +++ b/SpaceCadetPinball/options.h @@ -6,6 +6,8 @@ enum class Languages { English = MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), Russian = MAKELANGID(LANG_RUSSIAN, SUBLANG_DEFAULT), + TraditionalChinese = MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL), + SimplifiedChinese = MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED), }; struct LanguageMenuEntry diff --git a/SpaceCadetPinball/resource.h b/SpaceCadetPinball/resource.h index 73894c2..4a170bc 100644 --- a/SpaceCadetPinball/resource.h +++ b/SpaceCadetPinball/resource.h @@ -242,7 +242,7 @@ #define DLG_HIGHSCORES_EditName5 605 #define Menu1_AlternativeRender 601 #define Menu1_Language 700 -#define Menu1_LanguageMax 702 +#define Menu1_LanguageMax 704 // Next default values for new objects // From 09c62f5909ce11b74a0a4f2c146e0a5b43e25dc5 Mon Sep 17 00:00:00 2001 From: Muzychenko Andrey <33288308+k4zmu2a@users.noreply.github.com> Date: Mon, 25 Oct 2021 17:40:38 +0300 Subject: [PATCH 3/3] Fixed mixed up Chinese language texts. --- SpaceCadetPinball/options.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SpaceCadetPinball/options.cpp b/SpaceCadetPinball/options.cpp index 180e22f..46bde34 100644 --- a/SpaceCadetPinball/options.cpp +++ b/SpaceCadetPinball/options.cpp @@ -72,8 +72,8 @@ LanguageMenuEntry options::LanguageMenu[] { {L"English", Languages::English}, {L"Русский", Languages::Russian}, - {L"正體字", Languages::SimplifiedChinese}, - {L"简化字", Languages::TraditionalChinese}, + {L"简化字", Languages::SimplifiedChinese}, + {L"正體字", Languages::TraditionalChinese}, }; void options::ReadOptions()