luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-13 15:56:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'g_format_size_is_broken_on_Windows' into 'master'

Browse Source 
Fixing g_format_size() on Windows

Closes #429

See merge request GNOME/glib!837
This commit is contained in:
Philip Withnall 2019-05-14 10:25:30 +00:00
commit bd8658e16a
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
glib/gutils.c
View File

@ -2478,16 +2478,7 @@ g_format_size_full (guint64 size,
/* Translators: the %s in "%s bits" will always be replaced by a number. */ /* Translators: the %s in "%s bits" will always be replaced by a number. */
translated_format = g_dngettext (GETTEXT_PACKAGE, "%s bit", "%s bits", plural_form); translated_format = g_dngettext (GETTEXT_PACKAGE, "%s bit", "%s bits", plural_form);
} }
/* XXX: Windows doesn't support the "'" format modifier, so we
* must not use it there. Instead, just display the number
* without separation. Bug #655336 is open until a solution is
* found.
*/
#ifndef G_OS_WIN32
formatted_number = g_strdup_printf ("%'"G_GUINT64_FORMAT, size); formatted_number = g_strdup_printf ("%'"G_GUINT64_FORMAT, size);
#else
formatted_number = g_strdup_printf ("%"G_GUINT64_FORMAT, size);
#endif
g_string_append (string, " ("); g_string_append (string, " (");
g_string_append_printf (string, translated_format, formatted_number); g_string_append_printf (string, translated_format, formatted_number);