Revert "revert conflicts (blockscout#30)" (blockscout#32)

This reverts commit 2b60366.
planq-network · Oct 13, 2021 · 5e2d0fe · 5e2d0fe
1 parent 4e222e1
commit 5e2d0fe
Show file tree

Hide file tree

Showing 4 changed files with 210 additions and 217 deletions.
diff --git a/...k_scout_web/lib/block_scout_web/templates/transaction_internal_transaction/index.html.eex b/...k_scout_web/lib/block_scout_web/templates/transaction_internal_transaction/index.html.eex
@@ -14,7 +14,7 @@
       </button>
       <div data-empty-response-message style="display: none;">
         <div class="tile tile-muted text-center" data-selector="empty-logs-list">
-          <%= gettext "Internal transactions are not supported yet." %>
+          <%= gettext "No internal transactions found." %>
         </div>
       </div>
 

diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot
@@ -2945,12 +2945,6 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#, elixir-format
-#:
-#: lib/block_scout_web/templates/transaction_internal_transaction/index.html.eex:17
-msgid "Internal transactions are not supported yet."
-msgstr ""
-
 #, elixir-format
 #: lib/block_scout_web/templates/layout/_footer.html.eex:52
 msgid "Resources"
@@ -2981,6 +2975,12 @@ msgstr ""
 msgid "Block Proposer"
 msgstr ""
 
+#, elixir-format
+#:
+#: lib/block_scout_web/templates/transaction_internal_transaction/index.html.eex:17
+msgid "No internal transactions found."
+msgstr ""
+
 #, elixir-format
 #: lib/block_scout_web/templates/chain/show.html.eex:41
 msgid "CRO Price"

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
@@ -2945,12 +2945,6 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#, elixir-format
-#:
-#: lib/block_scout_web/templates/transaction_internal_transaction/index.html.eex:17
-msgid "Internal transactions are not supported yet."
-msgstr ""
-
 #, elixir-format
 #: lib/block_scout_web/templates/layout/_footer.html.eex:52
 msgid "Resources"
@@ -2981,6 +2975,12 @@ msgstr ""
 msgid "Block Proposer"
 msgstr ""
 
+#, elixir-format
+#:
+#: lib/block_scout_web/templates/transaction_internal_transaction/index.html.eex:17
+msgid "No internal transactions found."
+msgstr ""
+
 #, elixir-format
 #: lib/block_scout_web/templates/chain/show.html.eex:41
 msgid "CRO Price"