[glib/1625-unbreakable-space-needed-when-showing-size-of-folder-file] gutils: Use no-break space in g_format_size()
- From: António Fernandes <antoniof src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/1625-unbreakable-space-needed-when-showing-size-of-folder-file] gutils: Use no-break space in g_format_size()
- Date: Tue, 18 Dec 2018 14:28:03 +0000 (UTC)
commit 91e76d9026d0818b85b9804d4564130ad3455ca8
Author: António Fernandes <antoniojpfernandes gmail com>
Date: Tue Dec 18 14:27:52 2018 +0000
gutils: Use no-break space in g_format_size()
It's undesirable for quantity and unit to be separated by line breaks.
Fixes https://gitlab.gnome.org/GNOME/glib/issues/1625
glib/gutils.c | 56 ++++++++++++++++++++++++++++----------------------------
1 file changed, 28 insertions(+), 28 deletions(-)
---
diff --git a/glib/gutils.c b/glib/gutils.c
index 09c1523a7..52c99d371 100644
--- a/glib/gutils.c
+++ b/glib/gutils.c
@@ -2378,36 +2378,36 @@ g_format_size_full (guint64 size,
const struct Format formats[4][6] = {
{
- { KILOBYTE_FACTOR, N_("%.1f kB") },
- { MEGABYTE_FACTOR, N_("%.1f MB") },
- { GIGABYTE_FACTOR, N_("%.1f GB") },
- { TERABYTE_FACTOR, N_("%.1f TB") },
- { PETABYTE_FACTOR, N_("%.1f PB") },
- { EXABYTE_FACTOR, N_("%.1f EB") }
+ { KILOBYTE_FACTOR, N_("%.1f kB") },
+ { MEGABYTE_FACTOR, N_("%.1f MB") },
+ { GIGABYTE_FACTOR, N_("%.1f GB") },
+ { TERABYTE_FACTOR, N_("%.1f TB") },
+ { PETABYTE_FACTOR, N_("%.1f PB") },
+ { EXABYTE_FACTOR, N_("%.1f EB") }
},
{
- { KIBIBYTE_FACTOR, N_("%.1f KiB") },
- { MEBIBYTE_FACTOR, N_("%.1f MiB") },
- { GIBIBYTE_FACTOR, N_("%.1f GiB") },
- { TEBIBYTE_FACTOR, N_("%.1f TiB") },
- { PEBIBYTE_FACTOR, N_("%.1f PiB") },
- { EXBIBYTE_FACTOR, N_("%.1f EiB") }
+ { KIBIBYTE_FACTOR, N_("%.1f KiB") },
+ { MEBIBYTE_FACTOR, N_("%.1f MiB") },
+ { GIBIBYTE_FACTOR, N_("%.1f GiB") },
+ { TEBIBYTE_FACTOR, N_("%.1f TiB") },
+ { PEBIBYTE_FACTOR, N_("%.1f PiB") },
+ { EXBIBYTE_FACTOR, N_("%.1f EiB") }
},
{
- { KILOBYTE_FACTOR, N_("%.1f kb") },
- { MEGABYTE_FACTOR, N_("%.1f Mb") },
- { GIGABYTE_FACTOR, N_("%.1f Gb") },
- { TERABYTE_FACTOR, N_("%.1f Tb") },
- { PETABYTE_FACTOR, N_("%.1f Pb") },
- { EXABYTE_FACTOR, N_("%.1f Eb") }
+ { KILOBYTE_FACTOR, N_("%.1f kb") },
+ { MEGABYTE_FACTOR, N_("%.1f Mb") },
+ { GIGABYTE_FACTOR, N_("%.1f Gb") },
+ { TERABYTE_FACTOR, N_("%.1f Tb") },
+ { PETABYTE_FACTOR, N_("%.1f Pb") },
+ { EXABYTE_FACTOR, N_("%.1f Eb") }
},
{
- { KIBIBYTE_FACTOR, N_("%.1f Kib") },
- { MEBIBYTE_FACTOR, N_("%.1f Mib") },
- { GIBIBYTE_FACTOR, N_("%.1f Gib") },
- { TEBIBYTE_FACTOR, N_("%.1f Tib") },
- { PEBIBYTE_FACTOR, N_("%.1f Pib") },
- { EXBIBYTE_FACTOR, N_("%.1f Eib") }
+ { KIBIBYTE_FACTOR, N_("%.1f Kib") },
+ { MEBIBYTE_FACTOR, N_("%.1f Mib") },
+ { GIBIBYTE_FACTOR, N_("%.1f Gib") },
+ { TEBIBYTE_FACTOR, N_("%.1f Tib") },
+ { PEBIBYTE_FACTOR, N_("%.1f Pib") },
+ { EXBIBYTE_FACTOR, N_("%.1f Eib") }
}
};
@@ -2441,11 +2441,11 @@ g_format_size_full (guint64 size,
if (index == FORMAT_BYTES || index == FORMAT_BYTES_IEC)
{
- format = g_dngettext (GETTEXT_PACKAGE, "%u byte", "%u bytes", (guint) size);
+ format = g_dngettext (GETTEXT_PACKAGE, "%u byte", "%u bytes", (guint) size);
}
else
{
- format = g_dngettext (GETTEXT_PACKAGE, "%u bit", "%u bits", (guint) size);
+ format = g_dngettext (GETTEXT_PACKAGE, "%u bit", "%u bits", (guint) size);
}
g_string_printf (string, format, (guint) size);
@@ -2512,12 +2512,12 @@ g_format_size_full (guint64 size,
if (index == FORMAT_BYTES || index == FORMAT_BYTES_IEC)
{
/* Translators: the %s in "%s bytes" will always be replaced by a number. */
- translated_format = g_dngettext (GETTEXT_PACKAGE, "%s byte", "%s bytes", plural_form);
+ translated_format = g_dngettext (GETTEXT_PACKAGE, "%s byte", "%s bytes", plural_form);
}
else
{
/* 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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]