aboutsummaryrefslogtreecommitdiffstats
path: root/core/js/js.js
diff options
context:
space:
mode:
Diffstat (limited to 'core/js/js.js')
-rw-r--r--core/js/js.js13
1 files changed, 13 insertions, 0 deletions
diff --git a/core/js/js.js b/core/js/js.js
index 12c47d546c1..880b986e17b 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -771,6 +771,16 @@ var OCP = {},
},
/**
+ * Returns the user's locale as a BCP 47 compliant language tag
+ *
+ * @return {String} locale string
+ */
+ getCanonicalLocale: function() {
+ var locale = this.getLocale();
+ return typeof locale === 'string' ? locale.replace(/_/g, '-') : locale;
+ },
+
+ /**
* Returns the user's locale
*
* @return {String} locale string
@@ -1843,6 +1853,9 @@ function humanFileSize(size, skipSmallSizes) {
else if(relativeSize.substr(relativeSize.length-2,2)==='.0'){
relativeSize=relativeSize.substr(0,relativeSize.length-2);
}
+ else{
+ relativeSize = parseFloat(relativeSize).toLocaleString(OC.getCanonicalLocale());
+ }
return relativeSize + ' ' + readableFormat;
}