From bfd6ce0f1faea3a11127f6d945a6acdc659487d0 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Tue, 16 Oct 2012 08:33:03 -0700 Subject: Localization prevents us from from making assumptions about string length Restructure some code to work around that. Signed-off-by: Dirk Hohndel --- info.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'info.c') diff --git a/info.c b/info.c index 61a2bebe3..8437c7318 100644 --- a/info.c +++ b/info.c @@ -141,13 +141,14 @@ void show_dive_info(struct dive *dive) if (!text) text = ""; if (*text) { - snprintf(buffer, sizeof(buffer), _("Dive #%d - %s"), dive->number, text); + if (dive->number) { + snprintf(buffer, sizeof(buffer), _("Dive #%d - %s"), dive->number, text); + text = buffer; + } } else { divename(buffer, sizeof(buffer), dive); + text = buffer; } - text = buffer; - if (!dive->number) - text += 10; /* Skip the "Dive #0 - " part */ /* put it all together */ if (existing_filename) { -- cgit v1.2.3-70-g09d2