Skip to content

Commit

Permalink
Merge branch 'master' into upgrade_flask
Browse files Browse the repository at this point in the history
  • Loading branch information
Kim Neunert authored Apr 13, 2022
2 parents 48a22e1 + 34a6cb1 commit ddb2cad
Showing 1 changed file with 15 additions and 13 deletions.
28 changes: 15 additions & 13 deletions src/cryptoadvance/specter/server_endpoints/wallets_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -804,7 +804,7 @@ def txlist_to_csv(wallet: Wallet, _txlist, includePricesHistory=False):
lazy_gettext("Value ({})").format(symbol),
lazy_gettext("Rate (BTC/{})").format(symbol)
if app.specter.unit != "sat"
else _("Rate ({}/SAT)").format(symbol),
else lazy_gettext("Rate ({}/SAT)").format(symbol),
lazy_gettext("TxID"),
lazy_gettext("Address"),
lazy_gettext("Block Height"),
Expand Down Expand Up @@ -887,11 +887,12 @@ def addresses_list_to_csv(wallet: Wallet):
w = csv.writer(data)
# write header
row = (
_("Address"),
_("Label"),
_("Index"),
_("Used"),
_("Current balance"),
# For some reason (probably app-context_specific) the _ apprev of lazy_gettext does not work
lazy_gettext("Address"),
lazy_gettext("Label"),
lazy_gettext("Index"),
lazy_gettext("Used"),
lazy_gettext("Current balance"),
)
w.writerow(row)
yield data.getvalue()
Expand Down Expand Up @@ -938,13 +939,14 @@ def wallet_addresses_list_to_csv(addresses_list):
w = csv.writer(data)
# write header
row = (
_("Index"),
_("Address"),
_("Type"),
_("Label"),
_("Used"),
_("UTXO"),
_("Amount (BTC)"),
# For some reason (probably app-context_specific) the _ apprev of lazy_gettext does not work
lazy_gettext("Index"),
lazy_gettext("Address"),
lazy_gettext("Type"),
lazy_gettext("Label"),
lazy_gettext("Used"),
lazy_gettext("UTXO"),
lazy_gettext("Amount (BTC)"),
)
w.writerow(row)
yield data.getvalue()
Expand Down

0 comments on commit ddb2cad

Please sign in to comment.