From 16515a970f01dad8005de2d29c813ae06de2a1c5 Mon Sep 17 00:00:00 2001 From: Gehad elrobey Date: Sat, 16 Aug 2014 17:23:34 +0300 Subject: [PATCH] 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 Signed-off-by: Miika Turkia Signed-off-by: Dirk Hohndel --- save-html.c | 3 ++- theme/list_lib.js | 2 +- 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 += '

' + translate.Dive_equipments + '

'; + result += '

' + translate.Dive_equipments + '

' + translate.Type + '' + translate.Size + '' + translate.Work_Pressure + '' + translate.Start_Pressure + '' + translate.End_Pressure + 'O2
'; for (var i in dive.Cylinders) { result += get_cylinder_HTML(dive.Cylinders[i]); }
' + translate.Type + '' + translate.Size + '' + translate.Work_Pressure + '' + translate.Start_Pressure + '' + translate.End_Pressure + ''+translate.Gas+'