fix issue with displaying languages (#2130)

* 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>
This commit is contained in:
Tiago Vasconcelos
2023-11-30 12:55:46 +00:00
committed by GitHub
parent 62b0e3fe89
commit e46b12d267
3 changed files with 29 additions and 31 deletions

View File

@@ -240,11 +240,10 @@
class="float-right" class="float-right"
> >
<q-badge> <q-badge>
{% raw %}{{ extension.installedRelease.version }}{% endraw {% raw %}{{ extension.installedRelease.version }}{% endraw %}
%}<q-tooltip <q-tooltip>
>{%raw%}{{ $t('extension_installed_version') <span v-text="$t('extension_installed_version')"></span>
}}{%endraw%}</q-tooltip </q-tooltip>
>
</q-badge> </q-badge>
</div> </div>
</div> </div>

View File

@@ -84,8 +84,8 @@
:label="$t('scan')" :label="$t('scan')"
> >
<q-tooltip <q-tooltip
>{% raw %}{{$t('camera_tooltip')}}{% endraw %}</q-tooltip ><span v-text="$t('camera_tooltip')"></span
> ></q-tooltip>
</q-btn> </q-btn>
</div> </div>
</div> </div>
@@ -118,9 +118,9 @@
color="grey" color="grey"
@click="showChart" @click="showChart"
> >
<q-tooltip <q-tooltip>
>{% raw %}{{$t('chart_tooltip')}}{% endraw %}</q-tooltip <span v-text="$t('chart_tooltip')"></span
> ></q-tooltip>
</q-btn> </q-btn>
</div> </div>
</div> </div>
@@ -760,11 +760,11 @@
class="q-mt-xs q-ml-sm q-mr-auto" class="q-mt-xs q-ml-sm q-mr-auto"
v-if="parse.copy.show" v-if="parse.copy.show"
@click="pasteToTextArea" @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 <q-btn
v-close-popup v-close-popup
flat flat

View File

@@ -60,8 +60,12 @@
{%endif%}{% endblock %} {%endif%}{% endblock %}
</q-toolbar-title> </q-toolbar-title>
{% block beta %} {% if VOIDWALLET %} {% block beta %} {% if VOIDWALLET %}
<q-badge color="red" text-color="black" class="q-mr-md"> <q-badge
{% raw %}{{ $t('voidwallet_active') }}{% endraw %} v-text="$t('voidwallet_active')"
color="red"
text-color="black"
class="q-mr-md"
>
</q-badge> </q-badge>
{%endif%} {%endif%}
<q-badge <q-badge
@@ -124,12 +128,10 @@
:active="activeLanguage(lang.value)" :active="activeLanguage(lang.value)"
@click="changeLanguage(lang.value)" @click="changeLanguage(lang.value)"
><q-item-section> ><q-item-section>
{% raw %}
<q-item-label <q-item-label
>{{lang.display ?? lang.value.toUpperCase()}}</q-item-label v-text="lang.display ?? lang.value.toUpperCase()"
> ></q-item-label>
<q-tooltip>{{lang.label}}</q-tooltip> <q-tooltip><span v-text="lang.label"></span></q-tooltip>
{% endraw %}
</q-item-section> </q-item-section>
</q-item> </q-item>
</q-list> </q-list>
@@ -244,9 +246,7 @@
:icon="($q.dark.isActive) ? 'brightness_3' : 'wb_sunny'" :icon="($q.dark.isActive) ? 'brightness_3' : 'wb_sunny'"
size="sm" size="sm"
> >
<q-tooltip <q-tooltip><span v-text="$t('toggle_darkmode')"></span></q-tooltip>
>{% raw %}{{ $t('toggle_darkmode') }}{% endraw %}</q-tooltip
>
</q-btn> </q-btn>
</q-toolbar> </q-toolbar>
</q-header> </q-header>
@@ -285,9 +285,8 @@
{{ SITE_TITLE }}, {{SITE_TAGLINE}} {{ SITE_TITLE }}, {{SITE_TAGLINE}}
<br /> <br />
<small <small
>{% raw %}{{ $t('lnbits_version') }}{% endraw %}: v-text="$t('lnbits_version') + ': {{LNBITS_VERSION}}'"
{{LNBITS_VERSION}} ></small>
</small>
</q-toolbar-title> </q-toolbar-title>
<q-space></q-space> <q-space></q-space>
<q-btn <q-btn
@@ -299,10 +298,10 @@
target="_blank" target="_blank"
rel="noopener" rel="noopener"
> >
{% raw %}{{ $t('api_docs') }}{% endraw %} <span v-text="$t('api_docs')"></span>
<q-tooltip <q-tooltip
>{% raw %}{{ $t('view_swagger_docs') }}{% endraw %}</q-tooltip ><span v-text="$t('view_swagger_docs')"></span
> ></q-tooltip>
</q-btn> </q-btn>
<q-btn <q-btn
flat flat
@@ -314,7 +313,7 @@
target="_blank" target="_blank"
rel="noopener" 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-btn>
</q-toolbar> </q-toolbar>
</q-footer> </q-footer>