From 568a1be91fe86b814b49569e4bbbc5c233b7ee3e Mon Sep 17 00:00:00 2001 From: benarc Date: Wed, 2 Feb 2022 13:07:12 +0000 Subject: [PATCH] Adding denomination for alternative currencies --- lnbits/core/templates/core/wallet.html | 34 ++++++++++++++++++++------ lnbits/helpers.py | 1 + lnbits/settings.py | 1 + 3 files changed, 28 insertions(+), 8 deletions(-) diff --git a/lnbits/core/templates/core/wallet.html b/lnbits/core/templates/core/wallet.html index 9ca00ad5..3edfbb7e 100644 --- a/lnbits/core/templates/core/wallet.html +++ b/lnbits/core/templates/core/wallet.html @@ -15,8 +15,8 @@

- {% raw %}{{ formattedBalance }}{% endraw %} - sat + {% raw %}{{ formattedBalance }} {% endraw %} + {{LNBITS_DENOMINATION}} {{receive.lnurl.domain}} is requesting an invoice:

- + {% endraw %} {% if LNBITS_DENOMINATION != 'sats' %} + {% else %} + {% endif %} {% raw %} +
{% raw %} -
{{ parse.invoice.fsat }} sat
+
+ {{ parse.invoice.fsat }} {{LNBITS_DENOMINATION}} +

Description: {{ parse.invoice.description }}
@@ -489,7 +504,7 @@

{{ parse.lnurlpay.domain }} is requesting {{ - parse.lnurlpay.maxSendable | msatoshiFormat }} sat + parse.lnurlpay.maxSendable | msatoshiFormat }} {{LNBITS_DENOMINATION}}
and a {{parse.lnurlpay.commentAllowed}}-char comment @@ -499,7 +514,8 @@ {{ parse.lnurlpay.targetUser || parse.lnurlpay.domain }} is requesting
between {{ parse.lnurlpay.minSendable | msatoshiFormat }} and - {{ parse.lnurlpay.maxSendable | msatoshiFormat }} sat + {{ parse.lnurlpay.maxSendable | msatoshiFormat }} + {% endraw %} {{LNBITS_DENOMINATION}} {% raw %}
and a {{parse.lnurlpay.commentAllowed}}-char comment @@ -521,7 +537,7 @@ dense v-model.number="parse.data.amount" type="number" - label="Amount (sat) *" + label="Amount ({{LNBITS_DENOMINATION}}) *" :min="parse.lnurlpay.minSendable / 1000" :max="parse.lnurlpay.maxSendable / 1000" :readonly="parse.lnurlpay.fixed" @@ -539,7 +555,9 @@

- Send satoshis + Send {{LNBITS_DENOMINATION}} Cancel diff --git a/lnbits/helpers.py b/lnbits/helpers.py index a1396411..dfd9d53d 100644 --- a/lnbits/helpers.py +++ b/lnbits/helpers.py @@ -156,6 +156,7 @@ def template_renderer(additional_folders: List = []) -> Jinja2Templates: ) ) t.env.globals["SITE_TITLE"] = settings.LNBITS_SITE_TITLE + t.env.globals["LNBITS_DENOMINATION"] = settings.LNBITS_DENOMINATION t.env.globals["SITE_TAGLINE"] = settings.LNBITS_SITE_TAGLINE t.env.globals["SITE_DESCRIPTION"] = settings.LNBITS_SITE_DESCRIPTION t.env.globals["LNBITS_THEME_OPTIONS"] = settings.LNBITS_THEME_OPTIONS diff --git a/lnbits/settings.py b/lnbits/settings.py index 1ca0c2da..b204e28f 100644 --- a/lnbits/settings.py +++ b/lnbits/settings.py @@ -34,6 +34,7 @@ LNBITS_DISABLED_EXTENSIONS: List[str] = env.list( ) LNBITS_SITE_TITLE = env.str("LNBITS_SITE_TITLE", default="LNbits") +LNBITS_DENOMINATION = env.str("LNBITS_DENOMINATION", default="sats") LNBITS_SITE_TAGLINE = env.str( "LNBITS_SITE_TAGLINE", default="free and open-source lightning wallet" )