knadh/listmonk
1
1
Fork 0
mirror of https://github.com/knadh/listmonk.git synced 2025-02-01 03:00:30 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix inconsistent non-ii18n tag and label displays.

Browse source
This commit is contained in:
Kailash Nadh 2021-09-19 14:51:42 +05:30
parent 2ed54b8609
commit 6a316979f8
6 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
frontend/src/views/Campaign.vue
View file

@ -3,8 +3,12 @@
<header class="columns"> <header class="columns">
<div class="column is-8"> <div class="column is-8">
<p v-if="isEditing" class="tags"> <p v-if="isEditing" class="tags">
<b-tag v-if="isEditing" :class="data.status">{{ data.status }}</b-tag> <b-tag v-if="isEditing" :class="data.status">
<b-tag v-if="data.type === 'optin'" :class="data.type">{{ data.type }}</b-tag> {{ $t(`campaigns.status.${data.status}`) }}
</b-tag>
<b-tag v-if="data.type === 'optin'" :class="data.type">
{{ $t('lists.optin') }}
</b-tag>
<span v-if="isEditing" class="has-text-grey-light is-size-7"> <span v-if="isEditing" class="has-text-grey-light is-size-7">
{{ $t('globals.fields.id') }}: {{ data.id }} / {{ $t('globals.fields.id') }}: {{ data.id }} /
{{ $t('globals.fields.uuid') }}: {{ data.uuid }} {{ $t('globals.fields.uuid') }}: {{ data.uuid }}

4
frontend/src/views/Campaigns.vue
View file

@ -58,8 +58,8 @@
sortable header-class="cy-name"> sortable header-class="cy-name">
<div> <div>
<p> <p>
<b-tag v-if="props.row.type !== 'regular'" class="is-small"> <b-tag v-if="props.row.type === 'optin'" class="is-small">
{{ props.row.type }} {{ $t('lists.optin') }}
</b-tag> </b-tag>
<router-link :to="{ name: 'campaign', params: { 'id': props.row.id }}"> <router-link :to="{ name: 'campaign', params: { 'id': props.row.id }}">
{{ props.row.name }}</router-link> {{ props.row.name }}</router-link>

4
frontend/src/views/ListForm.vue
View file

@ -6,7 +6,9 @@
{{ $t('globals.fields.id') }}: {{ data.id }} / {{ $t('globals.fields.id') }}: {{ data.id }} /
{{ $t('globals.fields.uuid') }}: {{ data.uuid }} {{ $t('globals.fields.uuid') }}: {{ data.uuid }}
</p> </p>
<b-tag v-if="isEditing" :class="[data.type, 'is-pulled-right']">{{ data.type }}</b-tag> <b-tag v-if="isEditing" :class="[data.type, 'is-pulled-right']">
{{ $t(`lists.types.${data.type}`) }}
</b-tag>
<h4 v-if="isEditing">{{ data.name }}</h4> <h4 v-if="isEditing">{{ data.name }}</h4>
<h4 v-else>{{ $t('lists.newList') }}</h4> <h4 v-else>{{ $t('lists.newList') }}</h4>
</header> </header>

4
frontend/src/views/Lists.vue
View file

@ -42,14 +42,14 @@
header-class="cy-type" sortable> header-class="cy-type" sortable>
<div> <div>
<b-tag :class="props.row.type" :data-cy="`type-${props.row.type}`"> <b-tag :class="props.row.type" :data-cy="`type-${props.row.type}`">
{{ $t('lists.types.' + props.row.type) }} {{ $t(`lists.types.${props.row.type}`) }}
</b-tag> </b-tag>
{{ ' ' }} {{ ' ' }}
<b-tag :data-cy="`optin-${props.row.optin}`"> <b-tag :data-cy="`optin-${props.row.optin}`">
<b-icon :icon="props.row.optin === 'double' ? <b-icon :icon="props.row.optin === 'double' ?
'account-check-outline' : 'account-off-outline'" size="is-small" /> 'account-check-outline' : 'account-off-outline'" size="is-small" />
{{ ' ' }} {{ ' ' }}
{{ $t('lists.optins.' + props.row.optin) }} {{ $t(`lists.optins.${props.row.optin}`) }}
</b-tag>{{ ' ' }} </b-tag>{{ ' ' }}
<a v-if="props.row.optin === 'double'" class="is-size-7 send-optin" <a v-if="props.row.optin === 'double'" class="is-size-7 send-optin"
href="#" @click="$utils.confirm(null, () => createOptinCampaign(props.row))" href="#" @click="$utils.confirm(null, () => createOptinCampaign(props.row))"

4
frontend/src/views/SubscriberForm.vue
View file

@ -2,7 +2,9 @@
<form @submit.prevent="onSubmit"> <form @submit.prevent="onSubmit">
<div class="modal-card content" style="width: auto"> <div class="modal-card content" style="width: auto">
<header class="modal-card-head"> <header class="modal-card-head">
<b-tag v-if="isEditing" :class="[data.status, 'is-pulled-right']">{{ data.status }}</b-tag> <b-tag v-if="isEditing" :class="[data.status, 'is-pulled-right']">
{{ $t(`subscribers.status.${data.status}`) }}
</b-tag>
<h4 v-if="isEditing">{{ data.name }}</h4> <h4 v-if="isEditing">{{ data.name }}</h4>
<h4 v-else>{{ $t('subscribers.newSubscriber') }}</h4> <h4 v-else>{{ $t('subscribers.newSubscriber') }}</h4>

2
frontend/src/views/Subscribers.vue
View file

@ -118,7 +118,7 @@
<a :href="`/subscribers/${props.row.id}`" <a :href="`/subscribers/${props.row.id}`"
@click.prevent="showEditForm(props.row)"> @click.prevent="showEditForm(props.row)">
<b-tag :class="props.row.status"> <b-tag :class="props.row.status">
{{ $t('subscribers.status.'+ props.row.status) }} {{ $t(`subscribers.status.${props.row.status}`) }}
</b-tag> </b-tag>
</a> </a>
</b-table-column> </b-table-column>