From 99011694853a5c19d20fe8e3c74980d958760a03 Mon Sep 17 00:00:00 2001 From: Tim Wootton Date: Thu, 11 Sep 2014 22:56:36 +0100 Subject: [PATCH] Bring save html capitalisation in line Converted save html to use same capitalisation style as the rest of the application Changed references to equipments to equipment. Signed-off-by: Tim Wootton Signed-off-by: Dirk Hohndel --- save-html.c | 48 +++++++++++++++++++++--------------------- theme/dive_export.html | 20 +++++++++--------- theme/list_lib.js | 6 +++--- 3 files changed, 37 insertions(+), 37 deletions(-) diff --git a/save-html.c b/save-html.c index ea8a5df6d..b517b199e 100644 --- a/save-html.c +++ b/save-html.c @@ -418,20 +418,20 @@ void export_translation(const char *file_name) write_attribute(b, "Date", translate("gettextFromC", "Date"), ", "); write_attribute(b, "Time", translate("gettextFromC", "Time"), ", "); write_attribute(b, "Location", translate("gettextFromC", "Location"), ", "); - write_attribute(b, "Air_Temp", translate("gettextFromC", "Air Temp"), ", "); - write_attribute(b, "Water_Temp", translate("gettextFromC", "Water Temp"), ", "); - write_attribute(b, "dives", translate("gettextFromC", "dives"), ", "); - write_attribute(b, "Expand_All", translate("gettextFromC", "Expand All"), ", "); - write_attribute(b, "Collapse_All", translate("gettextFromC", "Collapse All"), ", "); - write_attribute(b, "trips", translate("gettextFromC", "trips"), ", "); + write_attribute(b, "Air_Temp", translate("gettextFromC", "Air temp"), ", "); + write_attribute(b, "Water_Temp", translate("gettextFromC", "Water temp"), ", "); + write_attribute(b, "dives", translate("gettextFromC", "Dives"), ", "); + write_attribute(b, "Expand_All", translate("gettextFromC", "Expand all"), ", "); + write_attribute(b, "Collapse_All", translate("gettextFromC", "Collapse all"), ", "); + write_attribute(b, "trips", translate("gettextFromC", "Trips"), ", "); write_attribute(b, "Statistics", translate("gettextFromC", "Statistics"), ", "); - write_attribute(b, "Advanced_Search", translate("gettextFromC", "Advanced Search"), ", "); + write_attribute(b, "Advanced_Search", translate("gettextFromC", "Advanced search"), ", "); //Dive expanded view write_attribute(b, "Rating", translate("gettextFromC", "Rating"), ", "); write_attribute(b, "Visibility", translate("gettextFromC", "Visibility"), ", "); write_attribute(b, "Duration", translate("gettextFromC", "Duration"), ", "); - write_attribute(b, "DiveMaster", translate("gettextFromC", "DiveMaster"), ", "); + write_attribute(b, "DiveMaster", translate("gettextFromC", "Divemaster"), ", "); write_attribute(b, "Buddy", translate("gettextFromC", "Buddy"), ", "); write_attribute(b, "Suit", translate("gettextFromC", "Suit"), ", "); write_attribute(b, "Tags", translate("gettextFromC", "Tags"), ", "); @@ -441,31 +441,31 @@ void export_translation(const char *file_name) //Yearly statistics view write_attribute(b, "Yearly_statistics", translate("gettextFromC", "Yearly statistics"), ", "); write_attribute(b, "Year", translate("gettextFromC", "Year"), ", "); - write_attribute(b, "Total_Time", translate("gettextFromC", "Total Time"), ", "); - write_attribute(b, "Average_Time", translate("gettextFromC", "Average Time"), ", "); - write_attribute(b, "Shortest_Time", translate("gettextFromC", "Shortest Time"), ", "); - write_attribute(b, "Longest_Time", translate("gettextFromC", "Longest Time"), ", "); - write_attribute(b, "Average_Depth", translate("gettextFromC", "Average Depth"), ", "); - write_attribute(b, "Min_Depth", translate("gettextFromC", "Min Depth"), ", "); - write_attribute(b, "Max_Depth", translate("gettextFromC", "Max Depth"), ", "); + write_attribute(b, "Total_Time", translate("gettextFromC", "Total time"), ", "); + write_attribute(b, "Average_Time", translate("gettextFromC", "Average time"), ", "); + write_attribute(b, "Shortest_Time", translate("gettextFromC", "Shortest time"), ", "); + write_attribute(b, "Longest_Time", translate("gettextFromC", "Longest time"), ", "); + write_attribute(b, "Average_Depth", translate("gettextFromC", "Average depth"), ", "); + write_attribute(b, "Min_Depth", translate("gettextFromC", "Min depth"), ", "); + write_attribute(b, "Max_Depth", translate("gettextFromC", "Max depth"), ", "); write_attribute(b, "Average_SAC", translate("gettextFromC", "Average SAC"), ", "); write_attribute(b, "Min_SAC", translate("gettextFromC", "Min SAC"), ", "); write_attribute(b, "Max_SAC", translate("gettextFromC", "Max SAC"), ", "); - write_attribute(b, "Average_Temp", translate("gettextFromC", "Average Temp"), ", "); - write_attribute(b, "Min_Temp", translate("gettextFromC", "Min Temp"), ", "); - write_attribute(b, "Max_Temp", translate("gettextFromC", "Max Temp"), ", "); - write_attribute(b, "Back_to_List", translate("gettextFromC", "Back to List"), ", "); + write_attribute(b, "Average_Temp", translate("gettextFromC", "Average temp"), ", "); + write_attribute(b, "Min_Temp", translate("gettextFromC", "Min temp"), ", "); + write_attribute(b, "Max_Temp", translate("gettextFromC", "Max temp"), ", "); + write_attribute(b, "Back_to_List", translate("gettextFromC", "Back to list"), ", "); //dive detailed view write_attribute(b, "Dive_No", translate("gettextFromC", "Dive No."), ", "); write_attribute(b, "Dive_profile", translate("gettextFromC", "Dive profile"), ", "); write_attribute(b, "Dive_information", translate("gettextFromC", "Dive information"), ", "); - write_attribute(b, "Dive_equipments", translate("gettextFromC", "Dive equipments"), ", "); + write_attribute(b, "Dive_equipment", translate("gettextFromC", "Dive equipment"), ", "); write_attribute(b, "Type", translate("gettextFromC", "Type"), ", "); write_attribute(b, "Size", translate("gettextFromC", "Size"), ", "); - 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, "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"), ", "); @@ -473,7 +473,7 @@ void export_translation(const char *file_name) write_attribute(b, "Name", translate("gettextFromC", "Name"), ", "); write_attribute(b, "Value", translate("gettextFromC", "Value"), ", "); write_attribute(b, "Coordinates", translate("gettextFromC", "Coordinates"), ", "); - write_attribute(b, "Dive_Status", translate("gettextFromC", "Dive Status"), " "); + write_attribute(b, "Dive_Status", translate("gettextFromC", "Dive status"), " "); put_format(b, "}"); diff --git a/theme/dive_export.html b/theme/dive_export.html index 4073d0639..0b5b6dc7f 100644 --- a/theme/dive_export.html +++ b/theme/dive_export.html @@ -154,7 +154,7 @@ function changeAdvSearch(e){
- Advanced Search + Advanced search
@@ -180,8 +180,8 @@ function changeAdvSearch(e){
Date
Time
Location
-
Air Temp
-
Water Temp
+
Air temp
+
Water temp
@@ -212,8 +212,8 @@ function changeAdvSearch(e){

Dive Information

-
-

Dive equipments

+
+

Dive equipment

Events

@@ -222,7 +222,7 @@ function changeAdvSearch(e){

Dive stats

-

Dive Photos

+

Dive photos

@@ -233,7 +233,7 @@ function changeAdvSearch(e){
- +
diff --git a/theme/list_lib.js b/theme/list_lib.js index 775d83e4b..6f32ed493 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_equipment + '

' + translate.Type + '' + translate.Size + '' + translate.Work_Pressure + '' + translate.Start_Pressure + '' + translate.End_Pressure + ''+translate.Gas+'
'; for (var i in dive.Cylinders) { result += get_cylinder_HTML(dive.Cylinders[i]); } @@ -1216,8 +1216,8 @@ function showDiveDetails(dive) //draw the canvas and initialize the view document.getElementById("diveinfo").innerHTML = get_dive_HTML(items[dive_id]); - document.getElementById("dive_equipments").innerHTML = get_cylinders_HTML(items[dive_id]); - document.getElementById("dive_equipments").innerHTML += get_weights_HTML(items[dive_id]); + document.getElementById("dive_equipment").innerHTML = get_cylinders_HTML(items[dive_id]); + document.getElementById("dive_equipment").innerHTML += get_weights_HTML(items[dive_id]); document.getElementById("bookmarks").innerHTML = get_bookmarks_HTML(items[dive_id]); document.getElementById("divestats").innerHTML = get_status_HTML(items[dive_id]); document.getElementById("slider").innerHTML = get_dive_photos(items[dive_id]);
' + translate.Type + '' + translate.Size + '' + translate.Work_Pressure + '' + translate.Start_Pressure + '' + translate.End_Pressure + ''+translate.Gas+'