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..dd7b8aeb5 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`:@@729754dd19eb9ce0670b0aeb5a6ae60574c2c563:Address` + ': ' + this.addressString); 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..536e72c36 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`:@@729754dd19eb9ce0670b0aeb5a6ae60574c2c563:Block` + ': #' + block.height + ': ' + block.hash); 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..abcf8684b 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..3b786c687 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.ts b/frontend/src/app/bisq/bisq-transaction/bisq-transaction.component.ts index 50b880113..ee90bf95c 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`:@@b59ea65c89a5ae15b787d8318fdad9edd6fec243:Transaction` + ': ' + this.txId); 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/components/about/about.component.ts b/frontend/src/app/components/about/about.component.ts index 94ec35446..390137f7e 100644 --- a/frontend/src/app/components/about/about.component.ts +++ b/frontend/src/app/components/about/about.component.ts @@ -35,7 +35,7 @@ export class AboutComponent implements OnInit { ngOnInit() { this.gitCommit$ = this.stateService.gitCommit$.pipe(map((str) => str.substr(0, 8))); - this.seoService.setTitle('About'); + this.seoService.setTitle($localize`:@@004b222ff9ef9dd4771b777950ca1d0e4cd4348a:About`); this.websocketService.want(['blocks']); this.donationForm = this.formBuilder.group({ diff --git a/frontend/src/app/components/address/address.component.ts b/frontend/src/app/components/address/address.component.ts index bb596e6f8..8031e4352 100644 --- a/frontend/src/app/components/address/address.component.ts +++ b/frontend/src/app/components/address/address.component.ts @@ -61,7 +61,7 @@ export class AddressComponent 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`:@@729754dd19eb9ce0670b0aeb5a6ae60574c2c563:Address` + ': ' + this.addressString); return merge( of(true), diff --git a/frontend/src/app/components/api-docs/api-docs.component.html b/frontend/src/app/components/api-docs/api-docs.component.html index 73013525c..14204e36d 100644 --- a/frontend/src/app/components/api-docs/api-docs.component.html +++ b/frontend/src/app/components/api-docs/api-docs.component.html @@ -1,7 +1,7 @@
-

{{ network.val === '' ? 'Bitcoin' : network.val.charAt(0).toUpperCase() + network.val.slice(1) }} API Service

+

{{ network.val === '' ? 'Bitcoin' : network.val.charAt(0).toUpperCase() + network.val.slice(1) }} API Service

    diff --git a/frontend/src/app/components/api-docs/api-docs.component.ts b/frontend/src/app/components/api-docs/api-docs.component.ts index 00bc026f1..cfd8b6b6f 100644 --- a/frontend/src/app/components/api-docs/api-docs.component.ts +++ b/frontend/src/app/components/api-docs/api-docs.component.ts @@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core'; import { StateService } from 'src/app/services/state.service'; import { WebsocketService } from 'src/app/services/websocket.service'; import { Observable, merge, of } from 'rxjs'; +import { SeoService } from 'src/app/services/seo.service'; @Component({ selector: 'app-api-docs', @@ -16,9 +17,11 @@ export class ApiDocsComponent implements OnInit { constructor( private stateService: StateService, private websocketService: WebsocketService, + private seoService: SeoService, ) { } ngOnInit(): void { + this.seoService.setTitle($localize`:@@e351b40b3869a5c7d19c3d4918cb1ac7aaab95c4:API`); this.network$ = merge(of(''), this.stateService.networkChanged$); this.websocketService.want(['blocks']); diff --git a/frontend/src/app/components/asset/asset.component.html b/frontend/src/app/components/asset/asset.component.html index e004c8be9..2e156dc1a 100644 --- a/frontend/src/app/components/asset/asset.component.html +++ b/frontend/src/app/components/asset/asset.component.html @@ -72,7 +72,7 @@
    -

    {{ (transactions?.length | number) || '?' }} of {{ txCount | number }} Peg In/Out and Burn TransactionsIn/Out and Burn Transactions

    +

    {{ (transactions?.length | number) || '?' }} of {{ txCount | number }} Peg In/Out and Burn TransactionsIn/Out and Burn Transactions

    diff --git a/frontend/src/app/components/asset/asset.component.ts b/frontend/src/app/components/asset/asset.component.ts index 0c80ec683..2eee8aa6b 100644 --- a/frontend/src/app/components/asset/asset.component.ts +++ b/frontend/src/app/components/asset/asset.component.ts @@ -70,7 +70,7 @@ export class AssetComponent implements OnInit, OnDestroy { this.transactions = null; document.body.scrollTo(0, 0); this.assetString = params.get('id') || ''; - this.seoService.setTitle('Asset: ' + this.assetString); + this.seoService.setTitle($localize`:@@asset.component.asset:Asset` + ': ' + this.assetString); return merge( of(true), diff --git a/frontend/src/app/components/block/block.component.html b/frontend/src/app/components/block/block.component.html index 194b6622f..7ec2ce0e3 100644 --- a/frontend/src/app/components/block/block.component.html +++ b/frontend/src/app/components/block/block.component.html @@ -43,7 +43,7 @@
- + diff --git a/frontend/src/app/components/block/block.component.ts b/frontend/src/app/components/block/block.component.ts index 4a27ccf06..429b8bcc9 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.block:Block` + ' ' + block.height + ': ' + block.id); 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..6dd106134 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


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..aa7a3091b 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 @@
- + 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 872b48e06..87c1011d5 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.ts b/frontend/src/app/components/transaction/transaction.component.ts index 5983a20fe..bad73f0b7 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`:@@b59ea65c89a5ae15b787d8318fdad9edd6fec243:Transaction` + ': ' + this.txId); 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..449efbf26 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 @@
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 ()

Median fee~{{ mempoolBlock.medianFee | number:'1.0-0' }} sat/vB ()~{{ mempoolBlock.medianFee | number:'1.0-0' }} sat/vB ()
Fee span
Mempool size

- {{ mempoolBlocksData.size | bytes }} ({{ mempoolBlocksData.blocks }} blockblocks) + {{ mempoolBlocksData.size | bytes }} ({{ mempoolBlocksData.blocks }} {mempoolBlocksData.blocks, plural, =1 {block} other {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 84a8da4a6..c0c07e7fa 100644 --- a/frontend/src/locale/messages.xlf +++ b/frontend/src/locale/messages.xlf @@ -4,11 +4,22 @@ Transaction + + src/app/components/transaction/transaction.component.ts + 48 + src/app/components/transaction/transaction.component.html 12 - shared.transaction + + src/app/bisq/bisq-transaction/bisq-transaction.component.ts + 46 + + + src/app/bisq/bisq-transactions/bisq-transactions.component.html + 18 + This transaction has been replaced by: @@ -50,7 +61,7 @@ Inputs & Outputs src/app/components/transaction/transaction.component.html - 165 + 164 Transaction inputs and outputs transaction.inputs-and-outputs @@ -59,7 +70,7 @@ Details src/app/components/transaction/transaction.component.html - 167 + 166 Transaction Details transaction.details @@ -68,7 +79,7 @@ Details src/app/components/transaction/transaction.component.html - 173 + 172 transaction.details @@ -76,16 +87,25 @@ Size src/app/components/transaction/transaction.component.html - 178 + 177 Transaction Size transaction.size + + Virtual size + + src/app/components/transaction/transaction.component.html + 181 + + Transaction Virtual Size + transaction.vsize + Weight src/app/components/transaction/transaction.component.html - 182 + 185 Transaction Weight transaction.weight @@ -107,7 +127,7 @@ src/app/components/transaction/transaction.component.html - 149 + 148 Transaction fee transaction.fee @@ -120,7 +140,7 @@ src/app/components/transaction/transaction.component.html - 153 + 152 Transaction fee transaction.fee-per-vbyte @@ -133,7 +153,7 @@ src/app/components/transaction/transaction.component.html - 154 + 153 src/app/components/transactions-list/transactions-list.component.html @@ -213,7 +233,7 @@ src/app/components/transaction/transaction.component.html - 137 + 136 Transaction features transaction.features @@ -231,7 +251,7 @@ sat src/app/components/transaction/transaction.component.html - 150 + 149 Transaction Fee sat transaction.fee.sat @@ -262,7 +282,7 @@ src/app/components/transaction/transaction.component.html - 130 + 129 Transaction Minutes transaction.minutes @@ -275,7 +295,7 @@ src/app/components/transaction/transaction.component.html - 130 + 129 Transaction ETA (X blocks) transaction.eta.block @@ -284,7 +304,7 @@ Transaction not found. src/app/components/transaction/transaction.component.html - 266 + 273 transaction.error.transaction-not-found @@ -292,30 +312,10 @@ Waiting for it to appear in the mempool... src/app/components/transaction/transaction.component.html - 267 + 274 transaction.error.waiting-for-it-to-appear - - Confidential - - src/app/components/amount/amount.component.html - 6 - - - src/app/components/transactions-list/transactions-list.component.html - 208 - - - src/app/components/asset/asset.component.html - 143 - - - src/app/components/address/address.component.html - 112 - - shared.confidential - Coinbase @@ -442,6 +442,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 @@ -489,6 +493,33 @@ transactions-list.unconfirmed + + Confidential + + src/app/components/transactions-list/transactions-list.component.html + 208 + + + src/app/components/amount/amount.component.html + 6 + + + src/app/components/address/address.component.html + 112 + + + src/app/components/asset/asset.component.html + 143 + + shared.confidential + + + Block + + src/app/components/block/block.component.ts + 98 + + Genesis @@ -565,6 +596,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 @@ -613,6 +668,10 @@ src/app/components/block/block.component.html 85 + + src/app/components/address/address.component.html + 46 + src/app/components/mempool-blocks/mempool-blocks.component.html 14 @@ -625,10 +684,6 @@ src/app/components/footer/footer.component.html 16 - - src/app/components/address/address.component.html - 46 - shared.transaction-count.plural @@ -639,6 +694,69 @@ block.error.loading-block-data + + Address + + src/app/components/address/address.component.ts + 64 + + + src/app/components/address/address.component.html + 2 + + + src/app/bisq/bisq-address/bisq-address.component.ts + 39 + + + src/app/bisq/bisq-block/bisq-block.component.ts + 85 + + + + Total received + + src/app/components/address/address.component.html + 20 + + address.total-received + + + Total sent + + src/app/components/address/address.component.html + 24 + + + src/app/bisq/bisq-blocks/bisq-blocks.component.html + 14 + + address.total-sent + + + Balance + + src/app/components/address/address.component.html + 28 + + address.balance + + + of + + src/app/components/address/address.component.html + 46 + + shared.of + + + Error loading address data. + + src/app/components/address/address.component.html + 101 + + address.error.loading-address-data + TXID, block height, hash or address @@ -647,6 +765,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 @@ -657,6 +818,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 @@ -677,10 +846,26 @@ 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 @@ -748,6 +933,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 @@ -772,6 +981,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 @@ -940,6 +1201,14 @@ statistics.memory-by-vBytes + + Invert + + src/app/components/statistics/statistics.component.html + 43 + + statistics.component-invert.title + Transaction vBytes per second (vB/s) @@ -993,6 +1262,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 @@ -1009,6 +1299,13 @@ mempool-block.total-fees + + Asset + + src/app/components/asset/asset.component.ts + 73 + + Name @@ -1094,6 +1391,20 @@ Liquid Asset circulating amount asset.circulating-amount + + Peg In/Out and Burn Transactions + + src/app/components/asset/asset.component.html + 75 + + + + In/Out and Burn Transactions + + src/app/components/asset/asset.component.html + 75 + + Error loading asset data. @@ -1196,6 +1507,10 @@ src/app/dashboard/dashboard.component.html 108 + + src/app/bisq/bisq-transactions/bisq-transactions.component.html + 20 + dashboard.latest-transactions.amount @@ -1214,6 +1529,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 @@ -1232,13 +1563,13 @@ Unconfirmed count dashboard.unconfirmed - - block + + {VAR_PLURAL, plural, =1 {block} other {blocks}} src/app/dashboard/dashboard.component.html 164 - dashboard.block + dashboard.blocks Incoming transactions @@ -1265,6 +1596,14 @@ dashboard.difficulty-adjustment + + API Service + + src/app/components/api-docs/api-docs.component.html + 4 + + api-docs.title + Websocket @@ -1419,15 +1758,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). @@ -1702,262 +2032,20 @@ 272 - - Address + + Copied! - src/app/components/address/address.component.html - 2 - - shared.address - - - Total received - - src/app/components/address/address.component.html - 20 - - address.total-received - - - Total sent - - src/app/components/address/address.component.html - 24 - - address.total-sent - - - Balance - - src/app/components/address/address.component.html - 28 - - address.balance - - - of - - src/app/components/address/address.component.html - 46 - - shared.of - - - Error loading address data. - - src/app/components/address/address.component.html - 101 - - address.error.loading-address-data - - - just now - - 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 - 74 - - - - secs ago - - src/app/components/translation-strings/translation-strings.component.html - 5 - - - src/app/components/time-since/time-since.component.ts - 96 - - - - second ago - - src/app/components/translation-strings/translation-strings.component.html - 6 - - - src/app/components/time-since/time-since.component.ts - 71 - - - - seconds ago - - src/app/components/translation-strings/translation-strings.component.html - 7 - - - src/app/components/time-since/time-since.component.ts - 93 - - - - min ago - - src/app/components/translation-strings/translation-strings.component.html - 8 - - - src/app/components/time-since/time-since.component.ts - 67 - - - - mins ago - - src/app/components/translation-strings/translation-strings.component.html - 9 - - - src/app/components/time-since/time-since.component.ts - 89 - - - - minute ago - - src/app/components/translation-strings/translation-strings.component.html - 10 - - - src/app/components/time-since/time-since.component.ts - 64 - - - - minutes ago - - src/app/components/translation-strings/translation-strings.component.html - 11 - - - src/app/components/time-since/time-since.component.ts - 86 - - - - 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 - 84 - - - - 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 - 83 - - - 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 - 82 - - - - 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 - 81 - - - - 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 - 80 + src/app/components/tx-features/tx-features.component.html + 1 + ngbTooltip about segwit gains SegWit @@ -1976,6 +2064,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 @@ -1994,6 +2106,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 @@ -2012,6 +2136,266 @@ 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 + + + + Minted amount + + src/app/bisq/bisq-stats/bisq-stats.component.html + 16 + + + src/app/bisq/bisq-stats/bisq-stats.component.html + 58 + + + + Burnt amount + + src/app/bisq/bisq-stats/bisq-stats.component.html + 20 + + + src/app/bisq/bisq-stats/bisq-stats.component.html + 62 + + + + Addresses + + src/app/bisq/bisq-stats/bisq-stats.component.html + 24 + + + src/app/bisq/bisq-stats/bisq-stats.component.html + 66 + + + + Unspent TXOs + + src/app/bisq/bisq-stats/bisq-stats.component.html + 28 + + + src/app/bisq/bisq-stats/bisq-stats.component.html + 70 + + + + Spent TXOs + + src/app/bisq/bisq-stats/bisq-stats.component.html + 32 + + + + Price + + src/app/bisq/bisq-stats/bisq-stats.component.html + 36 + + + src/app/bisq/bisq-stats/bisq-stats.component.html + 78 + + + + Market cap + + src/app/bisq/bisq-stats/bisq-stats.component.html + 40 + + + src/app/bisq/bisq-stats/bisq-stats.component.html + 82 + + + + Confirmed + + src/app/bisq/bisq-blocks/bisq-blocks.component.html + 13 + + + src/app/bisq/bisq-transactions/bisq-transactions.component.html + 21 + + + + 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 + +