diff --git a/AUTHORS.md b/AUTHORS.md index f3bbce2c..e84f4ff5 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -60,6 +60,7 @@ date of first contribution): * ["bwgan"](https://github.com/bwgan) * [Siim Raud](https://github.com/2ndalpha) * ["geoporalis"](https://github.com/geoporalis) + * [therealbstern](https://github.com/therealbstern) OctoPrint started off as a fork of [Cura](https://github.com/daid/Cura) by [Daid Braam](https://github.com/daid). Parts of its communication layer and diff --git a/src/octoprint/static/js/app/helpers.js b/src/octoprint/static/js/app/helpers.js index 930eccdd..9c47abbc 100644 --- a/src/octoprint/static/js/app/helpers.js +++ b/src/octoprint/static/js/app/helpers.js @@ -413,7 +413,7 @@ function cleanTemperature(temp) { function formatTemperature(temp) { if (!temp || temp < 10) return gettext("off"); - return _.sprintf("%.1f°C", temp); + return _.sprintf("%.1f°C (%.1f°F)", temp, temp * 9 / 5 + 32); } function pnotifyAdditionalInfo(inner) {