From 5af78de226ab39fff09a371f69b1a48555c13f6c Mon Sep 17 00:00:00 2001
From: Ben Stern <bas-github@bstern.org>
Date: Sat, 5 Mar 2016 14:25:16 -0500
Subject: [PATCH] Add output in Fahrenheit as well as Celsius.

---
 AUTHORS.md                             | 1 +
 src/octoprint/static/js/app/helpers.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

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&deg;C", temp);
+    return _.sprintf("%.1f&deg;C (%.1f&deg;F)", temp, temp * 9 / 5 + 32);
 }
 
 function pnotifyAdditionalInfo(inner) {