From 24d606dbed40203de7b4ef58cea6afb5e164d939 Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Wed, 18 Sep 2019 17:40:34 +0300 Subject: [PATCH] Fix stuck label and value for uncle block height --- CHANGELOG.md | 1 + .../templates/block/overview.html.eex | 3 +- apps/block_scout_web/priv/gettext/default.pot | 28 +++++++++---------- .../priv/gettext/en/LC_MESSAGES/default.po | 28 +++++++++---------- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 30f508dbd2..d98f2c0141 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - [#2663](https://github.com/poanetwork/blockscout/pull/2663) - Fetch address counters in parallel ### Fixes +- [#2709](https://github.com/poanetwork/blockscout/pull/2709) - Fix stuck label and value for uncle block height - [#2707](https://github.com/poanetwork/blockscout/pull/2707) - fix for dashboard banner chart legend items - [#2701](https://github.com/poanetwork/blockscout/pull/2701) - Exclude nonconsensus blocks from avg block time calculation by default - [#2696](https://github.com/poanetwork/blockscout/pull/2696) - do not update fetched_coin_balance with nil diff --git a/apps/block_scout_web/lib/block_scout_web/templates/block/overview.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/block/overview.html.eex index 752fd314e3..c2774ce4bd 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/block/overview.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/block/overview.html.eex @@ -12,8 +12,7 @@ <%= if block_type(@block) == "Block" do %> <%= gettext("Block Height: %{height}", height: @block.number) %> <%= if @block.number == 0, do: "- " <> gettext("Genesis Block")%> <% else %> - <%= gettext("%{block_type} Height:", block_type: block_type(@block)) %> - <%= link(@block, to: block_path(BlockScoutWeb.Endpoint, :show, @block.number)) %> + <%= gettext("%{block_type} Height:", block_type: block_type(@block)) %> <%= link(@block, to: block_path(BlockScoutWeb.Endpoint, :show, @block.number)) %> <% end %>
diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot index 8a1582b2e7..dfe785c39b 100644 --- a/apps/block_scout_web/priv/gettext/default.pot +++ b/apps/block_scout_web/priv/gettext/default.pot @@ -43,7 +43,7 @@ msgid "%{block_type}s" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/block/overview.html.eex:21 +#: lib/block_scout_web/templates/block/overview.html.eex:20 #: lib/block_scout_web/templates/chain/_block.html.eex:11 msgid "%{count} Transactions" msgstr "" @@ -480,7 +480,7 @@ msgid "Copy Txn Hash" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/block/overview.html.eex:59 +#: lib/block_scout_web/templates/block/overview.html.eex:58 msgid "Difficulty" msgstr "" @@ -562,15 +562,15 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/block/_tile.html.eex:56 -#: lib/block_scout_web/templates/block/overview.html.eex:109 -#: lib/block_scout_web/templates/block/overview.html.eex:159 +#: lib/block_scout_web/templates/block/overview.html.eex:108 +#: lib/block_scout_web/templates/block/overview.html.eex:158 msgid "Gas Limit" msgstr "" #, elixir-format #: lib/block_scout_web/templates/block/_tile.html.eex:61 -#: lib/block_scout_web/templates/block/overview.html.eex:102 -#: lib/block_scout_web/templates/block/overview.html.eex:153 +#: lib/block_scout_web/templates/block/overview.html.eex:101 +#: lib/block_scout_web/templates/block/overview.html.eex:152 msgid "Gas Used" msgstr "" @@ -657,7 +657,7 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/block/_tile.html.eex:38 -#: lib/block_scout_web/templates/block/overview.html.eex:125 +#: lib/block_scout_web/templates/block/overview.html.eex:124 #: lib/block_scout_web/templates/chain/_block.html.eex:15 msgid "Miner" msgstr "" @@ -712,7 +712,7 @@ msgid "Execute" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/block/overview.html.eex:74 +#: lib/block_scout_web/templates/block/overview.html.eex:73 #: lib/block_scout_web/templates/transaction/overview.html.eex:79 msgid "Nonce" msgstr "" @@ -767,7 +767,7 @@ msgid "GET" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/block/overview.html.eex:85 +#: lib/block_scout_web/templates/block/overview.html.eex:84 msgid "Position %{index}" msgstr "" @@ -798,7 +798,7 @@ msgid "Gwei" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/block/overview.html.eex:37 +#: lib/block_scout_web/templates/block/overview.html.eex:36 msgid "Hash" msgstr "" @@ -964,7 +964,7 @@ msgid "Top Accounts - %{subnetwork} Explorer" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/block/overview.html.eex:68 +#: lib/block_scout_web/templates/block/overview.html.eex:67 msgid "Total Difficulty" msgstr "" @@ -1246,7 +1246,7 @@ msgid "Parameters" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/block/overview.html.eex:44 +#: lib/block_scout_web/templates/block/overview.html.eex:43 msgid "Parent Hash" msgstr "" @@ -1404,7 +1404,7 @@ msgid "Show Validator Info" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/block/overview.html.eex:146 +#: lib/block_scout_web/templates/block/overview.html.eex:145 msgid "Block Rewards" msgstr "" @@ -1646,7 +1646,7 @@ msgid "Uncle Reward" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/block/overview.html.eex:81 +#: lib/block_scout_web/templates/block/overview.html.eex:80 #: lib/block_scout_web/templates/layout/_topnav.html.eex:52 msgid "Uncles" msgstr "" diff --git a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po index 8a1582b2e7..dfe785c39b 100644 --- a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po +++ b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po @@ -43,7 +43,7 @@ msgid "%{block_type}s" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/block/overview.html.eex:21 +#: lib/block_scout_web/templates/block/overview.html.eex:20 #: lib/block_scout_web/templates/chain/_block.html.eex:11 msgid "%{count} Transactions" msgstr "" @@ -480,7 +480,7 @@ msgid "Copy Txn Hash" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/block/overview.html.eex:59 +#: lib/block_scout_web/templates/block/overview.html.eex:58 msgid "Difficulty" msgstr "" @@ -562,15 +562,15 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/block/_tile.html.eex:56 -#: lib/block_scout_web/templates/block/overview.html.eex:109 -#: lib/block_scout_web/templates/block/overview.html.eex:159 +#: lib/block_scout_web/templates/block/overview.html.eex:108 +#: lib/block_scout_web/templates/block/overview.html.eex:158 msgid "Gas Limit" msgstr "" #, elixir-format #: lib/block_scout_web/templates/block/_tile.html.eex:61 -#: lib/block_scout_web/templates/block/overview.html.eex:102 -#: lib/block_scout_web/templates/block/overview.html.eex:153 +#: lib/block_scout_web/templates/block/overview.html.eex:101 +#: lib/block_scout_web/templates/block/overview.html.eex:152 msgid "Gas Used" msgstr "" @@ -657,7 +657,7 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/block/_tile.html.eex:38 -#: lib/block_scout_web/templates/block/overview.html.eex:125 +#: lib/block_scout_web/templates/block/overview.html.eex:124 #: lib/block_scout_web/templates/chain/_block.html.eex:15 msgid "Miner" msgstr "" @@ -712,7 +712,7 @@ msgid "Execute" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/block/overview.html.eex:74 +#: lib/block_scout_web/templates/block/overview.html.eex:73 #: lib/block_scout_web/templates/transaction/overview.html.eex:79 msgid "Nonce" msgstr "" @@ -767,7 +767,7 @@ msgid "GET" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/block/overview.html.eex:85 +#: lib/block_scout_web/templates/block/overview.html.eex:84 msgid "Position %{index}" msgstr "" @@ -798,7 +798,7 @@ msgid "Gwei" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/block/overview.html.eex:37 +#: lib/block_scout_web/templates/block/overview.html.eex:36 msgid "Hash" msgstr "" @@ -964,7 +964,7 @@ msgid "Top Accounts - %{subnetwork} Explorer" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/block/overview.html.eex:68 +#: lib/block_scout_web/templates/block/overview.html.eex:67 msgid "Total Difficulty" msgstr "" @@ -1246,7 +1246,7 @@ msgid "Parameters" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/block/overview.html.eex:44 +#: lib/block_scout_web/templates/block/overview.html.eex:43 msgid "Parent Hash" msgstr "" @@ -1404,7 +1404,7 @@ msgid "Show Validator Info" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/block/overview.html.eex:146 +#: lib/block_scout_web/templates/block/overview.html.eex:145 msgid "Block Rewards" msgstr "" @@ -1646,7 +1646,7 @@ msgid "Uncle Reward" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/block/overview.html.eex:81 +#: lib/block_scout_web/templates/block/overview.html.eex:80 #: lib/block_scout_web/templates/layout/_topnav.html.eex:52 msgid "Uncles" msgstr ""