diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-10-25 14:05:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-25 14:05:20 +0200 |
| commit | 116268a2b594938b9adec2ee65ef4b0391327630 (patch) | |
| tree | 111ccf1ff0776b4185a15b21fb4281a3ba32a9b7 /core/js/js.js | |
| parent | 49c49d584834f7a5fa21edb5a0a3069c8c14291a (diff) | |
| parent | d5e142a33653431eb2f608401e5ae0ba5e532c4c (diff) | |
| download | nextcloud-server-116268a2b594938b9adec2ee65ef4b0391327630.tar.gz nextcloud-server-116268a2b594938b9adec2ee65ef4b0391327630.zip | |
Merge pull request #11893 from caugner/7837-filesize-format-with-locale
Formats file sizes using the user's locale
Diffstat (limited to 'core/js/js.js')
| -rw-r--r-- | core/js/js.js | 13 |
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; } |