summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Leeds <matthew.leeds@endlessm.com>2020-02-14 16:42:40 -0800
committerBastien Nocera <hadess@hadess.net>2020-03-31 19:36:35 +0200
commitfab33167a639514dcebf979381823e65f917f368 (patch)
treec4a9c46a46d99256ffbdd924c0f4b4788832bce4
parent7681240ea9076c60eae09815de5a08067cf099b1 (diff)
downloadtotem-fab33167a639514dcebf979381823e65f917f368.tar.gz
properties: Improve how we print time periods
Print e.g. "2 minutes" instead of "2 minutes 0 seconds".
-rw-r--r--src/plugins/properties/bacon-video-widget-properties.c23
1 files changed, 19 insertions, 4 deletions
diff --git a/src/plugins/properties/bacon-video-widget-properties.c b/src/plugins/properties/bacon-video-widget-properties.c
index cebf39450..1cfbf0429 100644
--- a/src/plugins/properties/bacon-video-widget-properties.c
+++ b/src/plugins/properties/bacon-video-widget-properties.c
@@ -159,11 +159,26 @@ time_to_string_text (gint64 msecs)
if (hour > 0)
{
- /* 5 hours 2 minutes 12 seconds */
- string = g_strdup_printf (C_("time", "%s %s %s"), hours, mins, secs);
+ if (min > 0 && sec > 0)
+ {
+ /* 5 hours 2 minutes 12 seconds */
+ string = g_strdup_printf (C_("hours minutes seconds", "%s %s %s"), hours, mins, secs);
+ } else if (min > 0) {
+ /* 5 hours 2 minutes */
+ string = g_strdup_printf (C_("hours minutes", "%s %s"), hours, mins);
+ } else {
+ /* 5 hours */
+ string = g_strdup_printf (C_("hours", "%s"), hours);
+ }
} else if (min > 0) {
- /* 2 minutes 12 seconds */
- string = g_strdup_printf (C_("time", "%s %s"), mins, secs);
+ if (sec > 0)
+ {
+ /* 2 minutes 12 seconds */
+ string = g_strdup_printf (C_("minutes seconds", "%s %s"), mins, secs);
+ } else {
+ /* 2 minutes */
+ string = g_strdup_printf (C_("minutes", "%s"), mins);
+ }
} else if (sec > 0) {
/* 10 seconds */
string = g_strdup (secs);