Fix #4872: Added filesizeTypes Locale (#4870)

* Added fileSizeTypes * refactor formatSize and added localeOption fileupload * Added fileSizeTypes * refactor formatSize and added localeOption fileupload * Added translation fileupload * added format
primefaces · Sep 3, 2023 · 0bf4b83 · 0bf4b83
1 parent 8fc1f20
commit 0bf4b83
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 6 deletions.
diff --git a/components/doc/common/apidoc/index.json b/components/doc/common/apidoc/index.json
@@ -1709,6 +1709,20 @@
                             "type": "string",
                             "description": "Close"
                         },
+                        {
+                            "name": "pending",
+                            "optional": true,
+                            "readonly": false,
+                            "type": "string",
+                            "description": "Pending"
+                        },
+                        {
+                            "name": "fileSizeTypes",
+                            "optional": true,
+                            "readonly": false,
+                            "type": "string[]",
+                            "description": "['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB']"
+                        },
                         {
                             "name": "dayNames",
                             "optional": true,

diff --git a/components/lib/api/Locale.js b/components/lib/api/Locale.js
@@ -31,6 +31,8 @@ let locales = {
         choose: 'Choose',
         upload: 'Upload',
         cancel: 'Cancel',
+        pending: 'Pending',
+        fileSizeTypes: ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'],
         dayNames: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'],
         dayNamesShort: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
         dayNamesMin: ['Su', 'Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa'],

diff --git a/components/lib/api/api.d.ts b/components/lib/api/api.d.ts
@@ -815,6 +815,14 @@ export interface LocaleOptions {
      * Close
      */
     close?: string;
+    /**
+     * Pending
+     */
+    pending?: string;
+    /**
+     * ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB']
+     */
+    fileSizeTypes?: string[];
     /**
      * ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday']
      */

diff --git a/components/lib/fileupload/FileUpload.js b/components/lib/fileupload/FileUpload.js
@@ -99,16 +99,18 @@ export const FileUpload = React.memo(
         };
 
         const formatSize = (bytes) => {
+            const k = 1024;
+            const dm = 3;
+            const sizes = localeOption('fileSizeTypes');
+
             if (bytes === 0) {
-                return '0 B';
+                return `0 ${sizes[0]}`;
             }
 
-            let k = 1000,
-                dm = 3,
-                sizes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'],
-                i = Math.floor(Math.log(bytes) / Math.log(k));
+            const i = Math.floor(Math.log(bytes) / Math.log(k));
+            const formattedSize = parseFloat((bytes / Math.pow(k, i)).toFixed(dm));
 
-            return parseFloat((bytes / Math.pow(k, i)).toFixed(dm)) + ' ' + sizes[i];
+            return `${formattedSize} ${sizes[i]}`;
         };
 
         const onFileSelect = (event) => {

diff --git a/components/lib/hooks/useLocale.js b/components/lib/hooks/useLocale.js
@@ -34,6 +34,8 @@ let locales = {
         choose: 'Choose',
         upload: 'Upload',
         cancel: 'Cancel',
+        pending: 'Pending',
+        fileSizeTypes: ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'],
         dayNames: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'],
         dayNamesShort: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
         dayNamesMin: ['Su', 'Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa'],