From 8cdda54d5aef0642ea1499758c736133c2affa85 Mon Sep 17 00:00:00 2001 From: YuSanka Date: Fri, 8 Sep 2023 11:49:03 +0200 Subject: [PATCH] Fix for #11254 - Link from brim to a non-existent page on the Prusa Help. * For unsupported languages help link is redirected to the EN page. + "uk", "zh" and "ru" languages are removed from current_language_code_safe(). Because those languages aren't supported by Prusa Help. --- src/slic3r/GUI/GUI_App.cpp | 6 +++--- src/slic3r/GUI/OptionsGroup.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index b1102af267..c50bd80853 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -3015,9 +3015,9 @@ wxString GUI_App::current_language_code_safe() const { "ja", "ja_JP", }, { "ko", "ko_KR", }, { "pl", "pl_PL", }, - { "uk", "uk_UA", }, - { "zh", "zh_CN", }, - { "ru", "ru_RU", }, + //{ "uk", "uk_UA", }, + //{ "zh", "zh_CN", }, + //{ "ru", "ru_RU", }, }; wxString language_code = this->current_language_code().BeforeFirst('_'); auto it = mapping.find(language_code); diff --git a/src/slic3r/GUI/OptionsGroup.cpp b/src/slic3r/GUI/OptionsGroup.cpp index 818464bee4..8e80dfcd8b 100644 --- a/src/slic3r/GUI/OptionsGroup.cpp +++ b/src/slic3r/GUI/OptionsGroup.cpp @@ -1024,7 +1024,7 @@ wxString OptionsGroup::get_url(const std::string& path_end) if (path_end.empty()) return wxEmptyString; - wxString language = get_app_config()->get("translation_language"); + wxString language = wxGetApp().current_language_code_safe(); wxString lang_marker = language.IsEmpty() ? "en" : language.BeforeFirst('_'); return wxString("https://help.prusa3d.com/") + lang_marker + wxString("/article/" + path_end);