From e46b12d267f3fa85225f1e6f95e62ded17046b86 Mon Sep 17 00:00:00 2001
From: Tiago Vasconcelos <talvasconcelos@gmail.com>
Date: Thu, 30 Nov 2023 12:55:46 +0000
Subject: [PATCH] fix issue with displaying languages (#2130)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix issue with displaying languages

* readd tooltip

* remove all raw stuff

* fix api docs tooltip

* fix remaining {% raw %} + $t() usage

---------

Co-authored-by: dni ⚡ <office@dnilabs.com>
Co-authored-by: Pavol Rusnak <pavol@rusnak.io>
---
 lnbits/core/templates/core/extensions.html |  9 +++---
 lnbits/core/templates/core/wallet.html     | 18 ++++++------
 lnbits/templates/base.html                 | 33 +++++++++++-----------
 3 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/lnbits/core/templates/core/extensions.html b/lnbits/core/templates/core/extensions.html
index bec5de629..7e68c2cd7 100644
--- a/lnbits/core/templates/core/extensions.html
+++ b/lnbits/core/templates/core/extensions.html
@@ -240,11 +240,10 @@
             class="float-right"
           >
             <q-badge>
-              {% raw %}{{ extension.installedRelease.version }}{% endraw
-              %}<q-tooltip
-                >{%raw%}{{ $t('extension_installed_version')
-                }}{%endraw%}</q-tooltip
-              >
+              {% raw %}{{ extension.installedRelease.version }}{% endraw %}
+              <q-tooltip>
+                <span v-text="$t('extension_installed_version')"></span>
+              </q-tooltip>
             </q-badge>
           </div>
         </div>
diff --git a/lnbits/core/templates/core/wallet.html b/lnbits/core/templates/core/wallet.html
index d0062996a..b1c7d43e0 100644
--- a/lnbits/core/templates/core/wallet.html
+++ b/lnbits/core/templates/core/wallet.html
@@ -84,8 +84,8 @@
                 :label="$t('scan')"
               >
                 <q-tooltip
-                  >{% raw %}{{$t('camera_tooltip')}}{% endraw %}</q-tooltip
-                >
+                  ><span v-text="$t('camera_tooltip')"></span
+                ></q-tooltip>
               </q-btn>
             </div>
           </div>
@@ -118,9 +118,9 @@
                   color="grey"
                   @click="showChart"
                 >
-                  <q-tooltip
-                    >{% raw %}{{$t('chart_tooltip')}}{% endraw %}</q-tooltip
-                  >
+                  <q-tooltip>
+                    <span v-text="$t('chart_tooltip')"></span
+                  ></q-tooltip>
                 </q-btn>
               </div>
             </div>
@@ -760,11 +760,11 @@
                   class="q-mt-xs q-ml-sm q-mr-auto"
                   v-if="parse.copy.show"
                   @click="pasteToTextArea"
-                  ><q-tooltip
-                    >{% raw %}{{$t('paste_from_clipboard')}}{% endraw
-                    %}</q-tooltip
-                  ></q-icon
                 >
+                  <q-tooltip>
+                    <span v-text="$t('paste_from_clipboard')"></span>
+                  </q-tooltip>
+                </q-icon>
                 <q-btn
                   v-close-popup
                   flat
diff --git a/lnbits/templates/base.html b/lnbits/templates/base.html
index 10ae37f89..81d73cb12 100644
--- a/lnbits/templates/base.html
+++ b/lnbits/templates/base.html
@@ -60,8 +60,12 @@
             {%endif%}{% endblock %}
           </q-toolbar-title>
           {% block beta %} {% if VOIDWALLET %}
-          <q-badge color="red" text-color="black" class="q-mr-md">
-            {% raw %}{{ $t('voidwallet_active') }}{% endraw %}
+          <q-badge
+            v-text="$t('voidwallet_active')"
+            color="red"
+            text-color="black"
+            class="q-mr-md"
+          >
           </q-badge>
           {%endif%}
           <q-badge
@@ -124,12 +128,10 @@
                 :active="activeLanguage(lang.value)"
                 @click="changeLanguage(lang.value)"
                 ><q-item-section>
-                  {% raw %}
                   <q-item-label
-                    >{{lang.display ?? lang.value.toUpperCase()}}</q-item-label
-                  >
-                  <q-tooltip>{{lang.label}}</q-tooltip>
-                  {% endraw %}
+                    v-text="lang.display ?? lang.value.toUpperCase()"
+                  ></q-item-label>
+                  <q-tooltip><span v-text="lang.label"></span></q-tooltip>
                 </q-item-section>
               </q-item>
             </q-list>
@@ -244,9 +246,7 @@
             :icon="($q.dark.isActive) ? 'brightness_3' : 'wb_sunny'"
             size="sm"
           >
-            <q-tooltip
-              >{% raw %}{{ $t('toggle_darkmode') }}{% endraw %}</q-tooltip
-            >
+            <q-tooltip><span v-text="$t('toggle_darkmode')"></span></q-tooltip>
           </q-btn>
         </q-toolbar>
       </q-header>
@@ -285,9 +285,8 @@
             {{ SITE_TITLE }}, {{SITE_TAGLINE}}
             <br />
             <small
-              >{% raw %}{{ $t('lnbits_version') }}{% endraw %}:
-              {{LNBITS_VERSION}}
-            </small>
+              v-text="$t('lnbits_version') + ': {{LNBITS_VERSION}}'"
+            ></small>
           </q-toolbar-title>
           <q-space></q-space>
           <q-btn
@@ -299,10 +298,10 @@
             target="_blank"
             rel="noopener"
           >
-            {% raw %}{{ $t('api_docs') }}{% endraw %}
+            <span v-text="$t('api_docs')"></span>
             <q-tooltip
-              >{% raw %}{{ $t('view_swagger_docs') }}{% endraw %}</q-tooltip
-            >
+              ><span v-text="$t('view_swagger_docs')"></span
+            ></q-tooltip>
           </q-btn>
           <q-btn
             flat
@@ -314,7 +313,7 @@
             target="_blank"
             rel="noopener"
           >
-            <q-tooltip>{% raw %}{{ $t('view_github') }}{% endraw %}</q-tooltip>
+            <q-tooltip><span v-text="$t('view_github')"></span></q-tooltip>
           </q-btn>
         </q-toolbar>
       </q-footer>