diff --git a/static/js/terrariumpi.js b/static/js/terrariumpi.js
index 9475f0eda..6187dd939 100644
--- a/static/js/terrariumpi.js
+++ b/static/js/terrariumpi.js
@@ -200,9 +200,290 @@ function load_page(url) {
   return false;
 }
 
+(function() {
+    'use strict';
+
+    // Got this from MDN:
+    // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number/toLocaleString#Example:_Checking_for_support_for_locales_and_options_arguments
+    function toLocaleStringSupportsLocales() {
+        var number = 0;
+        try {
+            number.toLocaleString("i");
+        } catch (e) {
+            return e.name === "RangeError";
+        }
+        return false;
+    }
+
+    if (!toLocaleStringSupportsLocales()) {
+        var replaceSeparators = function(sNum, separators) {
+            var sNumParts = sNum.split('.');
+            if (separators && separators.thousands) {
+                sNumParts[0] = sNumParts[0].replace(/(\d)(?=(\d\d\d)+(?!\d))/g, "$1" + separators.thousands);
+            }
+            sNum = sNumParts.join(separators.decimal);
+
+            return sNum;
+        };
+
+        var renderFormat = function(template, props) {
+            for (var prop in props) {
+                template = template.replace("[[" + prop + "]]", props[prop]);
+            }
+
+            return template;
+        };
+
+        var mapMatch = function(map, locale) {
+            var match = locale;
+            var language = locale && locale.toLowerCase().match(/^\w+/);
+
+            if (!map.hasOwnProperty(locale)) {
+                if (map.hasOwnProperty(language)) {
+                    match = language;
+                } else {
+                    match = "en";
+                }
+            }
+
+            return map[match];
+        };
+
+        var dotThousCommaDec = function(sNum) {
+            var separators = {
+                decimal: ',',
+                thousands: '.'
+            };
+
+            return replaceSeparators(sNum, separators);
+        };
+
+        var commaThousDotDec = function(sNum) {
+            var separators = {
+                decimal: '.',
+                thousands: ','
+            };
+
+            return replaceSeparators(sNum, separators);
+        };
+
+        var spaceThousCommaDec = function(sNum) {
+            var seperators = {
+                decimal: ',',
+                thousands: '\u00A0'
+            };
+
+            return replaceSeparators(sNum, seperators);
+        };
+        
+        var apostrophThousDotDec = function(sNum) {
+            var seperators = {
+                decimal: '.',
+                thousands: '\u0027'
+            };
+            
+            return replaceSeparators(sNum, seperators);
+        };
+
+        var transformForLocale = {
+            en: commaThousDotDec,
+            it: dotThousCommaDec,
+            fr: spaceThousCommaDec,
+            de: dotThousCommaDec,
+            nl: dotThousCommaDec,
+            "de-DE": dotThousCommaDec,
+            "de-AT": dotThousCommaDec,
+            "de-CH": apostrophThousDotDec,
+            "de-LI": apostrophThousDotDec,
+            "de-BE": dotThousCommaDec,
+            ro: dotThousCommaDec,
+            "ro-RO": dotThousCommaDec,
+            hu: spaceThousCommaDec,
+            "hu-HU": spaceThousCommaDec,
+            "da-DK": dotThousCommaDec,
+            "nb-NO": spaceThousCommaDec
+        };
+
+        var currencyFormatMap = {
+            en: "pre",
+            it: "post",
+            fr: "post",
+            de: "post",
+            nl: "prespace",
+            "de-DE": "post",
+            "de-AT": "prespace",
+            "de-CH": "prespace",
+            "de-LI": "post",
+            "de-BE": "post",
+            ro: "post",
+            "ro-RO": "post",
+            hu: "post",
+            "hu-HU": "post",
+            "da-DK": "post",
+            "nb-NO": "post"
+        };
+
+        var currencySymbols = {
+            "afn": "؋",
+            "ars": "$",
+            "awg": "ƒ",
+            "aud": "$",
+            "azn": "₼",
+            "bsd": "$",
+            "bbd": "$",
+            "byr": "p.",
+            "bzd": "BZ$",
+            "bmd": "$",
+            "bob": "Bs.",
+            "bam": "KM",
+            "bwp": "P",
+            "bgn": "лв",
+            "brl": "R$",
+            "bnd": "$",
+            "khr": "៛",
+            "cad": "$",
+            "kyd": "$",
+            "clp": "$",
+            "cny": "¥",
+            "cop": "$",
+            "crc": "₡",
+            "hrk": "kn",
+            "cup": "₱",
+            "czk": "Kč",
+            "dkk": "kr",
+            "dop": "RD$",
+            "xcd": "$",
+            "egp": "£",
+            "svc": "$",
+            "eek": "kr",
+            "eur": "€",
+            "fkp": "£",
+            "fjd": "$",
+            "ghc": "¢",
+            "gip": "£",
+            "gtq": "Q",
+            "ggp": "£",
+            "gyd": "$",
+            "hnl": "L",
+            "hkd": "$",
+            "huf": "Ft",
+            "isk": "kr",
+            "inr": "₹",
+            "idr": "Rp",
+            "irr": "﷼",
+            "imp": "£",
+            "ils": "₪",
+            "jmd": "J$",
+            "jpy": "¥",
+            "jep": "£",
+            "kes": "KSh",
+            "kzt": "лв",
+            "kpw": "₩",
+            "krw": "₩",
+            "kgs": "лв",
+            "lak": "₭",
+            "lvl": "Ls",
+            "lbp": "£",
+            "lrd": "$",
+            "ltl": "Lt",
+            "mkd": "ден",
+            "myr": "RM",
+            "mur": "₨",
+            "mxn": "$",
+            "mnt": "₮",
+            "mzn": "MT",
+            "nad": "$",
+            "npr": "₨",
+            "ang": "ƒ",
+            "nzd": "$",
+            "nio": "C$",
+            "ngn": "₦",
+            "nok": "kr",
+            "omr": "﷼",
+            "pkr": "₨",
+            "pab": "B/.",
+            "pyg": "Gs",
+            "pen": "S/.",
+            "php": "₱",
+            "pln": "zł",
+            "qar": "﷼",
+            "ron": "lei",
+            "rub": "₽",
+            "shp": "£",
+            "sar": "﷼",
+            "rsd": "Дин.",
+            "scr": "₨",
+            "sgd": "$",
+            "sbd": "$",
+            "sos": "S",
+            "zar": "R",
+            "lkr": "₨",
+            "sek": "kr",
+            "chf": "CHF",
+            "srd": "$",
+            "syp": "£",
+            "tzs": "TSh",
+            "twd": "NT$",
+            "thb": "฿",
+            "ttd": "TT$",
+            "try": "",
+            "trl": "₤",
+            "tvd": "$",
+            "ugx": "USh",
+            "uah": "₴",
+            "gbp": "£",
+            "usd": "$",
+            "uyu": "$U",
+            "uzs": "лв",
+            "vef": "Bs",
+            "vnd": "₫",
+            "yer": "﷼",
+            "zwd": "Z$"
+        };
+
+        var currencyFormats = {
+            pre: "[[code]][[num]]",
+            post: "[[num]] [[code]]",
+            prespace: "[[code]] [[num]]"
+        };
+
+        Number.prototype.toLocaleString = function(locale, options) {
+            if (locale && locale.length < 2)
+                throw new RangeError("Invalid language tag: " + locale);
+
+            var sNum;
+            if (options && options.minimumFractionDigits) {
+                sNum = this.toFixed(options.minimumFractionDigits);
+            } else {
+                sNum = this.toString();
+            }
+
+            sNum = mapMatch(transformForLocale, locale)(sNum, options);
+
+            if(options && options.currency && options.style === "currency") {
+                var format = currencyFormats[mapMatch(currencyFormatMap, locale)];
+                if(options.currencyDisplay === "code") {
+                    sNum = renderFormat(format, {
+                        num: sNum,
+                        code: options.currency.toUpperCase()
+                    });
+                } else {
+                    sNum = renderFormat(format, {
+                        num: sNum,
+                        code: currencySymbols[options.currency.toLowerCase()]
+                    });
+                }
+            }
+
+            return sNum;
+        };
+    }
+
+}());
+
 function formatCurrency(amount,minfrac,maxfrac) {
-  if (minfrac === undefined) minfrac = 2;
-  if (maxfrac === undefined) maxfrac = 2;
+  minfrac = minfrac || 2;
+  maxfrac = maxfrac || 2;
 
   return (1 * amount).toLocaleString(globals.language.replace('_','-'), {
     style: 'currency',
@@ -213,8 +494,9 @@ function formatCurrency(amount,minfrac,maxfrac) {
 }
 
 function formatNumber(amount,minfrac,maxfrac) {
-  if (minfrac === undefined) minfrac = 0;
-  if (maxfrac === undefined) maxfrac = 3;
+  minfrac = minfrac || 0;
+  maxfrac = maxfrac || 3;
+
   return (1 * amount).toLocaleString(globals.language.replace('_','-'), {
     minimumFractionDigits: minfrac,
     maximumFractionDigits: maxfrac
@@ -1219,7 +1501,7 @@ function add_switch() {
                  form.find('input[name="switch_[nr]_dimmer_on_duration"]').val(),
                  form.find('input[name="switch_[nr]_dimmer_on_percentage"]').val(),
                  form.find('input[name="switch_[nr]_dimmer_off_duration"]').val(),
-                 form.find('input[name="switch_[nr]_dimmer_off_percentage"]').val(),
+                 form.find('input[name="switch_[nr]_dimmer_off_percentage"]').val()
                  );
 
   $('.new-switch-form').modal('hide');