summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorGravatar Stefan Fuchs <sfuchs@gmx.de>2017-10-18 11:41:12 +0200
committerGravatar Robert C. Helling <helling@atdotde.de>2017-10-18 17:41:42 +0200
commit94e563a94e7e265c94c251d9983353cfc5150e2a (patch)
tree6fc640e396e4001ce44f14286403ce89e998dcb6 /core
parent3eaff35ae6b829e2c0b8960a8207c39ad8fa1b91 (diff)
downloadsubsurface-94e563a94e7e265c94c251d9983353cfc5150e2a.tar.gz
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 <sfuchs@gmx.de>
Diffstat (limited to 'core')
-rw-r--r--core/plannernotes.c13
1 files 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", "<br>&nbsp;&mdash; <span style='color: %s;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): \
- %.0f%s/%.0f%s/<span style='color: %s;'>&Delta;:%+.0f%s</span>"),
+ "<br>&nbsp;&mdash; <span style='color: %s;'>%s</span> (%s %.1fx%s/+%d%s@%.0f%s): \
+ %.0f%s/%.0f%s<span style='color: %s;'>/&Delta;:%+.0f%s</span>",
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), "<br>&nbsp;&mdash; <span style='color: red;'>%s </span> %s",
translate("gettextFromC", "Warning:"),