Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Mgr: compare best translations for selected languages #5329

Closed
wants to merge 2 commits into from
Closed

Mgr: compare best translations for selected languages #5329

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39c7594
Mgr: compare best translations for selected languages
Aug 13, 2023
eebeb83
Remove test code
Aug 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 25 additions & 16 deletions clientgui/BOINCGUIApp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,13 +188,11 @@ bool CBOINCGUIApp::OnInit() {
SetAppDisplayName(wxString(displayName)); // {ass the display name to wxWidgets
#endif


// Initialize the configuration storage module
m_pConfig = new wxConfig(GetAppName());
wxConfigBase::Set(m_pConfig);
wxASSERT(m_pConfig);


// Restore Application State
m_pConfig->SetPath(wxT("/"));
m_pConfig->Read(wxT("AutomaticallyShutdownClient"), &m_iShutdownCoreClient, 0L);
Expand All @@ -204,23 +202,34 @@ bool CBOINCGUIApp::OnInit() {
m_pConfig->Read(wxT("HideMenuBarIcon"), &m_iHideMenuBarIcon, 0L);
#endif
m_pConfig->Read(wxT("DisableAutoStart"), &m_iBOINCMGRDisableAutoStart, 0L);
m_pConfig->Read(wxT("LanguageISO"), &m_strISOLanguageCode, wxT(""));
m_pConfig->Read(wxT("LanguageISO"), &m_strISOLanguageCode, wxEmptyString);
m_bUseDefaultLocale = false;
bool bUseDefaultLocaleDefault = false;
#ifdef __WXMAC__ // wxLocale::GetLanguageInfo(wxLANGUAGE_DEFAULT) does not work on Mac
wxLocale *defaultLocale = new wxLocale;
defaultLocale->Init(wxLANGUAGE_DEFAULT);
wxString defaultLanguageCode = defaultLocale->GetCanonicalName();
bUseDefaultLocaleDefault = m_strISOLanguageCode == defaultLanguageCode;
delete defaultLocale;
#else
const wxLanguageInfo *defaultLanguageInfo = wxLocale::GetLanguageInfo(wxLANGUAGE_DEFAULT);
if (defaultLanguageInfo != NULL) {
// Migration: assume a selected language code that matches the system default means "auto select"
bUseDefaultLocaleDefault = m_strISOLanguageCode == defaultLanguageInfo->CanonicalName;;
if (m_strISOLanguageCode.IsEmpty()) {
// If user has not selected a language, use automatic detection
m_bUseDefaultLocale = true;
} else {
wxLocale *defaultLocale = new wxLocale;
defaultLocale->Init(wxLANGUAGE_DEFAULT);
defaultLocale->AddCatalogLookupPathPrefix(wxT("locale"));
defaultLocale->AddCatalog(wxT("BOINC-Manager"));
wxTranslations* pTranslations = wxTranslations::Get();
wxString defaultLanguageCode;
wxString selectedLanguageCode;
if (pTranslations) {
// Get best match from our available translations for automatic detection
defaultLanguageCode = pTranslations->GetBestTranslation(wxT("BOINC-Manager"), wxLANGUAGE_DEFAULT);
// Get best match from our available translations for the
// language the user selected from the Other Options dialog
selectedLanguageCode = pTranslations->GetBestTranslation(wxT("BOINC-Manager"), m_strISOLanguageCode);
}
bUseDefaultLocaleDefault = selectedLanguageCode == defaultLanguageCode;
delete defaultLocale;
// If upgrading from an older version of BOINC without the specific "Automatic Detection"
// as the first option in the language menu, use the value we just determined
m_pConfig->Read(wxT("UseDefaultLocale"), &m_bUseDefaultLocale, bUseDefaultLocaleDefault);
}
#endif
m_pConfig->Read(wxT("UseDefaultLocale"), &m_bUseDefaultLocale, bUseDefaultLocaleDefault);

m_pConfig->Read(wxT("GUISelection"), &m_iGUISelected, BOINC_SIMPLEGUI);
m_pConfig->Read(wxT("EventLogOpen"), &bOpenEventLog);
m_pConfig->Read(wxT("RunDaemon"), &m_bRunDaemon, 1L);
Expand Down