summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Gehad elrobey <gehadelrobey@gmail.com>2014-08-16 17:23:34 +0300
committerGravatar Dirk Hohndel <dirk@hohndel.org>2014-08-17 12:03:24 -0600
commit16515a970f01dad8005de2d29c813ae06de2a1c5 (patch)
tree353204b4e94367300a5a081a560d685919bf1423
parent5b9537222e2af2a8230c3805f89007c8f20e0a6d (diff)
downloadsubsurface-16515a970f01dad8005de2d29c813ae06de2a1c5.tar.gz
HTML: change empty O2 Value to Air.
-Change column name to 'Gas' as changed in Subsurface. -Replace '--' with 'Air' to empty tanks. Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com> Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--save-html.c3
-rw-r--r--theme/list_lib.js2
2 files changed, 3 insertions, 2 deletions
diff --git a/save-html.c b/save-html.c
index 336eff0be..c3d5073b2 100644
--- a/save-html.c
+++ b/save-html.c
@@ -101,7 +101,7 @@ static void put_cylinder_HTML(struct membuffer *b, struct dive *dive)
if (cylinder->gasmix.o2.permille) {
put_format(b, "\"O2\":\"%u.%u%%\",", FRACTION(cylinder->gasmix.o2.permille, 10));
} else {
- write_attribute(b, "O2", "--");
+ write_attribute(b, "O2", "Air");
}
put_string(b, "},");
}
@@ -408,6 +408,7 @@ void export_translation(const char *file_name)
write_attribute(b, "Work_Pressure", translate("gettextFromC", "Work Pressure"));
write_attribute(b, "Start_Pressure", translate("gettextFromC", "Start Pressure"));
write_attribute(b, "End_Pressure", translate("gettextFromC", "End Pressure"));
+ write_attribute(b, "Gas", translate("gettextFromC", "Gas"));
write_attribute(b, "Weight", translate("gettextFromC", "Weight"));
write_attribute(b, "Type", translate("gettextFromC", "Type"));
write_attribute(b, "Events", translate("gettextFromC", "Events"));
diff --git a/theme/list_lib.js b/theme/list_lib.js
index 0a7921823..5d8538b1f 100644
--- a/theme/list_lib.js
+++ b/theme/list_lib.js
@@ -863,7 +863,7 @@ function get_cylinders_HTML(dive)
return "";
var result = "";
- result += '<h2 class="det_hed">' + translate.Dive_equipments + '</h2><table><tr><td class="words">' + translate.Type + '</td><td class="words">' + translate.Size + '</td><td class="words">' + translate.Work_Pressure + '</td><td class="words">' + translate.Start_Pressure + '</td><td class="words">' + translate.End_Pressure + '</td><td class="words">O2</td></tr>';
+ result += '<h2 class="det_hed">' + translate.Dive_equipments + '</h2><table><tr><td class="words">' + translate.Type + '</td><td class="words">' + translate.Size + '</td><td class="words">' + translate.Work_Pressure + '</td><td class="words">' + translate.Start_Pressure + '</td><td class="words">' + translate.End_Pressure + '</td><td class="words">'+translate.Gas+'</td></tr>';
for (var i in dive.Cylinders) {
result += get_cylinder_HTML(dive.Cylinders[i]);
}