Merge branch '3271-string-fix-again' into 'main'

gfileutils: Use g_format_size() for another translatable string

Closes #3271

See merge request GNOME/glib!3948
This commit is contained in:
Philip Withnall 2024-03-01 12:21:42 +00:00
commit dd2861cd8a

View File

@ -818,14 +818,19 @@ get_contents_regfile (const gchar *filename,
if (buf == NULL)
{
char *display_size = g_format_size_full (alloc_size, G_FORMAT_SIZE_LONG_FORMAT);
display_filename = g_filename_display_name (filename);
g_set_error (error,
G_FILE_ERROR,
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”", alloc_size),
alloc_size,
/* Translators: the first %s contains the file size
* (already formatted with units), and the second %s
* contains the file name */
_("Could not allocate %s to read file “%s”"),
display_size,
display_filename);
g_free (display_filename);
g_free (display_size);
goto error;
}