diff --git a/ctrl/text.dat b/ctrl/text.dat index 5aba4e96c5c88da5564faed55bfec8aab4144683..da7b5a4a339edc54dd096dc48cdfbaaf035adce7 100644 --- a/ctrl/text.dat +++ b/ctrl/text.dat @@ -374,7 +374,7 @@ "\r\n\1n\1gLibrary :\1h (%u) %s" 314 FiLib "\r\n\1n\1gDirectory :\1h (%u) %s" 315 FiDir "\r\n\1n\1gFilename :\1h %s" 316 FiFilename -"\r\n\1n\1gFile size :\1h %s" 317 FiFileSize +"\r\n\1n\1gFile size :\1h %s (%s) bytes" 317 FiFileSize "\r\n\1n\1gCredit value :\1h %s" 318 FiCredits "\r\n\1n\1gDescription :\1h %s" 319 FiDescription "\r\n\1n\1gUploaded by :\1h %s" 320 FiUploadedBy diff --git a/src/sbbs3/file.cpp b/src/sbbs3/file.cpp index 491b8053f45ff63613dfb02221c06c8b5fbd6f71..18b8c54f1d2589ffaef01932544ca1a0decdb7a1 100644 --- a/src/sbbs3/file.cpp +++ b/src/sbbs3/file.cpp @@ -43,6 +43,7 @@ void sbbs_t::fileinfo(file_t* f) { char ext[513]; char tmp[512]; + char tmp2[64]; char path[MAX_PATH+1]; char fname[MAX_PATH+1]; char* real_fname; @@ -66,7 +67,8 @@ void sbbs_t::fileinfo(file_t* f) bprintf(text[FiFilename], real_fname); if(f->size!=-1L) - bprintf(text[FiFileSize],ultoac(f->size,tmp)); + bprintf(text[FiFileSize],ultoac(f->size,tmp) + , byte_estimate_to_str(f->size, tmp2, sizeof(tmp2), /* units: */1024, /* precision: */1)); bprintf(text[FiCredits] ,(cfg.dir[f->dir]->misc&DIR_FREE || !f->cdt) ? "FREE" : ultoac(f->cdt,tmp)); bprintf(text[FiDescription],f->desc); diff --git a/src/sbbs3/qwk.cpp b/src/sbbs3/qwk.cpp index ba8e0f80f2776862a62d246289c49fe4d36dafe3..19e995ee12f4b857874ff338b90ef6c77fd86089 100644 --- a/src/sbbs3/qwk.cpp +++ b/src/sbbs3/qwk.cpp @@ -647,7 +647,8 @@ void sbbs_t::qwk_sec() l=(long)flength(str); bprintf(text[FiFilename],getfname(str)); - bprintf(text[FiFileSize],ultoac(l,tmp)); + bprintf(text[FiFileSize],ultoac(l,tmp) + , byte_estimate_to_str(l, tmp2, sizeof(tmp), /* units: */1024, /* precision: */1)); if(l>0L && cur_cps) i=l/(ulong)cur_cps; else diff --git a/src/sbbs3/text_defaults.c b/src/sbbs3/text_defaults.c index 9718bc6fe51c9ac05805293671e0275393a3c3b5..eed0701a101ded2b7d66f3c2b20a9748cf9e2102 100644 --- a/src/sbbs3/text_defaults.c +++ b/src/sbbs3/text_defaults.c @@ -509,7 +509,8 @@ const char * const text_defaults[TOTAL_TEXT]={ ,"\x0d\x0a\x01\x6e\x01\x67\x44\x69\x72\x65\x63\x74\x6f\x72\x79\x20\x20\x20\x20\x20\x20\x20\x20\x3a\x01\x68\x20\x28\x25\x75\x29\x20" "\x25\x73" // 315 FiDir ,"\x0d\x0a\x01\x6e\x01\x67\x46\x69\x6c\x65\x6e\x61\x6d\x65\x20\x20\x20\x20\x20\x20\x20\x20\x20\x3a\x01\x68\x20\x25\x73" // 316 FiFilename - ,"\x0d\x0a\x01\x6e\x01\x67\x46\x69\x6c\x65\x20\x73\x69\x7a\x65\x20\x20\x20\x20\x20\x20\x20\x20\x3a\x01\x68\x20\x25\x73" // 317 FiFileSize + ,"\x0d\x0a\x01\x6e\x01\x67\x46\x69\x6c\x65\x20\x73\x69\x7a\x65\x20\x20\x20\x20\x20\x20\x20\x20\x3a\x01\x68\x20\x25\x73\x20\x28\x25" + "\x73\x29\x20\x62\x79\x74\x65\x73" // 317 FiFileSize ,"\x0d\x0a\x01\x6e\x01\x67\x43\x72\x65\x64\x69\x74\x20\x76\x61\x6c\x75\x65\x20\x20\x20\x20\x20\x3a\x01\x68\x20\x25\x73" // 318 FiCredits ,"\x0d\x0a\x01\x6e\x01\x67\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x20\x20\x20\x20\x20\x3a\x01\x68\x20\x25\x73" // 319 FiDescription ,"\x0d\x0a\x01\x6e\x01\x67\x55\x70\x6c\x6f\x61\x64\x65\x64\x20\x62\x79\x20\x20\x20\x20\x20\x20\x3a\x01\x68\x20\x25\x73" // 320 FiUploadedBy