luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-26 12:12:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

gsettingsschema: fix l10n=time attribute

Browse Source 
It's supposed to be possible to translate settings values using LC_TIME
rather than LC_MESSAGES to determine which translation to use, but
Sebastian Keller noticed that it's not working properly. I've
implemented his proposed solution, which is to actually temporarily
change LC_MESSAGES to match LC_TIME for just as long as necessary to
force gettext to use the desired message catalog.

Fixes #2575
This commit is contained in:
Michael Catanzaro 2022-01-07 19:14:46 -06:00
parent dc4a191587
commit 34e4c4af77
1 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gio/gsettingsschema.c
View File

@ -32,6 +32,11 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#ifdef HAVE_XLOCALE_H
/* Needed on macOS and FreeBSD for uselocale() */
#include <xlocale.h>
#endif
/** /**
* SECTION:gsettingsschema * SECTION:gsettingsschema
* @short_description: Introspecting and controlling the loading * @short_description: Introspecting and controlling the loading
@ -1416,9 +1421,14 @@ g_settings_schema_key_range_fixup (GSettingsSchemaKey *key,
GVariant * GVariant *
g_settings_schema_key_get_translated_default (GSettingsSchemaKey *key) g_settings_schema_key_get_translated_default (GSettingsSchemaKey *key)
{ {
const gchar *translated; const gchar *translated = NULL;
GError *error = NULL; GError *error = NULL;
const gchar *domain; const gchar *domain;
#ifdef HAVE_USELOCALE
const gchar *lc_time;
locale_t old_locale;
locale_t locale;
#endif
GVariant *value; GVariant *value;
domain = g_settings_schema_get_gettext_domain (key->schema); domain = g_settings_schema_get_gettext_domain (key->schema);
@ -1427,9 +1437,25 @@ g_settings_schema_key_get_translated_default (GSettingsSchemaKey *key)
/* translation not requested for this key */ /* translation not requested for this key */
return NULL; return NULL;
#ifdef HAVE_USELOCALE
if (key->lc_char == 't') if (key->lc_char == 't')
translated = g_dcgettext (domain, key->unparsed, LC_TIME); {
else lc_time = setlocale (LC_TIME, NULL);
if (lc_time)
{
locale = newlocale (LC_MESSAGES_MASK, lc_time, (locale_t) 0);
if (locale != (locale_t) 0)
{
old_locale = uselocale (locale);
translated = g_dgettext (domain, key->unparsed);
uselocale (old_locale);
freelocale (locale);
}
}
}
#endif
if (translated == NULL)
translated = g_dgettext (domain, key->unparsed); translated = g_dgettext (domain, key->unparsed);
if (translated == key->unparsed) if (translated == key->unparsed)