Merge branch '3271-size-format' into 'main'

gfileutils: Use g_format_size() for a translatable string

Closes #3271

See merge request GNOME/glib!3943
This commit is contained in:
Marco Trevisan 2024-02-27 09:32:13 +00:00
commit def7de3366

View File

@ -709,14 +709,19 @@ get_contents_stdio (const gchar *filename,
if (tmp == NULL) if (tmp == NULL)
{ {
char *display_size = g_format_size_full (total_allocated, G_FORMAT_SIZE_LONG_FORMAT);
display_filename = g_filename_display_name (filename); display_filename = g_filename_display_name (filename);
g_set_error (error, g_set_error (error,
G_FILE_ERROR, G_FILE_ERROR,
G_FILE_ERROR_NOMEM, G_FILE_ERROR_NOMEM,
g_dngettext (GETTEXT_PACKAGE, "Could not allocate %" G_GSIZE_MODIFIER "u byte to read file “%s”", "Could not allocate %" G_GSIZE_MODIFIER "u bytes to read file “%s”", total_allocated), /* Translators: the first %s contains the file size
total_allocated, * (already formatted with units), and the second %s
* contains the file name */
_("Could not allocate %s to read file “%s”"),
display_size,
display_filename); display_filename);
g_free (display_filename); g_free (display_filename);
g_free (display_size);
goto error; goto error;
} }