fixed merge conflict and fixed number formatting

6 years ago · 475b368ae5
parent e0dfbd2c8b
commit 475b368ae5
2 changed files with 4 additions and 2 deletions
--- a/apps/block_scout_web/lib/block_scout_web/templates/smart_contract/_functions.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/smart_contract/_functions.html.eex
@ -46,8 +46,8 @@
                  <span data-conversion-unit><%= output["value"] %></span>
                  <span class="py-2 px-2">
                    <input class="wei-ether" type="checkbox" autocomplete="off"> 
-                    <span class="d-inline-block" data-conversion-text-wei><%= gettext "WEI" %></span>
-                    <span class="d-none" data-conversion-text-eth><%= gettext "ETH" %></span>
+                    <span class="d-inline-block" data-conversion-text-wei><%= gettext("WEI")%></span>
+                    <span class="d-none" data-conversion-text-eth><%= gettext("ETH")%></span>
                  </span>
                </div>
              <% else %>
--- a/apps/block_scout_web/priv/gettext/default.pot
+++ b/apps/block_scout_web/priv/gettext/default.pot
@ -558,10 +558,12 @@ msgstr ""
 msgid "Last Updated In Block"
 msgstr ""

+#, elixir-format
 #: lib/block_scout_web/templates/smart_contract/_functions.html.eex:51
 msgid "WEI"
 msgstr ""

+#, elixir-format
 #: lib/block_scout_web/templates/smart_contract/_functions.html.eex:52
 msgid "ETH"
 msgstr ""