IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Restore the global locale after Guile munges it.

Browse Source 
There's no way to change the environment locale on Windows so calling
setlocale(LC_ALL, ""), as guile does in its init routine, reads the
user's Language and Region settings instead of the environment
variables. We save the discovered environment locale and call setlocale
with it again after Guile has initialized.
This commit is contained in:
John Ralls 2019-02-10 14:31:23 -08:00
parent 7d7da8e2c4
commit 8f88b7f2b0
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gnucash/gnucash-bin.c
View File

@ -92,6 +92,7 @@ static const char *add_quotes_file = NULL;
static char *namespace_regexp = NULL;
static const char *file_to_load = NULL;
static gchar **args_remaining = NULL;
static gchar *sys_locale = NULL;
static GOptionEntry options[] =
{
@ -619,7 +620,23 @@ inner_main (void *closure, int argc, char **argv)
main_mod = scm_c_resolve_module("gnucash utilities");
scm_set_current_module(main_mod);
#ifdef __MINGW32__
/* Guile initialization calls setlocale(LC_ALL, "") which on
* windows resets the locale to what the user has set in the
* registry. Put it back to what we set from the environment or
* environment file.
*/
if (sys_locale)
{
setlocale (LC_ALL, sys_locale);
g_free (sys_locale);
sys_locale = NULL;
}
else
{
setlocale (LC_ALL, "C");
}
#endif
/* Check whether the settings need a version update */
gnc_gsettings_version_upgrade ();
@ -757,7 +774,6 @@ gnc_log_init()
int
main(int argc, char ** argv)
{
gchar *sys_locale = NULL;
#if !defined(G_THREADS_ENABLED) || defined(G_THREADS_IMPL_NONE)
# error "No GLib thread implementation available!"
#endif
@ -820,7 +836,11 @@ main(int argc, char ** argv)
* to avoid unintentionally messing up the locale settings */
PINFO ("System locale returned %s", sys_locale ? sys_locale : "(null)");
PINFO ("Effective locale set to %s.", setlocale (LC_ALL, ""));
#ifndef __MINGW32__
/* We need it for later on Windows, see inner_main(). */
g_free (sys_locale);
sys_locale = NULL;
#endif
#endif
/* If asked via a command line parameter, fetch quotes only */