mirrors
/
donphan
mirror of https://github.com/Siphonay/mastodon
1
0
Fork 0
Code Releases Activity

[Glitch] Fix shortNumberFormat to within 3 chars without units 

Port 0e8c0287d0 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
This commit is contained in:
Takeshi Umeda 2019-12-30 00:59:25 +09:00 committed by Thibaut Girka
parent 01eaeab56d
commit 83359fef2b
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/flavours/glitch/styles/components/accounts.scss
View File

@ -681,13 +681,13 @@
&__links { &__links {
font-size: 14px; font-size: 14px;
color: $darker-text-color; color: $darker-text-color;
padding: 10px 0;
a { a {
display: inline-block; display: inline-block;
color: $darker-text-color; color: $darker-text-color;
text-decoration: none; text-decoration: none;
padding: 10px; padding: 5px 10px;
padding-top: 20px;
font-weight: 500; font-weight: 500;
strong { strong {

8
app/javascript/flavours/glitch/util/numbers.js
View File

@ -4,9 +4,13 @@ import { FormattedNumber } from 'react-intl';
export const shortNumberFormat = number => { export const shortNumberFormat = number => {
if (number < 1000) { if (number < 1000) {
return <FormattedNumber value={number} />; return <FormattedNumber value={number} />;
} else if (number < 1000000) { } else if (number < 10000) {
return <Fragment><FormattedNumber value={number / 1000} maximumFractionDigits={1} />K</Fragment>; return <Fragment><FormattedNumber value={number / 1000} maximumFractionDigits={1} />K</Fragment>;
} else { } else if (number < 1000000) {
return <Fragment><FormattedNumber value={number / 1000} maximumFractionDigits={0} />K</Fragment>;
} else if (number < 10000000) {
return <Fragment><FormattedNumber value={number / 1000000} maximumFractionDigits={1} />M</Fragment>; return <Fragment><FormattedNumber value={number / 1000000} maximumFractionDigits={1} />M</Fragment>;
} else {
return <Fragment><FormattedNumber value={number / 1000000} maximumFractionDigits={0} />M</Fragment>;
} }
}; };