Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Accept the locale for the file size of the format #16383

Merged
merged 1 commit into from
Dec 6, 2024
Merged

Accept the locale for the file size of the format #16383

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions src/app/components/fileupload/fileupload.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
EventEmitter,
Inject,
Input,
LOCALE_ID,
NgModule,
NgZone,
OnDestroy,
Expand Down Expand Up @@ -527,17 +528,22 @@ export class FileUpload implements AfterViewInit, AfterContentInit, OnInit, OnDe

private fileUploadSubcription: Subscription;

private formatter;

constructor(
@Inject(DOCUMENT) private document: Document,
@Inject(PLATFORM_ID) private platformId: any,
@Inject(LOCALE_ID) private locale: string,
private renderer: Renderer2,
private el: ElementRef,
public sanitizer: DomSanitizer,
public zone: NgZone,
private http: HttpClient,
public cd: ChangeDetectorRef,
public config: PrimeNGConfig
) {}
) {
this.formatter = new Intl.NumberFormat(this.locale, { maximumFractionDigits: 3 })
}

ngAfterContentInit() {
this.templates?.forEach((item) => {
Expand Down Expand Up @@ -952,15 +958,14 @@ export class FileUpload implements AfterViewInit, AfterContentInit, OnInit, OnDe

formatSize(bytes: number) {
const k = 1024;
const dm = 3;
const sizes = this.getTranslation(TranslationKeys.FILE_SIZE_TYPES);

if (bytes === 0) {
return `0 ${sizes[0]}`;
}

const i = Math.floor(Math.log(bytes) / Math.log(k));
const formattedSize = (bytes / Math.pow(k, i)).toFixed(dm);
const formattedSize = this.formatter.format(bytes / Math.pow(k, i));

return `${formattedSize} ${sizes[i]}`;
}
Expand Down