diff --git a/src/App.svelte b/src/App.svelte index f7bfc82e..0ec9b765 100644 --- a/src/App.svelte +++ b/src/App.svelte @@ -58,9 +58,9 @@ import RunnerDetail from "./components/runners/RunnerDetail.svelte"; import Imprint from "./components/general/Imprint.svelte"; import Privacy from "./components/general/Privacy.svelte"; -import ResetPassword from "./components/auth/ResetPassword.svelte"; -import Contacts from "./components/contacts/Contacts.svelte"; -import ContactDetail from "./components/contacts/ContactDetail.svelte"; + import ResetPassword from "./components/auth/ResetPassword.svelte"; + import Contacts from "./components/contacts/Contacts.svelte"; + import ContactDetail from "./components/contacts/ContactDetail.svelte"; store.init(); registerSW(); diff --git a/src/components/auth/ForgotPassword.svelte b/src/components/auth/ForgotPassword.svelte index 9d6f3936..986e4fdd 100644 --- a/src/components/auth/ForgotPassword.svelte +++ b/src/components/auth/ForgotPassword.svelte @@ -17,8 +17,7 @@ }).showToast(); reset_mail_sent = true; }) - .catch((err) => { - }); + .catch((err) => {}); } else { Toastify({ text: $_("invalid-mail-reset"), @@ -36,9 +35,7 @@ {$_('application_name')}

- Passwort-Reset Mail wurde an - {usersEmail} - geschickt + {$_('password-reset-mail-sent', { values: { usersEmail: usersEmail } })}

@@ -59,7 +56,7 @@ {$_('application_name')}

- {$_('forgot_password?')} + {$_('forgot_password')}

{$_('dont-panic-were-resetting-it')} diff --git a/src/components/auth/Login.svelte b/src/components/auth/Login.svelte index b6d21c73..a8476b20 100644 --- a/src/components/auth/Login.svelte +++ b/src/components/auth/Login.svelte @@ -136,7 +136,7 @@ - {$_('forgot_password?')} + {$_('forgot_password')}

diff --git a/src/components/base/NoComponentLoaded.svelte b/src/components/base/NoComponentLoaded.svelte index a5f96fc2..58efa45d 100644 --- a/src/components/base/NoComponentLoaded.svelte +++ b/src/components/base/NoComponentLoaded.svelte @@ -7,12 +7,12 @@
- Internal Error + {$_('internal-error')}

- Something went wrong in the UI logic + {$_('generic-ui-logic-error')}

- Please provide the required information to add a new contact. + {$_('please-provide-the-required-information-to-add-a-new-contact')}

@@ -271,10 +271,10 @@
+ class="block text-sm font-medium text-gray-700">{$_('phone')} + class="font-medium text-gray-700">{$_('address')}
{#if address_checked === true}
+ class="block text-sm font-medium text-gray-700">{$_('address')} - Address is required + {$_('address-is-required')} {/if}
+ class="block text-sm font-medium text-gray-700">{$_('apartment-suite-etc')} + class="block text-sm font-medium text-gray-700">{$_('zip-postal-code')} - Valid zipcode/ postal code is required + {$_('valid-zipcode-postal-code-is-required')} {/if}
@@ -405,7 +403,7 @@ {#if !iscityvalid} - Valid city is required + {$_('valid-city-is-required')} {/if}
diff --git a/src/components/contacts/ContactsOverview.svelte b/src/components/contacts/ContactsOverview.svelte index 4a4a1c25..2e0727b9 100644 --- a/src/components/contacts/ContactsOverview.svelte +++ b/src/components/contacts/ContactsOverview.svelte @@ -19,7 +19,7 @@ {:then} @@ -40,20 +40,20 @@ - Name + {$_('name')} - Groups + {$_('groups')} - Address + {$_('address')} - Action + {$_('action')} @@ -132,7 +132,7 @@ (obj) => obj.id !== t.id ); Toastify({ - text: 'Contact deleted', + text: $_('contact-deleted'), duration: 500, backgroundColor: 'linear-gradient(to right, #00b09b, #96c93d)', diff --git a/src/components/dashboard/Dashboard.svelte b/src/components/dashboard/Dashboard.svelte index 40401798..fc89308c 100644 --- a/src/components/dashboard/Dashboard.svelte +++ b/src/components/dashboard/Dashboard.svelte @@ -5,7 +5,6 @@ import { router } from "tinro"; import NoComponentLoaded from "../base/NoComponentLoaded.svelte"; import { AuthService } from "@odit/lfk-client-js"; - let dropdown1 = false; $: navOpen = false; function logout() { localForage.clear(); diff --git a/src/components/dashboard/MainDashContent.svelte b/src/components/dashboard/MainDashContent.svelte index 4d3efd2a..fa0e2594 100644 --- a/src/components/dashboard/MainDashContent.svelte +++ b/src/components/dashboard/MainDashContent.svelte @@ -10,9 +10,9 @@ on:click={() => { navOpen = false; }}> -

- {$_('dashboard-title')} + {$_('dashboard-title')} + - {$_('dashboard-greeting')}, import { _ } from "svelte-i18n"; -import FormLayout from "../base/FormLayout.svelte"; + import FormLayout from "../base/FormLayout.svelte";
@@ -32,4 +32,4 @@ import FormLayout from "../base/FormLayout.svelte";

-
\ No newline at end of file + diff --git a/src/components/orgs/AddOrgModal.svelte b/src/components/orgs/AddOrgModal.svelte index 6b3d8b68..5ea70162 100644 --- a/src/components/orgs/AddOrgModal.svelte +++ b/src/components/orgs/AddOrgModal.svelte @@ -49,7 +49,7 @@ if (processed_last_submit === true) { processed_last_submit = false; const toast = Toastify({ - text: "Organization is being added...", + text: $_("organization-is-being-added"), duration: -1, }).showToast(); let address = {}; @@ -70,20 +70,16 @@ .then((result) => { name = ""; modal_open = false; - // Toastify({ - text: "Organization added", + text: $_("organization-added"), duration: 500, backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)", }).showToast(); current_organizations = current_organizations.concat([result]); }) - .catch((err) => { - // - }) + .catch((err) => {}) .finally(() => { processed_last_submit = true; - // toast.hideToast(); }); } @@ -128,23 +124,22 @@

- Create a new Organization + {$_('create-a-new-organization')}

- Please provide the required information to add a new - organization. + {$_('please-provide-the-required-information-to-add-a-new-organization')}

+ class="block text-sm font-medium text-gray-700">{$_('name')} - Organization name is required + {$_('organization-name-is-required')} {/if}
diff --git a/src/components/orgs/ConfirmOrgDeletion.svelte b/src/components/orgs/ConfirmOrgDeletion.svelte index 926dc5ba..7fb936d8 100644 --- a/src/components/orgs/ConfirmOrgDeletion.svelte +++ b/src/components/orgs/ConfirmOrgDeletion.svelte @@ -25,9 +25,7 @@ }).showToast(); location.replace("./"); }) - .catch((err) => { - // - }); + .catch((err) => {}); } @@ -68,13 +66,17 @@

- Attention! + {$_('attention')}

- Do you want to delete the organization - {delete_org.name}?
All associated teams and runners will - be deleted too! + {$_( + 'do-you-want-to-delete-the-organization-delete_org-name', + { + values: { orgname: delete_org.name }, + } + )}
+ {$_('all-associated-teams-and-runners-will-be-deleted-too')}

@@ -85,13 +87,13 @@ on:click={deleteOrg} type="button" class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-red-600 text-base font-medium text-white hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500 sm:ml-3 sm:w-auto sm:text-sm"> - Confirm, delete organization and associated teams+runners. + {$_('confirm-delete-organization-and-associated-teams-runners')}
diff --git a/src/components/orgs/OrgDetail.svelte b/src/components/orgs/OrgDetail.svelte index 3c71e0c8..b98fa07a 100644 --- a/src/components/orgs/OrgDetail.svelte +++ b/src/components/orgs/OrgDetail.svelte @@ -1,361 +1,361 @@ - - - { - import_modal_open = false; - }} - current_runners={[]} - passed_team={{}} - passed_orgs={[]} - passed_org={editable} - opened_from="OrgDetail" - bind:import_modal_open /> - -{#if data_loaded} -
-
- {original_object.name} - - {#if store.state.jwtinfo.userdetails.permissions.includes('RUNNER:IMPORT')} - - {/if} - {#if store.state.jwtinfo.userdetails.permissions.includes('USER:DELETE')} - {#if delete_triggered} - - - {/if} - {#if !delete_triggered} - - {/if} - {/if} - {#if !delete_triggered} - - {/if} - -
-
-
- -
-
-
- - -
-
- - -
- -
-
- -
-
- -
-
- {#if editable.address_checked === true} -
- - - {#if !isAddress1Valid} - - {$_('address-is-required')} - - {/if} -
-
- - -
-
- - - {#if !iszipcodevalid} - - {$_('valid-zipcode-postal-code-is-required')} - - {/if} -
-
- - - {#if !iscityvalid} - - {$_('valid-city-is-required')} - - {/if} -
- {/if} -
-{:else} - {#await promise} - organization detail is being loaded... - {:catch error} - - {/await} -{/if} + + + { + import_modal_open = false; + }} + current_runners={[]} + passed_team={{}} + passed_orgs={[]} + passed_org={editable} + opened_from="OrgDetail" + bind:import_modal_open /> + +{#if data_loaded} +
+
+ {original_object.name} + + {#if store.state.jwtinfo.userdetails.permissions.includes('RUNNER:IMPORT')} + + {/if} + {#if store.state.jwtinfo.userdetails.permissions.includes('USER:DELETE')} + {#if delete_triggered} + + + {/if} + {#if !delete_triggered} + + {/if} + {/if} + {#if !delete_triggered} + + {/if} + +
+
+
+ +
+
+
+ + +
+
+ + +
+ +
+
+ +
+
+ +
+
+ {#if editable.address_checked === true} +
+ + + {#if !isAddress1Valid} + + {$_('address-is-required')} + + {/if} +
+
+ + +
+
+ + + {#if !iszipcodevalid} + + {$_('valid-zipcode-postal-code-is-required')} + + {/if} +
+
+ + + {#if !iscityvalid} + + {$_('valid-city-is-required')} + + {/if} +
+ {/if} +
+{:else} + {#await promise} + {$_('organization-detail-is-being-loaded')} + {:catch error} + + {/await} +{/if} diff --git a/src/components/orgs/OrgOverview.svelte b/src/components/orgs/OrgOverview.svelte index 47a2f496..0edf5710 100644 --- a/src/components/orgs/OrgOverview.svelte +++ b/src/components/orgs/OrgOverview.svelte @@ -30,7 +30,7 @@ {:then} @@ -51,20 +51,20 @@ - Name + {$_('name')} - Address + {$_('address')} - Contact + {$_('contact')} - Action + {$_('action')} @@ -109,7 +109,7 @@ class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-gray-100 text-gray-800">{o.contact.firstname} {o.contact.middlename || ''} {o.contact.lastname} - {:else}no contact specified{/if} + {:else}{$_('no-contact-specified')}{/if} @@ -122,8 +122,7 @@ active_deletes[o.id] = false; }} tabindex="0" - class="ml-4 text-indigo-600 hover:text-indigo-900 cursor-pointer">Cancel - Delete + class="ml-4 text-indigo-600 hover:text-indigo-900 cursor-pointer">{$_('cancel-delete')} + class="ml-4 text-red-600 hover:text-red-900 cursor-pointer">{$_('confirm-delete')} {:else} Edit + class="text-indigo-600 hover:text-indigo-900">{$_('edit')} {#if store.state.jwtinfo.userdetails.permissions.includes('ORGANIZATION:DELETE')} + class="ml-4 text-red-600 hover:text-red-900 cursor-pointer">{$_('delete')} {/if} {/if} diff --git a/src/components/orgs/Orgs.svelte b/src/components/orgs/Orgs.svelte index 43e9bbfd..469553da 100644 --- a/src/components/orgs/Orgs.svelte +++ b/src/components/orgs/Orgs.svelte @@ -33,7 +33,6 @@ {/if} -

manage runner organizations

diff --git a/src/components/orgs/OrgsEmptyState.svelte b/src/components/orgs/OrgsEmptyState.svelte index 1cc912f0..f6a61205 100644 --- a/src/components/orgs/OrgsEmptyState.svelte +++ b/src/components/orgs/OrgsEmptyState.svelte @@ -9,8 +9,9 @@

- There are no organizations added yet.
- Add your first organization + {$_('there-are-no-organizations-added-yet')}
+ {$_('add-your-first-organization')}

diff --git a/src/components/presets/Table.svelte b/src/components/presets/Table.svelte index 96efa99d..7fc967aa 100644 --- a/src/components/presets/Table.svelte +++ b/src/components/presets/Table.svelte @@ -28,7 +28,7 @@ Role - Edit + {$_('edit')} @@ -71,7 +71,7 @@ class="px-6 py-4 whitespace-nowrap text-right text-sm font-medium"> Edit + class="text-indigo-600 hover:text-indigo-900">{$_('edit')} diff --git a/src/components/runners/AddRunnerModal.svelte b/src/components/runners/AddRunnerModal.svelte index d2017d27..d590e410 100644 --- a/src/components/runners/AddRunnerModal.svelte +++ b/src/components/runners/AddRunnerModal.svelte @@ -36,13 +36,15 @@ $: firstname_input_value = ""; $: processed_last_submit = true; $: isPhoneValidOrEmpty = - phone_input_value.includes("+")&&isMobilePhone( - phone_input_value - .replaceAll("(", "") - .replaceAll(")", "") - .replaceAll("-", "") - .replaceAll(" ", "") - ) || phone_input_value === ""; + (phone_input_value.includes("+") && + isMobilePhone( + phone_input_value + .replaceAll("(", "") + .replaceAll(")", "") + .replaceAll("-", "") + .replaceAll(" ", "") + )) || + phone_input_value === ""; $: isEmailValidOrEmpty = isEmail(email_input_value) || email_input_value === ""; $: isLastnameValid = lastname_input_value.trim().length !== 0; @@ -70,7 +72,7 @@ if (processed_last_submit === true) { processed_last_submit = false; const toast = Toastify({ - text: "Runner is being added...", + text: $_("runner-is-being-added"), duration: -1, }).showToast(); let postdata = { @@ -96,7 +98,7 @@ modal_open = false; // Toastify({ - text: "Runner added", + text: $_("runner-added"), duration: 500, backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)", }).showToast(); diff --git a/src/components/runners/ImportRunnerModal.svelte b/src/components/runners/ImportRunnerModal.svelte index 1fcd35af..3a147368 100644 --- a/src/components/runners/ImportRunnerModal.svelte +++ b/src/components/runners/ImportRunnerModal.svelte @@ -77,7 +77,7 @@ function importAction() { if (recent_processed === true) { const toast = Toastify({ - text: "Runners are being imported...", + text: $_("runners-are-being-imported"), duration: -1, }).showToast(); recent_processed = false; @@ -104,7 +104,7 @@ toast.hideToast(); recent_processed = true; Toastify({ - text: "Import finished", + text: $_("import-finished"), duration: 500, backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)", }).showToast(); @@ -121,7 +121,7 @@ toast.hideToast(); recent_processed = true; Toastify({ - text: "Import finished", + text: $_("import-finished"), duration: 500, backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)", }).showToast(); @@ -144,7 +144,7 @@ toast.hideToast(); recent_processed = true; Toastify({ - text: "Import finished", + text: $_("import-finished"), duration: 500, backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)", }).showToast(); @@ -253,7 +253,7 @@

{$_('bitte-bestaetige-diese-laeufer-fuer-den-import')}

{/if} {#if opened_from === 'RunnerOverview'} -

Group

+

{$_('group')}

{ - selectedFilter=event.detail - }} selectedValue={selectedFilter} placeholder="Filter by Organization/ Team" containerClasses="mt-1 py-2 px-3 border border-gray-300 bg-white rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm" items={selectgroups} isMulti={true}> + + +