From 341ca93be56efbfc9a2ccde003fad8f333e32add Mon Sep 17 00:00:00 2001 From: "Lu Fan(SonnyCalcr)" <1730976608@qq.com> Date: Mon, 12 Oct 2026 16:47:31 +0800 Subject: [PATCH] =?UTF-8?q?fix(server):=20=E5=8D=87=E7=BA=A7=E4=B8=8D?= =?UTF-8?q?=E5=86=8D=E5=85=B3=E6=8E=89=E8=80=81=E7=94=A8=E6=88=B7=E7=9A=84?= =?UTF-8?q?=E5=80=99=E9=80=89=E8=AF=8D=E7=BF=BB=E8=AF=91=20(#884)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/src/config/ime_config_template.cpp | 1 + server/tests/src/test_config_template_merge.cpp | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/server/src/config/ime_config_template.cpp b/server/src/config/ime_config_template.cpp index af0a869f..12f3e8e0 100644 --- a/server/src/config/ime_config_template.cpp +++ b/server/src/config/ime_config_template.cpp @@ -68,6 +68,7 @@ bool KeepsPreviousDefaultOnUpgrade(const std::string &assignment_id) { static const std::set kIds = { MakeTomlAssignmentId("general", "emoji_mixed_input"), + MakeTomlAssignmentId("general", "candidate_translations"), MakeTomlAssignmentId("input", "default_ime_mode"), MakeTomlAssignmentId("appearance", "candidate_window_layout"), MakeTomlAssignmentId("appearance", "candidate_skin"), diff --git a/server/tests/src/test_config_template_merge.cpp b/server/tests/src/test_config_template_merge.cpp index e3e0d425..b80d7b8c 100644 --- a/server/tests/src/test_config_template_merge.cpp +++ b/server/tests/src/test_config_template_merge.cpp @@ -183,7 +183,7 @@ TEST_CASE(shipped_fresh_install_defaults_do_not_flip_upgraded_users) std::ifstream input(MSIME_DEFAULT_CONFIG_PATH, std::ios::binary); REQUIRE(static_cast(input)); const std::string installed((std::istreambuf_iterator(input)), {}); - const std::string previous_defaults = "[general]\nemoji_mixed_input = true\n" + const std::string previous_defaults = "[general]\nemoji_mixed_input = true\ncandidate_translations = true\n" "[input]\ndefault_ime_mode = \"english\"\n" "[appearance]\ncandidate_window_layout = \"vertical\"\n" "candidate_skin = \"willow_green\"\n" @@ -196,6 +196,7 @@ TEST_CASE(shipped_fresh_install_defaults_do_not_flip_upgraded_users) const auto upgraded = toml::parse(MergeConfigIntoTemplate(installed, previous_defaults, previous_defaults)); REQUIRE(upgraded["general"]["emoji_mixed_input"].value_or(false)); + REQUIRE(upgraded["general"]["candidate_translations"].value_or(false)); REQUIRE_EQ(upgraded["input"]["default_ime_mode"].value_or(std::string()), std::string("english")); REQUIRE_EQ(upgraded["appearance"]["candidate_window_layout"].value_or(std::string()), std::string("vertical")); REQUIRE_EQ(upgraded["appearance"]["candidate_skin"].value_or(std::string()), std::string("willow_green"));