mirror of
https://github.com/gorhill/uBlock.git
synced 2024-09-18 08:52:26 +02:00
Use large units for large values in Settings pane
Shorten "Storage used" values using large units, i.e. shorten rendered values using KB, MB, and GB for large figures.
This commit is contained in:
parent
64cb7fa843
commit
04c07f3e10
@ -361,7 +361,7 @@
|
|||||||
},
|
},
|
||||||
"settingsStorageUsed":{
|
"settingsStorageUsed":{
|
||||||
"message":"Storage used: {{value}} bytes",
|
"message":"Storage used: {{value}} bytes",
|
||||||
"description":"English: Storage used: {{}} bytes"
|
"description":"Deprecated, will be removed"
|
||||||
},
|
},
|
||||||
"settingsLastRestorePrompt":{
|
"settingsLastRestorePrompt":{
|
||||||
"message":"Last restore:",
|
"message":"Last restore:",
|
||||||
@ -1007,6 +1007,22 @@
|
|||||||
"message":"Relax blocking mode",
|
"message":"Relax blocking mode",
|
||||||
"description":"Label for keyboard shortcut used to relax blocking mode (meant to replace 'Toggle blocking profile')"
|
"description":"Label for keyboard shortcut used to relax blocking mode (meant to replace 'Toggle blocking profile')"
|
||||||
},
|
},
|
||||||
|
"storageUsed":{
|
||||||
|
"message":"Storage used: {{value}} {{unit}}",
|
||||||
|
"description":" In Setting pane, renders as (example): Storage used: 13.2 MB"
|
||||||
|
},
|
||||||
|
"KB":{
|
||||||
|
"message":"KB",
|
||||||
|
"description":"short for 'kilobytes'"
|
||||||
|
},
|
||||||
|
"MB":{
|
||||||
|
"message":"MB",
|
||||||
|
"description":"short for 'megabytes'"
|
||||||
|
},
|
||||||
|
"GB":{
|
||||||
|
"message":"GB",
|
||||||
|
"description":"short for 'gigabytes'"
|
||||||
|
},
|
||||||
"dummy":{
|
"dummy":{
|
||||||
"message":"This entry must be the last one",
|
"message":"This entry must be the last one",
|
||||||
"description":"so we dont need to deal with comma for last entry"
|
"description":"so we dont need to deal with comma for last entry"
|
||||||
|
@ -117,11 +117,29 @@ const exportToFile = async function() {
|
|||||||
/******************************************************************************/
|
/******************************************************************************/
|
||||||
|
|
||||||
const onLocalDataReceived = function(details) {
|
const onLocalDataReceived = function(details) {
|
||||||
uDom.nodeFromId('storageUsed').textContent =
|
let storageUsed;
|
||||||
vAPI.i18n('settingsStorageUsed').replace(
|
if ( typeof details.storageUsed === 'number' ) {
|
||||||
'{{value}}',
|
const units = [
|
||||||
typeof details.storageUsed === 'number' ? details.storageUsed.toLocaleString() : '?'
|
vAPI.i18n('genericBytes'),
|
||||||
);
|
vAPI.i18n('KB'),
|
||||||
|
vAPI.i18n('MB'),
|
||||||
|
vAPI.i18n('GB'),
|
||||||
|
];
|
||||||
|
const s = details.storageUsed.toLocaleString(undefined, {
|
||||||
|
maximumSignificantDigits: 3,
|
||||||
|
notation: 'engineering',
|
||||||
|
});
|
||||||
|
const pos = s.lastIndexOf('E');
|
||||||
|
const vu = parseInt(s.slice(pos + 1), 10) / 3;
|
||||||
|
const vm = parseFloat(s.slice(0, pos));
|
||||||
|
storageUsed =
|
||||||
|
vAPI.i18n('storageUsed')
|
||||||
|
.replace('{{value}}', vm.toLocaleString())
|
||||||
|
.replace('{{unit}}', units[vu]);
|
||||||
|
} else {
|
||||||
|
storageUsed = '?';
|
||||||
|
}
|
||||||
|
uDom.nodeFromId('storageUsed').textContent = storageUsed;
|
||||||
|
|
||||||
const timeOptions = {
|
const timeOptions = {
|
||||||
weekday: 'long',
|
weekday: 'long',
|
||||||
|
@ -41,7 +41,7 @@
|
|||||||
<hr>
|
<hr>
|
||||||
<div id="localData" class="fieldset">
|
<div id="localData" class="fieldset">
|
||||||
<div>
|
<div>
|
||||||
<div id="storageUsed" class="li"></div>
|
<div id="storageUsed"></div>
|
||||||
<div class="li" id="settingsLastBackupPrompt" style="display:none;"></div>
|
<div class="li" id="settingsLastBackupPrompt" style="display:none;"></div>
|
||||||
<div class="li" id="settingsLastRestorePrompt" style="display:none;"></div>
|
<div class="li" id="settingsLastRestorePrompt" style="display:none;"></div>
|
||||||
</div>
|
</div>
|
||||||
|
Loading…
Reference in New Issue
Block a user