Adding locale option which overrides separator, fixes #96

Author: avoidwork

README.md

@@ -23,6 +23,9 @@ _*(boolean)*_ Enables full form of unit of measure, default is `false`
 ### fullforms
 _*(array)*_ Array of full form overrides, default is `[]`
 
+### locale (overrides 'separator')
+_*(string)*_ BCP 47 language tag, default is `""`
+
 ### output
 _*(string)*_ Output of function (`array`, `exponent`, `object`, or `string`), default is `string`
 
@@ -62,6 +65,7 @@ filesize(265318, {standard: "iec"});  // "259.1 KiB"
 filesize(265318, {standard: "iec", fullform: true}); // "259.1 kibibytes"
 filesize(12, {fullform: true, fullforms: ["байтов"]});  // "12 байтов"
 filesize(265318, {separator: ","});   // "259,1 KB"
+filesize(265318, {locale: "de"});   // "259,1 KB"
 ```
 
 ## Partial Application

lib/filesize.es6.js

@@ -3,7 +3,7 @@
  *
  * @copyright 2019 Jason Mulligan <[email protected]>
  * @license BSD-3-Clause
- * @version 4.0.0
+ * @version 4.1.0
  */
 (function (global) {
 	const b = /^(b|B)$/,
@@ -33,7 +33,7 @@
 	function filesize (arg, descriptor = {}) {
 		let result = [],
 			val = 0,
-			e, base, bits, ceil, full, fullforms, neg, num, output, round, unix, separator, spacer, standard, symbols;
+			e, base, bits, ceil, full, fullforms, locale, neg, num, output, round, unix, separator, spacer, standard, symbols;
 
 		if (isNaN(arg)) {
 			throw new Error("Invalid arguments");
@@ -43,7 +43,8 @@
 		unix = descriptor.unix === true;
 		base = descriptor.base || 2;
 		round = descriptor.round !== void 0 ? descriptor.round : unix ? 1 : 2;
-		separator = descriptor.separator !== void 0 ? descriptor.separator || "" : "";
+		locale = descriptor.locale !== void 0 ? descriptor.locale : "";
+		separator = descriptor.separator !== void 0 ? descriptor.separator : "";
 		spacer = descriptor.spacer !== void 0 ? descriptor.spacer : unix ? "" : " ";
 		symbols = descriptor.symbols || {};
 		standard = base === 2 ? descriptor.standard || "jedec" : "jedec";
@@ -128,7 +129,9 @@
 			result[1] = fullforms[e] ? fullforms[e] : fullform[standard][e] + (bits ? "bit" : "byte") + (result[0] === 1 ? "" : "s");
 		}
 
-		if (separator.length > 0) {
+		if (locale.length > 0) {
+			result[0] = result[0].toLocaleString(locale);
+		} else if (separator.length > 0) {
 			result[0] = result[0].toString().replace(".", separator);
 		}
 

lib/filesize.es6.min.js

@@ -5,7 +5,7 @@
  *
  * @copyright 2019 Jason Mulligan <[email protected]>
  * @license BSD-3-Clause
- * @version 4.0.0
+ * @version 4.1.0
  */
 (function (global) {
 	var b = /^(b|B)$/,
@@ -43,6 +43,7 @@
 		    ceil = void 0,
 		    full = void 0,
 		    fullforms = void 0,
+		    locale = void 0,
 		    neg = void 0,
 		    num = void 0,
 		    output = void 0,
@@ -61,7 +62,8 @@
 		unix = descriptor.unix === true;
 		base = descriptor.base || 2;
 		round = descriptor.round !== void 0 ? descriptor.round : unix ? 1 : 2;
-		separator = descriptor.separator !== void 0 ? descriptor.separator || "" : "";
+		locale = descriptor.locale !== void 0 ? descriptor.locale : "";
+		separator = descriptor.separator !== void 0 ? descriptor.separator : "";
 		spacer = descriptor.spacer !== void 0 ? descriptor.spacer : unix ? "" : " ";
 		symbols = descriptor.symbols || {};
 		standard = base === 2 ? descriptor.standard || "jedec" : "jedec";
@@ -146,7 +148,9 @@
 			result[1] = fullforms[e] ? fullforms[e] : fullform[standard][e] + (bits ? "bit" : "byte") + (result[0] === 1 ? "" : "s");
 		}
 
-		if (separator.length > 0) {
+		if (locale.length > 0) {
+			result[0] = result[0].toLocaleString(locale);
+		} else if (separator.length > 0) {
 			result[0] = result[0].toString().replace(".", separator);
 		}
 

lib/filesize.es6.min.js.map

@@ -1,7 +1,7 @@
 {
   "name": "filesize",
   "description": "JavaScript library to generate a human readable String describing the file size",
-  "version": "4.0.0",
+  "version": "4.1.0",
   "homepage": "https://filesizejs.com",
   "author": "Jason Mulligan <[email protected]>",
   "repository": {

lib/filesize.js

@@ -9,7 +9,7 @@
 	function filesize (arg, descriptor = {}) {
 		let result = [],
 			val = 0,
-			e, base, bits, ceil, full, fullforms, neg, num, output, round, unix, separator, spacer, standard, symbols;
+			e, base, bits, ceil, full, fullforms, locale, neg, num, output, round, unix, separator, spacer, standard, symbols;
 
 		if (isNaN(arg)) {
 			throw new Error("Invalid arguments");
@@ -19,7 +19,8 @@
 		unix = descriptor.unix === true;
 		base = descriptor.base || 2;
 		round = descriptor.round !== void 0 ? descriptor.round : unix ? 1 : 2;
-		separator = descriptor.separator !== void 0 ? descriptor.separator || "" : "";
+		locale = descriptor.locale !== void 0 ? descriptor.locale : "";
+		separator = descriptor.separator !== void 0 ? descriptor.separator : "";
 		spacer = descriptor.spacer !== void 0 ? descriptor.spacer : unix ? "" : " ";
 		symbols = descriptor.symbols || {};
 		standard = base === 2 ? descriptor.standard || "jedec" : "jedec";
@@ -104,7 +105,9 @@
 			result[1] = fullforms[e] ? fullforms[e] : fullform[standard][e] + (bits ? "bit" : "byte") + (result[0] === 1 ? "" : "s");
 		}
 
-		if (separator.length > 0) {
+		if (locale.length > 0) {
+			result[0] = result[0].toLocaleString(locale);
+		} else if (separator.length > 0) {
 			result[0] = result[0].toString().replace(".", separator);
 		}
 

lib/filesize.min.js

@@ -154,5 +154,11 @@ exports.filesize = {
 		test.equal(filesize(1040, {separator: ""}), "1.02 KB", "Should be '1.02 KB'");
 		test.equal(filesize(1040, {separator: ","}), "1,02 KB", "Should be '1,02 KB'");
 		test.done();
+	},
+	locale: function (test) {
+		test.expect(2);
+		test.equal(filesize(1040, {locale: ""}), "1.02 KB", "Should be '1.02 KB'");
+		test.equal(filesize(1040, {locale: "de"}), Number(1.02).toLocaleString("de") + " KB", "Should be '" + Number(1.02).toLocaleString("de") + " KB'");
+		test.done();
 	}
 };