diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts index a80d81599..1018fa0de 100644 --- a/frontend/src/app/app.module.ts +++ b/frontend/src/app/app.module.ts @@ -43,11 +43,10 @@ import { NgbTypeaheadModule } from '@ng-bootstrap/ng-bootstrap'; import { FeesBoxComponent } from './components/fees-box/fees-box.component'; import { DashboardComponent } from './dashboard/dashboard.component'; import { FontAwesomeModule, FaIconLibrary } from '@fortawesome/angular-fontawesome'; -import { faAngleDoubleDown, faAngleDoubleUp, faAngleDown, faAngleUp, faBolt, faChartArea, faCogs, faCubes, faDatabase, faExchangeAlt, faInfoCircle, +import { faAngleDown, faAngleUp, faBolt, faChartArea, faCogs, faCubes, faDatabase, faExchangeAlt, faInfoCircle, faLink, faList, faSearch, faTachometerAlt, faThList, faTint, faTv } from '@fortawesome/free-solid-svg-icons'; import { ApiDocsComponent } from './components/api-docs/api-docs.component'; import { TermsOfServiceComponent } from './components/terms-of-service/terms-of-service.component'; -import { TranslationStringsComponent } from './components/translation-strings/translation-strings.component'; import { StorageService } from './services/storage.service'; @NgModule({ @@ -83,7 +82,6 @@ import { StorageService } from './services/storage.service'; DashboardComponent, ApiDocsComponent, TermsOfServiceComponent, - TranslationStringsComponent, ], imports: [ BrowserModule, diff --git a/frontend/src/app/assets/assets.component.ts b/frontend/src/app/assets/assets.component.ts index 40a4a29be..2ae0f21d5 100644 --- a/frontend/src/app/assets/assets.component.ts +++ b/frontend/src/app/assets/assets.component.ts @@ -6,6 +6,7 @@ import { distinctUntilChanged, map, filter, mergeMap, tap, take } from 'rxjs/ope import { ActivatedRoute, Router } from '@angular/router'; import { merge, combineLatest, Observable } from 'rxjs'; import { AssetExtended } from '../interfaces/electrs.interface'; +import { SeoService } from '../services/seo.service'; @Component({ selector: 'app-assets', @@ -32,9 +33,11 @@ export class AssetsComponent implements OnInit { private formBuilder: FormBuilder, private route: ActivatedRoute, private router: Router, + private seoService: SeoService, ) { } ngOnInit() { + this.seoService.setTitle($localize`:@@ee8f8008bae6ce3a49840c4e1d39b4af23d4c263:Assets`); this.itemsPerPage = Math.max(Math.round(this.contentSpace / this.fiveItemsPxSize) * 5, 10); this.searchForm = this.formBuilder.group({ diff --git a/frontend/src/app/bisq/bisq-address/bisq-address.component.ts b/frontend/src/app/bisq/bisq-address/bisq-address.component.ts index f3968fcf0..aded75d8e 100644 --- a/frontend/src/app/bisq/bisq-address/bisq-address.component.ts +++ b/frontend/src/app/bisq/bisq-address/bisq-address.component.ts @@ -36,7 +36,7 @@ export class BisqAddressComponent implements OnInit, OnDestroy { this.transactions = null; document.body.scrollTo(0, 0); this.addressString = params.get('id') || ''; - this.seoService.setTitle('Address: ' + this.addressString); + this.seoService.setTitle($localize`:@@bisq-address.component.browser-title:Address: ${this.addressString}:INTERPOLATION:`); return this.bisqApiService.getAddress$(this.addressString) .pipe( diff --git a/frontend/src/app/bisq/bisq-block/bisq-block.component.ts b/frontend/src/app/bisq/bisq-block/bisq-block.component.ts index 6980f3ae8..6e59bfa42 100644 --- a/frontend/src/app/bisq/bisq-block/bisq-block.component.ts +++ b/frontend/src/app/bisq/bisq-block/bisq-block.component.ts @@ -82,7 +82,7 @@ export class BisqBlockComponent implements OnInit, OnDestroy { } this.isLoading = false; this.blockHeight = block.height; - this.seoService.setTitle('Block: #' + block.height + ': ' + block.hash); + this.seoService.setTitle($localize`:@@bisq-block.component.browser-title:Block ${block.height}:INTERPOLATION:: ${block.hash}:INTERPOLATION:`); this.block = block; }); } diff --git a/frontend/src/app/bisq/bisq-blocks/bisq-blocks.component.html b/frontend/src/app/bisq/bisq-blocks/bisq-blocks.component.html index e1953ec63..629dc78a7 100644 --- a/frontend/src/app/bisq/bisq-blocks/bisq-blocks.component.html +++ b/frontend/src/app/bisq/bisq-blocks/bisq-blocks.component.html @@ -1,5 +1,5 @@
-

Blocks

+

Blocks


@@ -9,15 +9,15 @@
- - - - + + + + - + diff --git a/frontend/src/app/bisq/bisq-blocks/bisq-blocks.component.ts b/frontend/src/app/bisq/bisq-blocks/bisq-blocks.component.ts index 86c161b02..ee4108ae5 100644 --- a/frontend/src/app/bisq/bisq-blocks/bisq-blocks.component.ts +++ b/frontend/src/app/bisq/bisq-blocks/bisq-blocks.component.ts @@ -32,7 +32,7 @@ export class BisqBlocksComponent implements OnInit { ) { } ngOnInit(): void { - this.seoService.setTitle('Blocks'); + this.seoService.setTitle($localize`:@@8a7b4bd44c0ac71b2e72de0398b303257f7d2f54:Blocks`); this.itemsPerPage = Math.max(Math.round(this.contentSpace / this.fiveItemsPxSize) * 5, 10); this.loadingItems = Array(this.itemsPerPage); if (document.body.clientWidth < 768) { diff --git a/frontend/src/app/bisq/bisq-stats/bisq-stats.component.html b/frontend/src/app/bisq/bisq-stats/bisq-stats.component.html index b34cc17ce..447c4f1aa 100644 --- a/frontend/src/app/bisq/bisq-stats/bisq-stats.component.html +++ b/frontend/src/app/bisq/bisq-stats/bisq-stats.component.html @@ -1,5 +1,5 @@
-

BSQ Statistics

+

BSQ statistics


@@ -7,41 +7,37 @@
HeightConfirmedTotal SentTransactionsHeightConfirmedTotal sentTransactions
{{ block.height }} ago {{ calculateTotalOutput(block) / 100 | number: '1.2-2' }} BSQ {{ block.txs.length }}
- - - - - + - + - + - + - + - + - + - + @@ -55,23 +51,23 @@ - + - + - + - + - + @@ -79,11 +75,11 @@ - + - + diff --git a/frontend/src/app/bisq/bisq-stats/bisq-stats.component.ts b/frontend/src/app/bisq/bisq-stats/bisq-stats.component.ts index 9b58e621e..53f2051ae 100644 --- a/frontend/src/app/bisq/bisq-stats/bisq-stats.component.ts +++ b/frontend/src/app/bisq/bisq-stats/bisq-stats.component.ts @@ -21,8 +21,7 @@ export class BisqStatsComponent implements OnInit { ) { } ngOnInit() { - this.seoService.setTitle('BSQ Statistics'); - + this.seoService.setTitle($localize`:@@2a30a4cdb123a03facc5ab8c5b3e6d8b8dbbc3d4:BSQ statistics`); this.stateService.bsqPrice$ .subscribe((bsqPrice) => { this.price = bsqPrice; diff --git a/frontend/src/app/bisq/bisq-transaction/bisq-transaction.component.html b/frontend/src/app/bisq/bisq-transaction/bisq-transaction.component.html index 7da741274..dfac3c929 100644 --- a/frontend/src/app/bisq/bisq-transaction/bisq-transaction.component.html +++ b/frontend/src/app/bisq/bisq-transaction/bisq-transaction.component.html @@ -4,7 +4,7 @@ - +
diff --git a/frontend/src/app/bisq/bisq-transaction/bisq-transaction.component.ts b/frontend/src/app/bisq/bisq-transaction/bisq-transaction.component.ts index 50b880113..2dd745762 100644 --- a/frontend/src/app/bisq/bisq-transaction/bisq-transaction.component.ts +++ b/frontend/src/app/bisq/bisq-transaction/bisq-transaction.component.ts @@ -43,7 +43,7 @@ export class BisqTransactionComponent implements OnInit, OnDestroy { this.error = null; document.body.scrollTo(0, 0); this.txId = params.get('id') || ''; - this.seoService.setTitle('Transaction: ' + this.txId); + this.seoService.setTitle($localize`:@@bisq.transaction.browser-title:Transaction: ${this.txId}:INTERPOLATION:`); if (history.state.data) { return of(history.state.data); } diff --git a/frontend/src/app/bisq/bisq-transactions/bisq-transactions.component.html b/frontend/src/app/bisq/bisq-transactions/bisq-transactions.component.html index 371cc9edd..a261ecab5 100644 --- a/frontend/src/app/bisq/bisq-transactions/bisq-transactions.component.html +++ b/frontend/src/app/bisq/bisq-transactions/bisq-transactions.component.html @@ -1,5 +1,5 @@
-

Transactions

+

Transactions

@@ -15,11 +15,11 @@
PropertyValue
Existing amountExisting amount {{ (stats.minted - stats.burnt) / 100 | number: '1.2-2' }} BSQ
Minted amountMinted amount {{ stats.minted | number: '1.2-2' }} BSQ
Burnt amountBurnt amount {{ stats.burnt | number: '1.2-2' }} BSQ
AddressesAddresses {{ stats.addresses | number }}
Unspent TXOsUnspent TXOs {{ stats.unspent_txos | number }}
Spent TXOsSpent TXOs {{ stats.spent_txos | number }}
PricePrice
Market capMarket cap
Existing amountExisting amount
Minted amountMinted amount
Burnt amountBurnt amount
AddressesAddresses
Unspent TXOsUnspent TXOs
PricePrice
Market capMarket cap
- - - - - + + + + + @@ -37,7 +37,7 @@ {{ calculateTotalOutput(tx.outputs) / 100 | number: '1.2-2' }} BSQ - + diff --git a/frontend/src/app/bisq/bisq-transactions/bisq-transactions.component.ts b/frontend/src/app/bisq/bisq-transactions/bisq-transactions.component.ts index 7c9859511..c46c8fdfa 100644 --- a/frontend/src/app/bisq/bisq-transactions/bisq-transactions.component.ts +++ b/frontend/src/app/bisq/bisq-transactions/bisq-transactions.component.ts @@ -52,7 +52,9 @@ export class BisqTransactionsComponent implements OnInit { }; txTypeDropdownTexts: IMultiSelectTexts = { - defaultTitle: 'Filter', + defaultTitle: $localize`:@@bisq-transactions.filter:Filter`, + checkAll: $localize`:@@bisq-transactions.selectall:Select all`, + uncheckAll: $localize`:@@bisq-transactions.unselectall:Unselect all`, }; // @ts-ignore @@ -72,7 +74,7 @@ export class BisqTransactionsComponent implements OnInit { ) { } ngOnInit(): void { - this.seoService.setTitle('Transactions'); + this.seoService.setTitle($localize`:@@add4cd82e3e38a3110fe67b3c7df56e9602644ee:Transactions`); this.radioGroupForm = this.formBuilder.group({ txTypes: [this.txTypesDefaultChecked], diff --git a/frontend/src/app/bisq/bisq-transfers/bisq-transfers.component.html b/frontend/src/app/bisq/bisq-transfers/bisq-transfers.component.html index d2da552f2..438980d5c 100644 --- a/frontend/src/app/bisq/bisq-transfers/bisq-transfers.component.html +++ b/frontend/src/app/bisq/bisq-transfers/bisq-transfers.component.html @@ -64,7 +64,9 @@
- +  
- + diff --git a/frontend/src/app/components/block/block.component.ts b/frontend/src/app/components/block/block.component.ts index 4a27ccf06..3cc413f33 100644 --- a/frontend/src/app/components/block/block.component.ts +++ b/frontend/src/app/components/block/block.component.ts @@ -95,7 +95,7 @@ export class BlockComponent implements OnInit, OnDestroy { tap((block: Block) => { this.block = block; this.blockHeight = block.height; - this.seoService.setTitle('Block: #' + block.height + ': ' + block.id); + this.seoService.setTitle($localize`:@@block.component.browser-title:Block ${block.height}:INTERPOLATION:: ${block.id}:INTERPOLATION:`); this.isLoadingBlock = false; if (block.coinbaseTx) { this.coinbaseTx = block.coinbaseTx; diff --git a/frontend/src/app/components/clipboard/clipboard.component.html b/frontend/src/app/components/clipboard/clipboard.component.html index 3ee729ebc..1150074ac 100644 --- a/frontend/src/app/components/clipboard/clipboard.component.html +++ b/frontend/src/app/components/clipboard/clipboard.component.html @@ -1,4 +1,4 @@ - + diff --git a/frontend/src/app/components/clipboard/clipboard.component.ts b/frontend/src/app/components/clipboard/clipboard.component.ts index b2febef7c..317cba7b6 100644 --- a/frontend/src/app/components/clipboard/clipboard.component.ts +++ b/frontend/src/app/components/clipboard/clipboard.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewChild, ElementRef, AfterViewInit, Input, ChangeDetectionStrategy } from '@angular/core'; +import { Component, ViewChild, ElementRef, AfterViewInit, Input, ChangeDetectionStrategy } from '@angular/core'; import * as ClipboardJS from 'clipboard'; import * as tlite from 'tlite'; @@ -12,6 +12,7 @@ export class ClipboardComponent implements AfterViewInit { @ViewChild('btn') btn: ElementRef; @ViewChild('buttonWrapper') buttonWrapper: ElementRef; @Input() text: string; + copiedMessage: string = $localize`:@@clipboard.copied-message:Copied!`; clipboard: any; @@ -19,7 +20,7 @@ export class ClipboardComponent implements AfterViewInit { ngAfterViewInit() { this.clipboard = new ClipboardJS(this.btn.nativeElement); - this.clipboard.on('success', (e) => { + this.clipboard.on('success', () => { tlite.show(this.buttonWrapper.nativeElement); setTimeout(() => { tlite.hide(this.buttonWrapper.nativeElement); diff --git a/frontend/src/app/components/fees-box/fees-box.component.html b/frontend/src/app/components/fees-box/fees-box.component.html index 5fd3d3198..4a3207bd4 100644 --- a/frontend/src/app/components/fees-box/fees-box.component.html +++ b/frontend/src/app/components/fees-box/fees-box.component.html @@ -3,19 +3,19 @@ diff --git a/frontend/src/app/components/latest-blocks/latest-blocks.component.html b/frontend/src/app/components/latest-blocks/latest-blocks.component.html index 4a2032c41..46e043107 100644 --- a/frontend/src/app/components/latest-blocks/latest-blocks.component.html +++ b/frontend/src/app/components/latest-blocks/latest-blocks.component.html @@ -1,5 +1,5 @@
-

Blocks

+

Blocks


@@ -10,7 +10,7 @@
- + diff --git a/frontend/src/app/components/latest-blocks/latest-blocks.component.ts b/frontend/src/app/components/latest-blocks/latest-blocks.component.ts index f67bcccb2..ccc898355 100644 --- a/frontend/src/app/components/latest-blocks/latest-blocks.component.ts +++ b/frontend/src/app/components/latest-blocks/latest-blocks.component.ts @@ -34,7 +34,7 @@ export class LatestBlocksComponent implements OnInit, OnDestroy { ) { } ngOnInit() { - this.seoService.setTitle('Blocks'); + this.seoService.setTitle($localize`:@@f4cba7faeb126346f09cc6af30124f9a343f7a28:Blocks`); this.websocketService.want(['blocks']); this.network$ = merge(of(''), this.stateService.networkChanged$); diff --git a/frontend/src/app/components/master-page/master-page.component.html b/frontend/src/app/components/master-page/master-page.component.html index 15e6ec3e5..cf0b79453 100644 --- a/frontend/src/app/components/master-page/master-page.component.html +++ b/frontend/src/app/components/master-page/master-page.component.html @@ -26,37 +26,37 @@ diff --git a/frontend/src/app/components/mempool-block/mempool-block.component.html b/frontend/src/app/components/mempool-block/mempool-block.component.html index dee0f4c19..9f30409fb 100644 --- a/frontend/src/app/components/mempool-block/mempool-block.component.html +++ b/frontend/src/app/components/mempool-block/mempool-block.component.html @@ -14,7 +14,7 @@ - + @@ -29,7 +29,7 @@ - +
TransactionTypeAmountConfirmedHeightTransactionTypeAmountConfirmedHeight
ago {{ tx.blockHeight }}
Median fee~{{ block.medianFee | number:'1.0-0' }} sat/vB ()~{{ block.medianFee | number:'1.0-0' }} sat/vB ()
Low priority

- {{ feeEstimations.hourFee }} sat/vB () + {{ feeEstimations.hourFee }} sat/vB ()

Medium priority

- {{ feeEstimations.halfHourFee }} sat/vB () + {{ feeEstimations.halfHourFee }} sat/vB ()

High priority

- {{ feeEstimations.fastestFee }} sat/vB () + {{ feeEstimations.fastestFee }} sat/vB ()

Timestamp Mined TransactionsFilledSize
Median fee~{{ mempoolBlock.medianFee | number:'1.0-0' }} sat/vB ()~{{ mempoolBlock.medianFee | number:'1.0-0' }} sat/vB ()
Fee span{{ mempoolBlock.nTx }}
FilledSize
diff --git a/frontend/src/app/components/mempool-block/mempool-block.component.ts b/frontend/src/app/components/mempool-block/mempool-block.component.ts index 312faead5..da1f54aae 100644 --- a/frontend/src/app/components/mempool-block/mempool-block.component.ts +++ b/frontend/src/app/components/mempool-block/mempool-block.component.ts @@ -69,13 +69,11 @@ export class MempoolBlockComponent implements OnInit, OnDestroy { getOrdinal(mempoolBlock: MempoolBlock): string { const blocksInBlock = Math.ceil(mempoolBlock.blockVSize / 1000000); if (this.mempoolBlockIndex === 0) { - return 'Next block'; + return $localize`:@@mempool-block.next.block:Next block`; } else if (this.mempoolBlockIndex === env.KEEP_BLOCKS_AMOUNT - 1 && blocksInBlock > 1 ) { - return `Stack of ${blocksInBlock} blocks`; + return $localize`:@@mempool-block.stack.of.blocks:Stack of ${blocksInBlock}:INTERPOLATION: mempool blocks`; } else { - const s = ['th', 'st', 'nd', 'rd']; - const v = this.mempoolBlockIndex + 1 % 100; - return this.mempoolBlockIndex + 1 + (s[(v - 20) % 10] || s[v] || s[0]) + ' next block'; + return $localize`:@@mempool-block.block.no:Mempool block ${this.mempoolBlockIndex + 1}:INTERPOLATION:`; } } } diff --git a/frontend/src/app/components/search-form/search-form.component.html b/frontend/src/app/components/search-form/search-form.component.html index c16374917..a4ad5d9d4 100644 --- a/frontend/src/app/components/search-form/search-form.component.html +++ b/frontend/src/app/components/search-form/search-form.component.html @@ -4,7 +4,7 @@
- +
diff --git a/frontend/src/app/components/statistics/statistics.component.html b/frontend/src/app/components/statistics/statistics.component.html index 88ebc2c29..e876f41fa 100644 --- a/frontend/src/app/components/statistics/statistics.component.html +++ b/frontend/src/app/components/statistics/statistics.component.html @@ -40,7 +40,7 @@ 1Y - +
diff --git a/frontend/src/app/components/statistics/statistics.component.ts b/frontend/src/app/components/statistics/statistics.component.ts index c9d65a809..8daa192c1 100644 --- a/frontend/src/app/components/statistics/statistics.component.ts +++ b/frontend/src/app/components/statistics/statistics.component.ts @@ -52,7 +52,7 @@ export class StatisticsComponent implements OnInit { } ngOnInit() { - this.seoService.setTitle('Graphs'); + this.seoService.setTitle($localize`:@@5d4f792f048fcaa6df5948575d7cb325c9393383:Graphs`); this.stateService.networkChanged$.subscribe((network) => this.network = network); this.inverted = this.storageService.getValue('inverted-graph') === 'true'; const isMobile = window.innerWidth <= 767.98; diff --git a/frontend/src/app/components/television/television.component.ts b/frontend/src/app/components/television/television.component.ts index 0c5b2a920..e4d12051e 100644 --- a/frontend/src/app/components/television/television.component.ts +++ b/frontend/src/app/components/television/television.component.ts @@ -24,7 +24,7 @@ export class TelevisionComponent implements OnInit { ) { } ngOnInit() { - this.seoService.setTitle('TV view'); + this.seoService.setTitle($localize`:@@46ce8155c9ab953edeec97e8950b5a21e67d7c4e:TV view`); this.websocketService.want(['blocks', 'live-2h-chart', 'mempool-blocks']); this.apiService.list2HStatistics$() diff --git a/frontend/src/app/components/transaction/transaction.component.html b/frontend/src/app/components/transaction/transaction.component.html index ed4acdc2c..5c942e169 100644 --- a/frontend/src/app/components/transaction/transaction.component.html +++ b/frontend/src/app/components/transaction/transaction.component.html @@ -123,10 +123,10 @@ - < {{ 1 * txInBlockIndex + 1 }} minutes ({{ txInBlockIndex + 1 }} block{{ txInBlockIndex > 0 ? 's' : '' }}) + < {{ 1 * txInBlockIndex + 1 }} minutes ({{ txInBlockIndex + 1 }} block) - ~{{ 10 * txInBlockIndex + 10 }} minutes ({{ txInBlockIndex + 1 }} block{{ txInBlockIndex > 0 ? 's' : '' }}) + ~{{ 10 * txInBlockIndex + 10 }} minutes ({{ txInBlockIndex + 1 }} block) @@ -285,3 +285,5 @@

+ +{{ txInBlockIndex + 1 }} blocks diff --git a/frontend/src/app/components/transaction/transaction.component.ts b/frontend/src/app/components/transaction/transaction.component.ts index 5983a20fe..cbd3916fc 100644 --- a/frontend/src/app/components/transaction/transaction.component.ts +++ b/frontend/src/app/components/transaction/transaction.component.ts @@ -45,7 +45,7 @@ export class TransactionComponent implements OnInit, OnDestroy { this.subscription = this.route.paramMap.pipe( switchMap((params: ParamMap) => { this.txId = params.get('id') || ''; - this.seoService.setTitle('Transaction: ' + this.txId); + this.seoService.setTitle($localize`:@@bisq.transaction.browser-title:Transaction: ${this.txId}:INTERPOLATION:`); this.resetTransaction(); return merge( of(true), diff --git a/frontend/src/app/components/translation-strings/translation-strings.component.html b/frontend/src/app/components/translation-strings/translation-strings.component.html deleted file mode 100644 index 4107925f4..000000000 --- a/frontend/src/app/components/translation-strings/translation-strings.component.html +++ /dev/null @@ -1,22 +0,0 @@ -{{counter}} -
- Just now - {{counter}} sec ago - {{counter}} secs ago - {{counter}} second ago - {{counter}} seconds ago - {{counter}} min ago - {{counter}} mins ago - {{counter}} minute ago - {{counter}} minutes ago - {{counter}} hour ago - {{counter}} hours ago - {{counter}} day ago - {{counter}} days ago - {{counter}} week ago - {{counter}} weeks ago - {{counter}} month ago - {{counter}} months ago - {{counter}} year ago - {{counter}} years ago -
diff --git a/frontend/src/app/components/translation-strings/translation-strings.component.ts b/frontend/src/app/components/translation-strings/translation-strings.component.ts deleted file mode 100644 index 25938ce77..000000000 --- a/frontend/src/app/components/translation-strings/translation-strings.component.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { Component } from '@angular/core'; - -@Component({ - selector: 'app-translation-strings', - templateUrl: './translation-strings.component.html' -}) -export class TranslationStringsComponent { - counter: string; - constructor() { } -} diff --git a/frontend/src/app/components/tx-features/tx-features.component.html b/frontend/src/app/components/tx-features/tx-features.component.html index f8d959043..f015f0000 100644 --- a/frontend/src/app/components/tx-features/tx-features.component.html +++ b/frontend/src/app/components/tx-features/tx-features.component.html @@ -1,8 +1,8 @@ -SegWit +SegWit - SegWit + SegWit - SegWit + SegWit -RBF +RBF diff --git a/frontend/src/app/components/tx-fee-rating/tx-fee-rating.component.html b/frontend/src/app/components/tx-fee-rating/tx-fee-rating.component.html index eceb137bb..ff2ab4e33 100644 --- a/frontend/src/app/components/tx-fee-rating/tx-fee-rating.component.html +++ b/frontend/src/app/components/tx-fee-rating/tx-fee-rating.component.html @@ -1,3 +1,3 @@ Optimal -Overpaid {{ overpaidTimes }}x -Overpaid {{ overpaidTimes }}x +Overpaid {{ overpaidTimes }}x +Overpaid {{ overpaidTimes }}x diff --git a/frontend/src/app/dashboard/dashboard.component.html b/frontend/src/app/dashboard/dashboard.component.html index f3043c487..c4f2ba5a7 100644 --- a/frontend/src/app/dashboard/dashboard.component.html +++ b/frontend/src/app/dashboard/dashboard.component.html @@ -128,8 +128,8 @@ @@ -161,7 +161,7 @@
Mempool size

- {{ mempoolBlocksData.size | bytes }} ({{ mempoolBlocksData.blocks }} blockblocks) + {{ mempoolBlocksData.size | bytes }} ({{ mempoolBlocksData.blocks }} block{{ mempoolBlocksData.blocks }} blocks)

@@ -182,7 +182,7 @@
-
{{ mempoolInfoData.value.vBytesPerSecond | ceil | number }} vB/s
+
{{ mempoolInfoData.value.vBytesPerSecond | ceil | number }} vB/s
 diff --git a/frontend/src/app/dashboard/dashboard.component.ts b/frontend/src/app/dashboard/dashboard.component.ts index a0ffc82d1..6267b9ed1 100644 --- a/frontend/src/app/dashboard/dashboard.component.ts +++ b/frontend/src/app/dashboard/dashboard.component.ts @@ -256,9 +256,9 @@ export class DashboardComponent implements OnInit { changeLanguage() { const language = this.languageForm.get('language').value; - this.document.location.href = (language === 'en' ? '/' : '/' + language); try { document.cookie = `lang=${language}; expires=Thu, 18 Dec 2050 12:00:00 UTC; path=/`; } catch (e) { } + this.document.location.href = (language === 'en' ? '/' : '/' + language); } } diff --git a/frontend/src/locale/messages.xlf b/frontend/src/locale/messages.xlf index 7d9eeaf59..fe18566c6 100644 --- a/frontend/src/locale/messages.xlf +++ b/frontend/src/locale/messages.xlf @@ -2,12 +2,27 @@ + + Transaction: + + src/app/components/transaction/transaction.component.ts + 48 + + + src/app/bisq/bisq-transaction/bisq-transaction.component.ts + 46 + + Transaction src/app/components/transaction/transaction.component.html 12 + + src/app/bisq/bisq-transactions/bisq-transactions.component.html + 18 + shared.transaction @@ -25,6 +40,14 @@ src/app/components/transaction/transaction.component.html 15 + + src/app/bisq/bisq-transfers/bisq-transfers.component.html + 68 + + + src/app/bisq/bisq-transaction/bisq-transaction.component.html + 7 + Transaction singular confirmation count shared.confirmation-count.singular @@ -34,6 +57,14 @@ src/app/components/transaction/transaction.component.html 15 + + src/app/bisq/bisq-transfers/bisq-transfers.component.html + 68 + + + src/app/bisq/bisq-transaction/bisq-transaction.component.html + 7 + Transaction plural confirmation count shared.confirmation-count.plural @@ -276,8 +307,8 @@ Transaction Minutes transaction.minutes - - block + + block src/app/components/transaction/transaction.component.html 126 @@ -286,8 +317,7 @@ src/app/components/transaction/transaction.component.html 129 - Transaction ETA (X blocks) - transaction.eta.block + shared.block Transaction not found. @@ -305,6 +335,14 @@ transaction.error.waiting-for-it-to-appear + + blocks + + src/app/components/transaction/transaction.component.html + 289 + + shared.blocks + Coinbase @@ -431,6 +469,10 @@ src/app/components/transactions-list/transactions-list.component.html 164 + + src/app/bisq/bisq-transactions/bisq-transactions.component.html + 19 + transactions-list.vout.scriptpubkey-type @@ -498,6 +540,13 @@ shared.confidential + + Block : + + src/app/components/block/block.component.ts + 98 + + Genesis @@ -540,6 +589,14 @@ src/app/components/block/block.component.html 31 + + src/app/components/latest-blocks/latest-blocks.component.html + 13 + + + src/app/components/mempool-block/mempool-block.component.html + 32 + src/app/dashboard/dashboard.component.html 81 @@ -574,6 +631,30 @@ block.median-fee + + Based on average native segwit transaction of 140 vBytes + + src/app/components/block/block.component.html + 46 + + + src/app/components/mempool-block/mempool-block.component.html + 17 + + + src/app/components/fees-box/fees-box.component.html + 6 + + + src/app/components/fees-box/fees-box.component.html + 12 + + + src/app/components/fees-box/fees-box.component.html + 18 + + Transaction fee tooltip + Total fees @@ -648,6 +729,13 @@ block.error.loading-block-data + + Address: + + src/app/components/address/address.component.ts + 64 + + Address @@ -704,6 +792,49 @@ search-form.searchbar-placeholder + + Search + + src/app/components/search-form/search-form.component.html + 7 + + search-form.search-title + + + Blocks + + src/app/components/latest-blocks/latest-blocks.component.ts + 37 + + + src/app/components/api-docs/api-docs.component.html + 75 + + + + Blocks + + src/app/components/latest-blocks/latest-blocks.component.html + 2 + + + src/app/components/master-page/master-page.component.html + 32 + + + src/app/components/master-page/master-page.component.html + 43 + + + src/app/bisq/bisq-blocks/bisq-blocks.component.ts + 35 + + + src/app/bisq/bisq-blocks/bisq-blocks.component.html + 2 + + latest-blocks.blocks + Height @@ -714,6 +845,14 @@ src/app/dashboard/dashboard.component.html 78 + + src/app/bisq/bisq-blocks/bisq-blocks.component.html + 12 + + + src/app/bisq/bisq-transactions/bisq-transactions.component.html + 22 + latest-blocks.height @@ -734,24 +873,28 @@ src/app/components/latest-blocks/latest-blocks.component.html 12 + + src/app/components/master-page/master-page.component.html + 29 + src/app/components/mempool-block/mempool-block.component.html 28 + + src/app/bisq/bisq-blocks/bisq-blocks.component.html + 15 + + + src/app/bisq/bisq-transactions/bisq-transactions.component.ts + 77 + + + src/app/bisq/bisq-transactions/bisq-transactions.component.html + 2 + latest-blocks.transactions - - Filled - - src/app/components/latest-blocks/latest-blocks.component.html - 13 - - - src/app/components/mempool-block/mempool-block.component.html - 32 - - latest-blocks.filled - multisig of @@ -805,6 +948,30 @@ shared.blocks + + API + + src/app/components/master-page/master-page.component.html + 56 + + + src/app/components/api-docs/api-docs.component.ts + 24 + + master-page.api + + + About + + src/app/components/master-page/master-page.component.html + 59 + + + src/app/components/about/about.component.ts + 38 + + master-page.api + Offline @@ -829,6 +996,58 @@ master-page.layer2-networks-header + + Stats + + src/app/components/master-page/master-page.component.html + 35 + + master-page.stats + + + Dashboard + + src/app/components/master-page/master-page.component.html + 40 + + master-page.dashboard + + + Graphs + + src/app/components/master-page/master-page.component.html + 46 + + + src/app/components/statistics/statistics.component.ts + 55 + + master-page.graphs + + + TV view + + src/app/components/master-page/master-page.component.html + 49 + + + src/app/components/television/television.component.ts + 27 + + master-page.tvview + + + Assets + + src/app/components/master-page/master-page.component.html + 53 + + + src/app/assets/assets.component.ts + 40 + + master-page.assets + About the project @@ -997,6 +1216,14 @@ statistics.memory-by-vBytes + + Invert + + src/app/components/statistics/statistics.component.html + 43 + + statistics.component-invert.title + Transaction vBytes per second (vB/s) @@ -1050,6 +1277,27 @@ shared.vbytes-per-second + + Next block + + src/app/components/mempool-block/mempool-block.component.ts + 72 + + + + Stack of mempool blocks + + src/app/components/mempool-block/mempool-block.component.ts + 74 + + + + Mempool block + + src/app/components/mempool-block/mempool-block.component.ts + 76 + + Fee span @@ -1066,6 +1314,13 @@ mempool-block.total-fees + + Asset: + + src/app/components/asset/asset.component.ts + 73 + + Name @@ -1151,6 +1406,22 @@ Liquid Asset circulating amount asset.circulating-amount + + Peg In/Out and Burn Transactions + + src/app/components/asset/asset.component.html + 75 + + Liquid native asset transactions title + + + Issuance and Burn Transactions + + src/app/components/asset/asset.component.html + 75 + + Default asset transactions title + Error loading asset data. @@ -1253,6 +1524,10 @@ src/app/dashboard/dashboard.component.html 108 + + src/app/bisq/bisq-transactions/bisq-transactions.component.html + 20 + dashboard.latest-transactions.amount @@ -1271,6 +1546,22 @@ dashboard.latest-transactions.USD + + Collapse + + src/app/dashboard/dashboard.component.html + 131 + + dashboard.collapse + + + Expand + + src/app/dashboard/dashboard.component.html + 132 + + dashboard.expand + Mempool size @@ -1289,13 +1580,21 @@ Unconfirmed count dashboard.unconfirmed - - block + + block src/app/dashboard/dashboard.component.html 164 - dashboard.block + shared.block + + + blocks + + src/app/dashboard/dashboard.component.html + 164 + + shared.blocks Incoming transactions @@ -1322,6 +1621,14 @@ dashboard.difficulty-adjustment + + API Service + + src/app/components/api-docs/api-docs.component.html + 4 + + api-docs.title + Websocket @@ -1476,15 +1783,6 @@ API Docs for /api/mempool/recent api-docs.mempool.recent - - Blocks - - src/app/components/api-docs/api-docs.component.html - 75 - - API Docs tab for Blocks - api-docs.tab.blocks - Returns the confirmation status of a block. Available fields: in_best_chain (boolean, false for orphaned blocks), next_best (the hash of the next block, only available for blocks in the best chain). @@ -1759,214 +2057,20 @@ 272 - - Just now + + Copied! - src/app/components/translation-strings/translation-strings.component.html - 3 - - - src/app/components/time-since/time-since.component.ts - 49 - - - - sec ago - - src/app/components/translation-strings/translation-strings.component.html - 4 - - - src/app/components/time-since/time-since.component.ts - 70 - - - - secs ago - - src/app/components/translation-strings/translation-strings.component.html - 5 - - - src/app/components/time-since/time-since.component.ts - 88 - - - - second ago - - src/app/components/translation-strings/translation-strings.component.html - 6 - - - src/app/components/time-since/time-since.component.ts - 72 - - - - seconds ago - - src/app/components/translation-strings/translation-strings.component.html - 7 - - - src/app/components/time-since/time-since.component.ts - 90 - - - - min ago - - src/app/components/translation-strings/translation-strings.component.html - 8 - - - src/app/components/time-since/time-since.component.ts - 65 - - - - mins ago - - src/app/components/translation-strings/translation-strings.component.html - 9 - - - src/app/components/time-since/time-since.component.ts - 83 - - - - minute ago - - src/app/components/translation-strings/translation-strings.component.html - 10 - - - src/app/components/time-since/time-since.component.ts - 67 - - - - minutes ago - - src/app/components/translation-strings/translation-strings.component.html - 11 - - - src/app/components/time-since/time-since.component.ts - 85 - - - - hour ago - - src/app/components/translation-strings/translation-strings.component.html - 12 - - - src/app/components/time-since/time-since.component.ts - 62 - - - - hours ago - - src/app/components/translation-strings/translation-strings.component.html - 13 - - - src/app/components/time-since/time-since.component.ts - 80 - - - - day ago - - src/app/components/translation-strings/translation-strings.component.html - 14 - - - src/app/components/time-since/time-since.component.ts - 61 - - - - days ago - - src/app/components/translation-strings/translation-strings.component.html + src/app/components/clipboard/clipboard.component.ts 15 - - src/app/components/time-since/time-since.component.ts - 79 - - - week ago + + This transaction saved % on fees by using native SegWit-Bech32 - src/app/components/translation-strings/translation-strings.component.html - 16 - - - src/app/components/time-since/time-since.component.ts - 60 - - - - weeks ago - - src/app/components/translation-strings/translation-strings.component.html - 17 - - - src/app/components/time-since/time-since.component.ts - 78 - - - - month ago - - src/app/components/translation-strings/translation-strings.component.html - 18 - - - src/app/components/time-since/time-since.component.ts - 59 - - - - months ago - - src/app/components/translation-strings/translation-strings.component.html - 19 - - - src/app/components/time-since/time-since.component.ts - 77 - - - - year ago - - src/app/components/translation-strings/translation-strings.component.html - 20 - - - src/app/components/time-since/time-since.component.ts - 58 - - - - years ago - - src/app/components/translation-strings/translation-strings.component.html - 21 - - - src/app/components/time-since/time-since.component.ts - 76 + src/app/components/tx-features/tx-features.component.html + 1 + ngbTooltip about segwit gains SegWit @@ -1985,6 +2089,30 @@ SegWit tx-features.tag.segwit + + This transaction saved % on fees by using SegWit and could save % more by fully upgrading to native SegWit-Bech32 + + src/app/components/tx-features/tx-features.component.html + 3 + + ngbTooltip about double segwit gains + + + This transaction could save % on fees by upgrading to native SegWit-Bech32 or % by upgrading to SegWit-P2SH + + src/app/components/tx-features/tx-features.component.html + 5 + + ngbTooltip about missed out gains + + + This transaction support Replace-By-Fee (RBF) allowing fee bumping + + src/app/components/tx-features/tx-features.component.html + 8 + + RBF tooltip + RBF @@ -2003,6 +2131,18 @@ TX Fee Rating is Optimal tx-fee-rating.optimal + + Only ~ sat/vB was needed to get into this block + + src/app/components/tx-fee-rating/tx-fee-rating.component.html + 2 + + + src/app/components/tx-fee-rating/tx-fee-rating.component.html + 3 + + tx-fee-rating.warning-tooltip + Overpaid x @@ -2021,6 +2161,284 @@ TX Fee Rating is Danger tx-fee-rating.overpaid.danger + + Just now + + src/app/components/time-since/time-since.component.ts + 49 + + + + year ago + + src/app/components/time-since/time-since.component.ts + 58 + + + + month ago + + src/app/components/time-since/time-since.component.ts + 59 + + + + week ago + + src/app/components/time-since/time-since.component.ts + 60 + + + + day ago + + src/app/components/time-since/time-since.component.ts + 61 + + + + hour ago + + src/app/components/time-since/time-since.component.ts + 62 + + + + min ago + + src/app/components/time-since/time-since.component.ts + 65 + + + + minute ago + + src/app/components/time-since/time-since.component.ts + 67 + + + + sec ago + + src/app/components/time-since/time-since.component.ts + 70 + + + + second ago + + src/app/components/time-since/time-since.component.ts + 72 + + + + years ago + + src/app/components/time-since/time-since.component.ts + 76 + + + + months ago + + src/app/components/time-since/time-since.component.ts + 77 + + + + weeks ago + + src/app/components/time-since/time-since.component.ts + 78 + + + + days ago + + src/app/components/time-since/time-since.component.ts + 79 + + + + hours ago + + src/app/components/time-since/time-since.component.ts + 80 + + + + mins ago + + src/app/components/time-since/time-since.component.ts + 83 + + + + minutes ago + + src/app/components/time-since/time-since.component.ts + 85 + + + + secs ago + + src/app/components/time-since/time-since.component.ts + 88 + + + + seconds ago + + src/app/components/time-since/time-since.component.ts + 90 + + + + BSQ statistics + + src/app/bisq/bisq-stats/bisq-stats.component.ts + 24 + + + src/app/bisq/bisq-stats/bisq-stats.component.html + 2 + + + + Existing amount + + src/app/bisq/bisq-stats/bisq-stats.component.html + 12 + + + src/app/bisq/bisq-stats/bisq-stats.component.html + 54 + + BSQ existing amount + + + Minted amount + + src/app/bisq/bisq-stats/bisq-stats.component.html + 16 + + + src/app/bisq/bisq-stats/bisq-stats.component.html + 58 + + BSQ minted amount + + + Burnt amount + + src/app/bisq/bisq-stats/bisq-stats.component.html + 20 + + + src/app/bisq/bisq-stats/bisq-stats.component.html + 62 + + BSQ burnt amount + + + Addresses + + src/app/bisq/bisq-stats/bisq-stats.component.html + 24 + + + src/app/bisq/bisq-stats/bisq-stats.component.html + 66 + + BSQ addresses + + + Unspent TXOs + + src/app/bisq/bisq-stats/bisq-stats.component.html + 28 + + + src/app/bisq/bisq-stats/bisq-stats.component.html + 70 + + BSQ unspent transaction outputs + + + Spent TXOs + + src/app/bisq/bisq-stats/bisq-stats.component.html + 32 + + BSQ spent transaction outputs + + + Price + + src/app/bisq/bisq-stats/bisq-stats.component.html + 36 + + + src/app/bisq/bisq-stats/bisq-stats.component.html + 78 + + BSQ token price + + + Market cap + + src/app/bisq/bisq-stats/bisq-stats.component.html + 40 + + + src/app/bisq/bisq-stats/bisq-stats.component.html + 82 + + BSQ token market cap + + + Address: + + src/app/bisq/bisq-address/bisq-address.component.ts + 39 + + + + Block : + + src/app/bisq/bisq-block/bisq-block.component.ts + 85 + + + + Filter + + src/app/bisq/bisq-transactions/bisq-transactions.component.ts + 55 + + + + Select all + + src/app/bisq/bisq-transactions/bisq-transactions.component.ts + 56 + + + + Unselect all + + src/app/bisq/bisq-transactions/bisq-transactions.component.ts + 57 + + + + Confirmed + + src/app/bisq/bisq-transactions/bisq-transactions.component.html + 21 + +