Localization prevents us from from making assumptions about string length

Restructure some code to work around that.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2012-10-16 08:33:03 -07:00
parent f45285d461
commit bfd6ce0f1f

7
info.c
View file

@ -141,13 +141,14 @@ void show_dive_info(struct dive *dive)
if (!text) if (!text)
text = ""; text = "";
if (*text) { if (*text) {
if (dive->number) {
snprintf(buffer, sizeof(buffer), _("Dive #%d - %s"), dive->number, text); snprintf(buffer, sizeof(buffer), _("Dive #%d - %s"), dive->number, text);
text = buffer;
}
} else { } else {
divename(buffer, sizeof(buffer), dive); divename(buffer, sizeof(buffer), dive);
}
text = buffer; text = buffer;
if (!dive->number) }
text += 10; /* Skip the "Dive #0 - " part */
/* put it all together */ /* put it all together */
if (existing_filename) { if (existing_filename) {