Browse Source

Merge branch 'main' into dev

module/document
Stephan Richter 3 weeks ago
parent
commit
554b0459fa
  1. 6
      frontend/src/routes/project/Kanban.svelte
  2. 1
      translations/src/main/resources/de.json
  3. 1
      translations/src/main/resources/en.json

6
frontend/src/routes/project/Kanban.svelte

@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
import { onMount } from 'svelte';
import { useTinyRouter } from 'svelte-tiny-router';
import { api } from '../../urls.svelte.js';
import { api, target } from '../../urls.svelte.js';
import { error, yikes } from '../../warn.svelte';
import { t } from '../../translations.svelte.js';
import { user } from '../../user.svelte.js';
@ -217,7 +217,7 @@ @@ -217,7 +217,7 @@
{#if project}
<fieldset class="kanban description {descr?'active':''}" onclick={e => descr = !descr}>
<legend>{t('description')}{t('expand_on_click')}</legend>
{@html project.description.rendered}
{@html target(project.description.rendered)}
</fieldset>
<div class="kanban" style="display: grid; grid-template-columns: {`repeat(${columns}, auto)`}">
<span class="filter">
@ -252,6 +252,6 @@ @@ -252,6 +252,6 @@
{/each}
</div>
<div class="archive {highlight.archive?'hover':''}" ondragover={hover_archive} ondragleave={e => delete highlight.archive} ondrop={do_archive} >
{t('archive')}
{t('hide')}
</div>
{/if}

1
translations/src/main/resources/de.json

@ -108,6 +108,7 @@ @@ -108,6 +108,7 @@
"gross_sum": "Brutto-Summe",
"head": "Kopf-Text",
"hide": "ausblenden",
"hide_closed": "geschlossene ausblenden",
"hide_on_index_page": "nicht in der Aufgabenübersicht anzeigen",
"hours": "Stunden",

1
translations/src/main/resources/en.json

@ -107,6 +107,7 @@ @@ -107,6 +107,7 @@
"gross_sum": "gross sum",
"head": "header text",
"hide": "hide",
"hide_closed": "hide closed",
"hide_on_index_page": "hide on index page",
"hours": "hours",

Loading…
Cancel
Save