applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix handling of multichar splitting for regions

Browse source 
g_strsplit_set is not the right thing to use with multibyte
characters. GRegex to the rescue. This was causing misrendering
and crashes in Chinese:
https://bugzilla.redhat.com/show_bug.cgi?id=669415

Also, we have to call bind_textdomain_codeset().
This commit is contained in:
Matthias Clasen 2011-01-25 20:37:01 -05:00
parent f1399b53a2
commit 2c4bba74e0
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
panels/datetime/cc-datetime-panel.c
View file

@ -518,7 +518,7 @@ get_regions (TzLocation *loc,
/* Load the translation for it */
zone = g_strdup (dgettext (GETTEXT_PACKAGE_TIMEZONES, loc->zone));
g_strdelimit (zone, "_", ' ');
split_translated = g_strsplit_set (zone, TRANSLATION_SPLIT, 2);
split_translated = g_regex_split_simple ("[\\x{2044}\\x{2215}\\x{29f8}\\x{ff0f}/]", zone, 0, 0);
g_free (zone);
if (!g_hash_table_lookup_extended (data->table, split[0], NULL, NULL))
@ -844,6 +844,8 @@ cc_date_time_panel_init (CcDateTimePanel *self)
void
cc_date_time_panel_register (GIOModule *module)
{
bind_textdomain_codeset (GETTEXT_PACKAGE_TIMEZONES, "UTF-8");
cc_date_time_panel_register_type (G_TYPE_MODULE (module));
g_io_extension_point_implement (CC_SHELL_PANEL_EXTENSION_POINT,
CC_TYPE_DATE_TIME_PANEL,