From ee2506ceab310d5c5e66935674ebf194462ec6c3 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 22 Aug 2019 17:41:55 +0530 Subject: [PATCH] changes updated --- server/i18n/de.json | 6 +++--- server/i18n/en.json | 6 +++--- .../graph-detail/graph-detail.component.html | 4 ++-- .../graph-detail/graph-detail.component.ts | 8 ++++---- .../view/home/graph-list/graph-list.component.html | 8 ++++---- .../view/home/graph-list/graph-list.component.ts | 13 ++++++++++--- src/app/view/home/home-worksapce.component.ts | 6 +++--- 7 files changed, 29 insertions(+), 22 deletions(-) diff --git a/server/i18n/de.json b/server/i18n/de.json index e8d7ebb..6de7357 100644 --- a/server/i18n/de.json +++ b/server/i18n/de.json @@ -11,7 +11,7 @@ "transactions-vs-date" : "Transaktionen nach Datum", "total-difficulty" : "Gesamtschwierigkeit", "target-difficulty" : "Zielschwierigkeit", - "avg-block-interval-per-day" : "Durchschnittliches Sperrintervall / Tag", + "avg-block-interval" : "Durchschnittliches Sperrintervall", "home": { "HEADER_TEXT": "Sie befinden sich in Beta", "COUNTDOWN": "Mainnet-Countdown", @@ -46,7 +46,7 @@ "BLOCKS" : "Blöcke", "BLOCKSINTERVAL" : "Sperrintervall", "SUPPLY_GROWTH_HOVER" : "Aktuelle Blockbelohnung", - "BOCKS_COUNT_HOVER" : "Heute Block Count", + "BOCKS_COUNT_HOVER" : "Anzahl der letzten 24h Blöcke", "TRANSACTION_FEE_HOVER" : "Heute Transaktionsgebühren insgesamt", "BLOCK_INTERVAL_HOVER" : "Heute Blockintervall in Sekunden", "TRANSACTION_LINECHAT_HOVER" : "Heute Gesamtzahl der Transaktionen", @@ -56,7 +56,7 @@ "TRANSACTION_FEES" : "Transkationsgebühren", "SUPPLY_GROWTH" : "Angebotswachstum", "HASHRATE_GROWTH_CHART" : "HashRate-Wachstumstabelle", - "BLOCK_INTERVAL" : "Durchschnittliches Sperrintervall / Tag", + "BLOCK_INTERVAL" : "Durchschnittliches Sperrintervall", "TRANSACTIONS_VS_DATE" : "Transaktionen gegen Datum", "DAYS" : "Tage", "MONTHS" : "Monate", diff --git a/server/i18n/en.json b/server/i18n/en.json index 9fd092e..f6f81a2 100644 --- a/server/i18n/en.json +++ b/server/i18n/en.json @@ -11,7 +11,7 @@ "transactions-by-date" : "Transactions by Date", "total-difficulty" : "Total Difficulty", "target-difficulty" : "Target Difficulty", - "avg-block-interval-per-day" : "Avg Block Interval / Day", + "avg-block-interval" : "Avg Block Interval", "home": { "HEADER_TEXT": "You are on Beta", "COUNTDOWN": "Mainnet Countdown", @@ -46,7 +46,7 @@ "BLOCKS" : "Blocks", "BLOCKSINTERVAL" : "Block Interval", "SUPPLY_GROWTH_HOVER" : "Current Block Reward", - "BOCKS_COUNT_HOVER" : "Today Block Count", + "BOCKS_COUNT_HOVER" : "Last 24h Blocks Count", "TRANSACTION_FEE_HOVER" : "Today Total Transaction Fees", "BLOCK_INTERVAL_HOVER" : "Today Block Interval in Secs", "TRANSACTION_LINECHAT_HOVER" : "Today Total Transaction Count", @@ -56,7 +56,7 @@ "TRANSACTION_FEES" : "Transaction Fees", "SUPPLY_GROWTH" : "Supply Growth", "HASHRATE_GROWTH_CHART" : "HashRate Growth Chart", - "BLOCK_INTERVAL" : "Avg Block Interval / Day", + "BLOCK_INTERVAL" : "Avg Block Interval", "TRANSACTIONS_VS_DATE" : "Transactions by Date", "DAYS" : "days", "MONTHS" : "months", diff --git a/src/app/view/graph-view/graph-detail/graph-detail.component.html b/src/app/view/graph-view/graph-detail/graph-detail.component.html index 621e608..4105224 100644 --- a/src/app/view/graph-view/graph-detail/graph-detail.component.html +++ b/src/app/view/graph-view/graph-detail/graph-detail.component.html @@ -185,8 +185,8 @@
  • {{'home.SUPPLY_GROWTH' | translate}}
    • -
  • {{'home.BLOCK_INTERVAL' | translate}}
    • +
  • {{'home.BLOCK_INTERVAL' | translate}}
  • {{'home.TRANSACTIONS_VS_DATE' | translate}}
  • Blocks by Algorithm diff --git a/src/app/view/graph-view/graph-detail/graph-detail.component.ts b/src/app/view/graph-view/graph-detail/graph-detail.component.ts index 1c54ae6..88ca5a6 100644 --- a/src/app/view/graph-view/graph-detail/graph-detail.component.ts +++ b/src/app/view/graph-view/graph-detail/graph-detail.component.ts @@ -178,13 +178,13 @@ export class GraphDetailComponent implements OnInit { // ); // }); break; - case 'avg-block-interval-per-day': + case 'avg-block-interval': this.comp.Blockspersecreq().then(res => { this.hashdata = this.comp.areaGraphData; this.hashdata.layout.height = 300; // this.hashdata.layout.width = // window.innerWidth - window.innerWidth / 2.8; - this.title = 'Avg Block Interval / Day'; + this.title = 'Avg Block Interval'; this.titleService.setTitle( this.route.snapshot.data.title + ' - ' + this.title, ); @@ -312,13 +312,13 @@ export class GraphDetailComponent implements OnInit { // this.title = 'HashRate Growth Chart'; // }); break; - case 'avg-block-interval-per-day': + case 'avg-block-interval': this.comp.Blockspersecreq(p1, p2, p3).then(res => { this.hashdata = this.comp.areaGraphData; this.hashdata.layout.height = 300; // this.hashdata.layout.width = // window.innerWidth - window.innerWidth / 2.8; - this.title = 'Avg Block Interval / Day'; + this.title = 'Avg Block Interval'; }); break; case 'blocks-by-algorithm': diff --git a/src/app/view/home/graph-list/graph-list.component.html b/src/app/view/home/graph-list/graph-list.component.html index 1087e71..9a0494b 100644 --- a/src/app/view/home/graph-list/graph-list.component.html +++ b/src/app/view/home/graph-list/graph-list.component.html @@ -170,7 +170,7 @@

    {{'home.SUPPLY_GROWTH' | translate}}

    {{ this.gg_last | number - }} + }}Epic
    @@ -407,7 +407,7 @@

    {{'home.BLOCKSINTERVAL' | translate}}

    {{ this.blockinteval_last | number - }} + }}s
    @@ -53,7 +53,7 @@ export class HomeWorksapceComponent extends Utils if (this.router.url == '/all') { this.viewchartvar = false; } else { - this.viewchartvar = true; + this.viewchartvar = false; } }