diff --git a/en/index.html b/en/index.html index ec2b13e..9013343 100644 --- a/en/index.html +++ b/en/index.html @@ -23,7 +23,7 @@

Refractometer-Calculator

- Calibration + Adjustment
@@ -77,7 +77,7 @@

Refractometer-Calculator

- Calibration: + Adjustment: @@ -87,7 +87,7 @@

Refractometer-Calculator

Back -

Calibration

+

Adjustment

Add
diff --git a/index.html b/index.html index 1ab2b9e..fbd2418 100644 --- a/index.html +++ b/index.html @@ -18,7 +18,7 @@

Refraktometer-Rechner

- Kalibrierung + Justierung
@@ -72,7 +72,7 @@

Refraktometer-Rechner

- Kalibrierung: + Justierung: @@ -82,7 +82,7 @@

Refraktometer-Rechner

Zurück -

Kalibrierung

+

Justierung

Hinzufügen
diff --git a/main.js b/main.js index f56cb12..ad97694 100644 --- a/main.js +++ b/main.js @@ -337,15 +337,15 @@ function textify2(value1, unit1, value2, unit2) { function textifyExtract(value, unit, valueSG = NaN) { if (isNaN(valueSG)) valueSG = pToSG(value); - return concat(textify(value, unit), textify(valueSG, "", 3)); + return concat(textify(value, unit), textify(valueSG, "SG", 3)); } function updateTable(result) { - $('#abvoutput').html(textify2(result.abv, "vol %", result.abw, "%")); + $('#abvoutput').html(textify2(result.abv, "%v/v", result.abw, "%w/w")); $('#oeoutput').html(textifyExtract(result.oe, "°P")); - $('#aeoutput').html(textifyExtract(result.ae, "g/100g", result.fg)); + $('#aeoutput').html(textifyExtract(result.ae, "%w/w", result.fg)); $('#adfoutput').html(textify(result.adf, "%")); - $('#reoutput').html(textifyExtract(result.re, "g/100g")); + $('#reoutput').html(textifyExtract(result.re, "%w/w")); $('#rdfoutput').html(textify(result.rdf, "%")); $('#caloutput').html(textify2(result.kj, "kJ", result.kcal, "kcal")); $('#caliboutput').html(calibration.getType());