3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-11 08:47:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Application will pick translation dictionaries based on the system default language

Browse source 
on first start of Slic3r.
Updated help menu (removed reference to the upstream manual)
Fixed some OpenGL assert due to glOrtho being called with zero Z span.
This commit is contained in:
bubnikv 2019-05-10 14:43:35 +02:00
parent 1d788f9ce9
commit ed8430bc9b
6 changed files with 47 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

52
src/slic3r/GUI/GUI_App.cpp
View file

@ -579,33 +579,47 @@ bool GUI_App::select_language()
return false;
}
// load language saved at application config
// Load gettext translation files and activate them at the start of the application,
// based on the "translation_language" key stored in the application config.
bool GUI_App::load_language()
{
wxString language = wxEmptyString;
if (app_config->has("translation_language"))
language = app_config->get("translation_language");
if (language.IsEmpty())
return false;
const auto langs = get_installed_languages();
for (const wxLanguageInfo *info : langs)
{
if (info->CanonicalName == language)
{
m_wxLocale = new wxLocale;
m_wxLocale->Init(info->Language);
m_wxLocale->AddCatalogLookupPathPrefix(from_u8(localization_dir()));
m_wxLocale->AddCatalog("Slic3rPE");
//FIXME This is a temporary workaround, the correct solution is to switch to "C" locale during file import / export only.
wxSetlocale(LC_NUMERIC, "C");
Preset::update_suffix_modified();
m_imgui->set_language(into_u8(info->CanonicalName));
return true;
if (language.IsEmpty()) {
int lang = wxLocale::GetSystemLanguage();
if (lang != wxLANGUAGE_UNKNOWN) {
const wxLanguageInfo *info = wxLocale::GetLanguageInfo(lang);
if (info != nullptr)
language = info->CanonicalName;
}
}
return false;
const wxLanguageInfo *info = nullptr;
if (! language.IsEmpty()) {
const auto langs = get_installed_languages();
for (const wxLanguageInfo *this_info : langs)
if (this_info->CanonicalName == language) {
info = this_info;
break;
}
}
m_wxLocale = new wxLocale;
if (info == nullptr) {
m_wxLocale->Init(wxLANGUAGE_DEFAULT);
m_imgui->set_language("en");
} else {
m_wxLocale->Init(info->Language);
m_wxLocale->AddCatalogLookupPathPrefix(from_u8(localization_dir()));
m_wxLocale->AddCatalog("Slic3rPE");
m_imgui->set_language(into_u8(info->CanonicalName));
}
//FIXME This is a temporary workaround, the correct solution is to switch to "C" locale during file import / export only.
wxSetlocale(LC_NUMERIC, "C");
Preset::update_suffix_modified();
return true;
}
// save language at application config