Browse Source

Merge branch 'main' into dev

module/document
Stephan Richter 3 weeks ago
parent
commit
c6e0971d61
  1. 2
      frontend/src/Components/LineEditor.svelte
  2. 3
      frontend/src/Components/MarkdownEditor.svelte
  3. 2
      frontend/src/Components/MultilineEditor.svelte
  4. 4
      frontend/src/routes/contact/ExtraField.svelte
  5. 4
      frontend/src/routes/project/Kanban.svelte
  6. 6
      translations/src/main/resources/de.json
  7. 9
      translations/src/main/resources/en.json

2
frontend/src/Components/LineEditor.svelte

@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
href = '#',
onclick = evt => { evt.preventDefault(); startEdit(); return false },
onSet = newVal => {return true;},
title = t('long_click_to_edit'),
title = t('click_to_edit'),
type = 'div',
value = $bindable(null)
} = $props();

3
frontend/src/Components/MarkdownEditor.svelte

@ -124,9 +124,10 @@ @@ -124,9 +124,10 @@
<textarea bind:value={editValue.source} onkeyup={typed} autofocus={!simple}></textarea>
<span class="buttons">
<button class="cancel" onclick={e => editing = false}>{t('cancel')}</button>
<span>{t('markdown_supported')}</span>
<button class="save" onclick={doSave}>{t('save')}</button>
</span>
</div>
{/if}
<svelte:element this={type} {onclick} {oncontextmenu} class={{editable}} title={t('long_click_to_edit')} >{@html target(editValue.rendered)}</svelte:element>
<svelte:element this={type} {onclick} {oncontextmenu} class={{editable}} title={t('right_click_to_edit')} >{@html target(editValue.rendered)}</svelte:element>
</div>

2
frontend/src/Components/MultilineEditor.svelte

@ -85,7 +85,7 @@ @@ -85,7 +85,7 @@
<textarea bind:value={editValue} onkeyup={typed} autofocus></textarea>
{:else}
{#if value}
<svelte:element this={type} {onmousedown} {onmouseup} {ontouchstart} {ontouchend} class={{editable}} title={t('long_click_to_edit')} >
<svelte:element this={type} {onmousedown} {onmouseup} {ontouchstart} {ontouchend} class={{editable}} title={t('right_click_to_edit')} >
{#each value.split("\n") as line}
{line}<br/>
{/each}

4
frontend/src/routes/contact/ExtraField.svelte

@ -17,9 +17,9 @@ @@ -17,9 +17,9 @@
{#if field}
<div class={field.name}>
{#if field.value.includes('\\n')}
<MultiLineEditor type="div" editable={true} value={field.value.replaceAll('\\n','\n')} {onSet} title={t(field.name)+' – '+t('long_click_to_edit')} />
<MultiLineEditor type="div" editable={true} value={field.value.replaceAll('\\n','\n')} {onSet} title={t(field.name)+' – '+t('right_click_to_edit')} />
{:else}
<LineEditor type="div" editable={true} value={field.value} {onSet} title={t(field.name)+' – '+t('long_click_to_edit')} />
<LineEditor type="div" editable={true} value={field.value} {onSet} title={t(field.name)+' – '+t('click_to_edit')} />
{/if}
</div>
{/if}

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

@ -23,7 +23,6 @@ @@ -23,7 +23,6 @@
let tasks = $state({});
let users = {};
let columns = $derived(project.allowed_states?Object.keys(project.allowed_states).length+1:1);
const controller = new AbortController();
$effect(() => updateUrl(filter_input));
@ -175,8 +174,7 @@ @@ -175,8 +174,7 @@
}
function openTask(task_id){
controller.abort();
router.navigate(`/task/${task_id}/view`)
window.open(`/task/${task_id}/view`, '_blank').focus();
}
async function save_bookmark(){

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

@ -18,6 +18,7 @@ @@ -18,6 +18,7 @@
"cancel": "abbrechen",
"choose_type": "Typ wählen",
"click_to_edit": "Anklicken zum Bearbeiten",
"client_id": "Client-ID",
"client_secret": "Client-Geheimnis",
"close_settings": "Einstellungen schließen",
@ -137,15 +138,16 @@ @@ -137,15 +138,16 @@
"login_services": "Login-Services",
"logout": "Abmelden",
"logout_user": "{user} abmelden",
"long_click_to_edit": "lang klicken zum Bearbeiten",
"markdown_code": "Markdown-Code",
"markdown_supported": "Markdown & Plantuml nutzbar!",
"MANAGE_LOGIN_SERVICES": "Login-Services verwalten",
"member": "Mitarbeiter",
"members": "Mitarbeiter",
"message": "Nachricht",
"messages": "Benachrichtigungen",
"miscellaneous_settings": "sonstige Einstellungen",
"mismatch": "ungleich",
"model": "Modell",
"models": "Modelle",
"module": {
@ -166,7 +168,6 @@ @@ -166,7 +168,6 @@
"user": "Benutzer",
"wiki": "Wiki"
},
"mismatch": "ungleich",
"month": "Monat",
"must_not_be_empty": "darf nicht leer sein",
@ -215,6 +216,7 @@ @@ -215,6 +216,7 @@
"region": "Bundesland",
"repeat_new_password": "Wiederholung",
"results": "Ergebnisse",
"right_click_to_edit": "Rechts-Klick zum Bearbeiten",
"save": "speichern",
"saved": "gespeichert",

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

@ -18,6 +18,7 @@ @@ -18,6 +18,7 @@
"cancel": "cancel",
"choose_type": "choose type",
"click_to_edit": "click to edit",
"client_id": "client ID",
"client_secret": "client secret",
"close_settings": "close settings",
@ -38,7 +39,7 @@ @@ -38,7 +39,7 @@
"contained_tax": "contained tax",
"content": "content",
"context": "context",
"count_of_occurrences": "{count} occurences",
"count_of_occurrences": "{count} occurrences",
"country": "country",
"COURT": "local court",
"CUSTOMER-NUMBER": "customer number",
@ -118,7 +119,6 @@ @@ -118,7 +119,6 @@
"IMPERSONATE": "impersonate",
"index_page": "task overview",
"invoice": "invoice",
"item": "item",
"items": "items",
"join_objects" : "join {objects}",
@ -137,15 +137,16 @@ @@ -137,15 +137,16 @@
"login_services": "login service",
"logout": "logout",
"logout_user": "logout {user}",
"long_click_to_edit": "click long to edit",
"markdown_code": "Markdown-Code",
"markdown_supported": "Markdown & Plantuml supported!",
"MANAGE_LOGIN_SERVICES": "manage login services",
"member": "member",
"members": "members",
"message": "message",
"messages": "messages",
"miscellaneous_settings": "miscellaneous settings",
"mismatch": "mismatch",
"model": "model",
"models": "models",
"module": {
@ -166,7 +167,6 @@ @@ -166,7 +167,6 @@
"user": "Users",
"wiki": "wiki"
},
"mismatch": "mismatch",
"month": "month",
"must_not_be_empty": "must not be empty",
@ -215,6 +215,7 @@ @@ -215,6 +215,7 @@
"region": "region",
"repeat_new_password": "repeat new password",
"results": "results",
"right_click_to_edit": "right click to edit",
"save": "save",
"saved": "saved",

Loading…
Cancel
Save