natty
/
fox-send
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #639 from mozilla/i586 

wrap number localization in try/catch
This commit is contained in:
Danny Coates 2017-11-09 14:17:11 -08:00 committed by GitHub
parent e9a49e23e8 deabca5a94
commit 84b2737ffb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/utils.js
View File

@ -105,19 +105,32 @@ function bytes(num) {
} }
const exponent = Math.min(Math.floor(Math.log10(num) / 3), UNITS.length - 1); const exponent = Math.min(Math.floor(Math.log10(num) / 3), UNITS.length - 1);
const n = Number(num / Math.pow(1000, exponent)); const n = Number(num / Math.pow(1000, exponent));
const nStr = LOCALIZE_NUMBERS let nStr = n.toFixed(1);
? n.toLocaleString(navigator.languages, { if (LOCALIZE_NUMBERS) {
try {
nStr = n.toLocaleString(navigator.languages.map(l => l.split(';')[0]), {
minimumFractionDigits: 1, minimumFractionDigits: 1,
maximumFractionDigits: 1 maximumFractionDigits: 1
}) });
: n.toFixed(1); } catch (e) {
// fall through
}
}
return `${nStr}${UNITS[exponent]}`; return `${nStr}${UNITS[exponent]}`;
} }
function percent(ratio) { function percent(ratio) {
return LOCALIZE_NUMBERS if (LOCALIZE_NUMBERS) {
? ratio.toLocaleString(navigator.languages, { style: 'percent' }) try {
: `${Math.floor(ratio * 100)}%`; return ratio.toLocaleString(
navigator.languages.map(l => l.split(';')[0]),
{ style: 'percent' }
);
} catch (e) {
// fall through
}
}
return `${Math.floor(ratio * 100)}%`;
} }
function allowedCopy() { function allowedCopy() {