From 0b1cf052a8055af911e9b19b6f31c5176b57bba0 Mon Sep 17 00:00:00 2001 From: softsimon Date: Sun, 28 Nov 2021 14:23:52 +0400 Subject: [PATCH] Merged block header, markets and genesis i18n strings --- .../bisq/bisq-block/bisq-block.component.html | 4 +- .../api-docs/api-docs.component.html | 2 +- .../app/components/block/block.component.html | 5 +- frontend/src/locale/messages.xlf | 107 ++++++++---------- 4 files changed, 54 insertions(+), 64 deletions(-) diff --git a/frontend/src/app/bisq/bisq-block/bisq-block.component.html b/frontend/src/app/bisq/bisq-block/bisq-block.component.html index e22df257d..36281157d 100644 --- a/frontend/src/app/bisq/bisq-block/bisq-block.component.html +++ b/frontend/src/app/bisq/bisq-block/bisq-block.component.html @@ -1,9 +1,11 @@
-

Block {{ blockHeight }}

+

Block

+ {{ blockHeight }} +
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 5d3d4a076..3b2a8cd37 100644 --- a/frontend/src/app/components/api-docs/api-docs.component.html +++ b/frontend/src/app/components/api-docs/api-docs.component.html @@ -33,7 +33,7 @@
  • - Markets + Markets diff --git a/frontend/src/app/components/block/block.component.html b/frontend/src/app/components/block/block.component.html index cc96660f4..18fbe5b7c 100644 --- a/frontend/src/app/components/block/block.component.html +++ b/frontend/src/app/components/block/block.component.html @@ -2,7 +2,7 @@

    - Genesis + Genesis @@ -13,7 +13,8 @@ - Block + Block + diff --git a/frontend/src/locale/messages.xlf b/frontend/src/locale/messages.xlf index 7b783de8a..cc3648909 100644 --- a/frontend/src/locale/messages.xlf +++ b/frontend/src/locale/messages.xlf @@ -404,11 +404,11 @@ src/app/bisq/bisq-block/bisq-block.component.html - 49 + 51 src/app/components/block/block.component.html - 167,168 + 168,169 src/app/components/blockchain-blocks/blockchain-blocks.component.html @@ -428,11 +428,11 @@ src/app/bisq/bisq-block/bisq-block.component.html - 50 + 52 src/app/components/block/block.component.html - 168,169 + 169,170 src/app/components/blockchain-blocks/blockchain-blocks.component.html @@ -451,27 +451,31 @@ 43 - - Block + + Block src/app/bisq/bisq-block/bisq-block.component.html 4 - block.block + + src/app/components/block/block.component.html + 16,17 + + shared.block-title Hash src/app/bisq/bisq-block/bisq-block.component.html - 17 + 19 src/app/bisq/bisq-block/bisq-block.component.html - 80 + 82 src/app/components/block/block.component.html - 50,51 + 51,52 block.hash @@ -479,11 +483,11 @@ Timestamp src/app/bisq/bisq-block/bisq-block.component.html - 21 + 23 src/app/bisq/bisq-block/bisq-block.component.html - 84 + 86 src/app/bisq/bisq-transaction/bisq-transaction.component.html @@ -500,11 +504,11 @@ Previous hash src/app/bisq/bisq-block/bisq-block.component.html - 35 + 37 src/app/bisq/bisq-block/bisq-block.component.html - 93 + 95 Transaction Previous Hash block.previous_hash @@ -633,6 +637,10 @@ src/app/bisq/bisq-main-dashboard/bisq-main-dashboard.component.html 66,67 + + src/app/components/api-docs/api-docs.component.html + 36,38 + Bisq All Markets @@ -980,7 +988,7 @@ src/app/components/block/block.component.html - 124,125 + 125,126 src/app/components/transaction/transaction.component.html @@ -1186,6 +1194,10 @@ src/app/bisq/bisq-transactions/bisq-transactions.component.ts 34 + + src/app/components/block/block.component.html + 5,7 + Irregular @@ -1877,15 +1889,6 @@ 25,27 - - Markets - - src/app/components/api-docs/api-docs.component.html - 36,38 - - API Docs tab for BSQ - api-docs.tab.bsq - Provides list of available currencies for a given base currency. @@ -2558,14 +2561,6 @@ master-page.stats - - Genesis - - src/app/components/block/block.component.html - 5,15 - - block.genesis - Next Block @@ -2574,23 +2569,15 @@ src/app/components/block/block.component.html - 18,19 + 19,20 Next Block - - Block - - src/app/components/block/block.component.html - 16,32 - - block.block - Previous Block src/app/components/block/block.component.html - 25,26 + 26,27 Previous Block @@ -2598,7 +2585,7 @@ Timestamp src/app/components/block/block.component.html - 54,56 + 55,57 src/app/components/latest-blocks/latest-blocks.component.html @@ -2610,7 +2597,7 @@ Size src/app/components/block/block.component.html - 63,64 + 64,65 src/app/components/latest-blocks/latest-blocks.component.html @@ -2634,7 +2621,7 @@ Weight src/app/components/block/block.component.html - 67,68 + 68,69 block.weight @@ -2642,7 +2629,7 @@ Median fee src/app/components/block/block.component.html - 77,78 + 78,79 src/app/components/mempool-block/mempool-block.component.html @@ -2654,7 +2641,7 @@ sat/vB src/app/components/block/block.component.html - 78 + 79 src/app/components/blockchain-blocks/blockchain-blocks.component.html @@ -2727,7 +2714,7 @@ Based on average native segwit transaction of 140 vBytes src/app/components/block/block.component.html - 78,80 + 79,81 src/app/components/fees-box/fees-box.component.html @@ -2751,11 +2738,11 @@ Total fees src/app/components/block/block.component.html - 82,83 + 83,84 src/app/components/block/block.component.html - 97,99 + 98,100 Total fees in a block block.total-fees @@ -2764,11 +2751,11 @@ Subsidy + fees: src/app/components/block/block.component.html - 89,91 + 90,92 src/app/components/block/block.component.html - 101,104 + 102,105 Total subsidy and fees in a block block.subsidy-and-fees @@ -2777,7 +2764,7 @@ Miner src/app/components/block/block.component.html - 106,107 + 107,108 block.miner @@ -2785,7 +2772,7 @@ Bits src/app/components/block/block.component.html - 128,130 + 129,131 block.bits @@ -2793,7 +2780,7 @@ Merkle root src/app/components/block/block.component.html - 132,134 + 133,135 block.merkle-root @@ -2801,7 +2788,7 @@ Difficulty src/app/components/block/block.component.html - 142,145 + 143,146 block.difficulty @@ -2809,7 +2796,7 @@ Nonce src/app/components/block/block.component.html - 146,148 + 147,149 block.nonce @@ -2817,7 +2804,7 @@ Block Header Hex src/app/components/block/block.component.html - 150,151 + 151,152 block.header @@ -2825,7 +2812,7 @@ Details src/app/components/block/block.component.html - 161,166 + 162,167 src/app/components/transaction/transaction.component.html @@ -2838,7 +2825,7 @@ Error loading block data. src/app/components/block/block.component.html - 255,263 + 256,264 block.error.loading-block-data