From d015ee78240ed5327723808f8d0a7df18aa4206a Mon Sep 17 00:00:00 2001 From: softsimon Date: Mon, 13 Mar 2023 17:40:17 +0900 Subject: [PATCH] Fixes i18n string error --- .../pool-ranking/pool-ranking.component.ts | 9 +++-- frontend/src/locale/messages.xlf | 39 ++++++++++--------- 2 files changed, 26 insertions(+), 22 deletions(-) diff --git a/frontend/src/app/components/pool-ranking/pool-ranking.component.ts b/frontend/src/app/components/pool-ranking/pool-ranking.component.ts index a5349ee7c..ea3a52e8e 100644 --- a/frontend/src/app/components/pool-ranking/pool-ranking.component.ts +++ b/frontend/src/app/components/pool-ranking/pool-ranking.component.ts @@ -162,10 +162,10 @@ export class PoolRankingComponent implements OnInit { if (this.miningWindowPreference === '24h') { return `${pool.name} (${pool.share}%)
` + pool.lastEstimatedHashrate.toString() + ' PH/s' + - `
` + $localize`:@@1bb6965f8e1bbe40c076528ffd841da86f57f119:${ i }:INTERPOLATION: blocks`; + `
` + $localize`${ i }:INTERPOLATION: blocks`; } else { return `${pool.name} (${pool.share}%)
` + - $localize`:@@1bb6965f8e1bbe40c076528ffd841da86f57f119:${ i }:INTERPOLATION: blocks`; + $localize`${ i }:INTERPOLATION: blocks`; } } }, @@ -196,13 +196,14 @@ export class PoolRankingComponent implements OnInit { borderColor: '#000', formatter: () => { const percentage = totalShareOther.toFixed(2) + '%'; + const i = totalBlockOther.toString(); if (this.miningWindowPreference === '24h') { return `` + $localize`Other (${percentage})` + `
` + totalEstimatedHashrateOther.toString() + ' PH/s' + - `
` + $localize`:@@1bb6965f8e1bbe40c076528ffd841da86f57f119:${ totalBlockOther.toString() }:INTERPOLATION: blocks`; + `
` + $localize`${ i }:INTERPOLATION: blocks`; } else { return `` + $localize`Other (${percentage})` + `
` + - $localize`:@@1bb6965f8e1bbe40c076528ffd841da86f57f119:${ totalBlockOther.toString() }:INTERPOLATION: blocks`; + $localize`${ i }:INTERPOLATION: blocks`; } } }, diff --git a/frontend/src/locale/messages.xlf b/frontend/src/locale/messages.xlf index b74f94c26..0fd5bdcd7 100644 --- a/frontend/src/locale/messages.xlf +++ b/frontend/src/locale/messages.xlf @@ -2919,22 +2919,6 @@ src/app/components/mempool-blocks/mempool-blocks.component.html 35,36 - - src/app/components/pool-ranking/pool-ranking.component.ts - 165,163 - - - src/app/components/pool-ranking/pool-ranking.component.ts - 168,167 - - - src/app/components/pool-ranking/pool-ranking.component.ts - 202,200 - - - src/app/components/pool-ranking/pool-ranking.component.ts - 205,204 - src/app/lightning/channel/channel-box/channel-box.component.html 78 @@ -3725,15 +3709,34 @@ 58 + + blocks + + src/app/components/pool-ranking/pool-ranking.component.ts + 165,163 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 168,167 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 203,201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 206,205 + + Other () src/app/components/pool-ranking/pool-ranking.component.ts - 200 + 201 src/app/components/pool-ranking/pool-ranking.component.ts - 204 + 205 src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts