From 94e563a94e7e265c94c251d9983353cfc5150e2a Mon Sep 17 00:00:00 2001 From: Stefan Fuchs Date: Wed, 18 Oct 2017 11:41:12 +0200 Subject: Minimum gas calculation: Change text colors for delta value output... and adapt the strings for translation to s.th. which can be handled more easily. Signed-off-by: Stefan Fuchs --- core/plannernotes.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/core/plannernotes.c b/core/plannernotes.c index 5b6667051..d332bd837 100644 --- a/core/plannernotes.c +++ b/core/plannernotes.c @@ -418,14 +418,19 @@ void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive, bool show_d mingas_depth = get_depth_units(lastbottomdp->depth.mm, NULL, &depth_unit); /* Print it to results */ if (cyl->start.mbar > lastbottomdp->minimum_gas.mbar) snprintf(mingas, sizeof(mingas), - translate("gettextFromC", "
 — Minimum gas (based on %.1fxSAC/+%dmin@%.0f%s): \ - %.0f%s/%.0f%s/Δ:%+.0f%s"), + "
 — %s (%s %.1fx%s/+%d%s@%.0f%s): \ + %.0f%s/%.0f%s/Δ:%+.0f%s", mingas_d_pressure > 0 ? "green" :"red", - prefs.sacfactor / 100.0, prefs.problemsolvingtime, + translate("gettextFromC", "Minimum gas"), + translate("gettextFromC", "based on"), + prefs.sacfactor / 100.0, + translate("gettextFromC", "SAC"), + prefs.problemsolvingtime, + translate("gettextFromC", "min"), mingas_depth, depth_unit, mingas_volume, unit, mingas_pressure, pressure_unit, - mingas_d_pressure > 0 ? "green" :"red", + mingas_d_pressure > 0 ? "grey" :"indianred", mingas_d_pressure, pressure_unit); else snprintf(warning, sizeof(warning), "
 — %s %s", translate("gettextFromC", "Warning:"), -- cgit v1.2.3-70-g09d2