diff --git a/src/rugby-app-window.c b/src/rugby-app-window.c index c78d12d190f9727cd32696bb534f2c18069e99ec..bc62063d77e3f454e4b55c77e804ae8b92ac0bbe 100644 --- a/src/rugby-app-window.c +++ b/src/rugby-app-window.c @@ -55,36 +55,32 @@ item_tooltip_cb (GtkListItem *item) "kicks", &kicks, NULL); - if (tries > 0 && utries == 0) + if (tries > 0) { g_string_printf (tooltip, ngettext ("%d converted try", "%d converted tries", tries), tries); } - else if (utries > 0 && tries == 0) + if (utries > 0) { - g_string_printf (tooltip, ngettext ("%d unconverted try", - "%d unconverted tries", - utries), - utries); - } - else if (tries + utries > 0) - { - g_string_printf (tooltip, ngettext ("%d try (%d converted)", - "%d tries (%d converted)", - tries + utries), - tries + utries, tries); - } + if (tooltip->len > 0) + g_string_append (tooltip, ", "); + g_string_append_printf (tooltip, ngettext ("%d unconverted try", + "%d unconverted tries", + utries), + utries); + } if (kicks > 0) { - if (tries > 0 || utries > 0) - g_string_append_printf (tooltip, " and "); + if (tooltip->len > 0) + g_string_append (tooltip, ", "); - g_string_append_printf (tooltip, - ngettext ("%d kick", "%d kicks", kicks), - kicks); + g_string_append_printf (tooltip, ngettext ("%d kick", + "%d kicks", + kicks), + kicks); } return g_string_free (tooltip, FALSE);