Amebis/Updater
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Locale is set using wxExtend's wxInitializeLocale() helper function now

Browse Source
This commit is contained in:
Simon Rozman 2016-10-05 12:29:40 +02:00
parent 4baae59fd5
commit 3cab0a45a9
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
UpdCheck/main.cpp
View File

@ -32,6 +32,18 @@ int CALLBACK WinMain(_In_ HINSTANCE hInstance, _In_ HINSTANCE hPrevInstance, _In
if (!initializer.IsOk()) if (!initializer.IsOk())
return -1; return -1;
// Initialize configuration.
wxConfigBase *cfgPrev = wxConfigBase::Set(new wxConfig(wxT(UPDATER_CFG_APPLICATION) wxT("\\Updater"), wxT(UPDATER_CFG_VENDOR)));
if (cfgPrev) wxDELETE(cfgPrev);
// Initialize locale.
wxLocale locale;
if (wxInitializeLocale(locale)) {
// Do not add translation catalog, to keep log messages in English.
// Log files are for help-desk and should remain globally intelligible.
//wxVERIFY(locale.AddCatalog(wxT("Updater") wxT(wxExtendVersion)));
}
// Create output folder. // Create output folder.
wxString path(wxFileName::GetTempDir()); wxString path(wxFileName::GetTempDir());
if (!wxEndsWithPathSeparator(path)) if (!wxEndsWithPathSeparator(path))
@ -44,17 +56,6 @@ int CALLBACK WinMain(_In_ HINSTANCE hInstance, _In_ HINSTANCE hPrevInstance, _In
if (log_file.IsOpened()) if (log_file.IsOpened())
delete wxLog::SetActiveTarget(new wxLogStderr(log_file.fp())); delete wxLog::SetActiveTarget(new wxLogStderr(log_file.fp()));
// Set desired locale.
wxConfig config(wxT(UPDATER_CFG_APPLICATION) wxT("\\Updater"), wxT(UPDATER_CFG_VENDOR));
wxLanguage language = (wxLanguage)config.Read(wxT("Language"), wxLANGUAGE_DEFAULT);
wxLocale locale;
if (wxLocale::IsAvailable(language)) {
wxVERIFY(locale.Init(language));
// Do not add translation catalog, to keep log messages in English.
// Log files are for help-desk and should remain globally intelligible.
//wxVERIFY(locale.AddCatalog(wxT("Updater") wxT(wxExtendVersion)));
}
wxUpdCheckThread worker(locale.GetCanonicalName()); wxUpdCheckThread worker(locale.GetCanonicalName());
wxUpdCheckThread::wxResult res = worker.CheckForUpdate(); wxUpdCheckThread::wxResult res = worker.CheckForUpdate();
switch (res) { switch (res) {