From 505ca6a58effae334f35ae99de798d85bd8fa1a2 Mon Sep 17 00:00:00 2001 From: Philipp Dormann Date: Thu, 18 Feb 2021 17:24:53 +0100 Subject: [PATCH 01/17] =?UTF-8?q?=E2=9C=A8=20ForgotPassword=20demo=20for?= =?UTF-8?q?=20translation=20with=20interpolation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ref #69 --- src/components/auth/ForgotPassword.svelte | 7 ++----- src/locales/de.json | 1 + src/locales/en.json | 1 + 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/components/auth/ForgotPassword.svelte b/src/components/auth/ForgotPassword.svelte index 9d6f3936..42a05d63 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 } })}

diff --git a/src/locales/de.json b/src/locales/de.json index b0479a59..97cad1e1 100644 --- a/src/locales/de.json +++ b/src/locales/de.json @@ -127,6 +127,7 @@ "password-is-required": "Passwort muss angegeben werden", "password-reset-failed": "Passwort zurücksetzen ist fehlgeschlagen!", "password-reset-in-progress": "Passwort wird zurückgesetzt...", + "password-reset-mail-sent": "Passwort-Reset Mail wurde an \"{usersEmail}\" geschickt.", "password-reset-successful": "Passwort erfolgreich zurückgesetzt!", "permissions": "Berechtigungen", "phone": "Telefon", diff --git a/src/locales/en.json b/src/locales/en.json index 3eee95c6..b46f3958 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -142,6 +142,7 @@ "password-is-required": "Password is required", "password-reset-failed": "Password reset failed!", "password-reset-in-progress": "Password Reset in Progress...", + "password-reset-mail-sent": "Password reset mail was sent to \"{usersEmail}\".", "password-reset-successful": "Password Reset successful!", "permissions": "Permissions", "phone": "Phone", From 4be87a64b9df5a722b3a03893eff64f140f2dc28 Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Thu, 18 Feb 2021 17:35:46 +0100 Subject: [PATCH 02/17] Removed unused locales ref #69 --- src/components/auth/ForgotPassword.svelte | 2 +- src/components/auth/Login.svelte | 2 +- src/locales/de.json | 28 +---------------------- src/locales/en.json | 28 +---------------------- 4 files changed, 4 insertions(+), 56 deletions(-) diff --git a/src/components/auth/ForgotPassword.svelte b/src/components/auth/ForgotPassword.svelte index 42a05d63..986e4fdd 100644 --- a/src/components/auth/ForgotPassword.svelte +++ b/src/components/auth/ForgotPassword.svelte @@ -56,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/locales/de.json b/src/locales/de.json index 97cad1e1..2a36c454 100644 --- a/src/locales/de.json +++ b/src/locales/de.json @@ -8,11 +8,9 @@ "application_name": "Lauf für Kaya! - Admin", "author": "Autor:in", "bitte-bestaetige-diese-laeufer-fuer-den-import": "Bitte die Läufer:innen für den Import bestätigen.", - "browse": "Durchsuchen", "by": "von", "cancel": "Abbrechen", "cannot-reset-your-password-directly": "Schade. \nWir können das Passwort leider nicht direkt zurücksetzen.\nBitte sende uns eine Mail in der du deine Identität bestätigst.", - "changelog": "Änderungsprotokoll", "close": "Schließen", "confirm-delete": "Löschung Bestätigen", "confirm-deletion": "Löschung Bestätigen", @@ -58,42 +56,20 @@ "distance-in-km": "Distanz (in KM)", "dont-have-your-email-connected": "Deine E-Mail ist nicht verknüpft?", "dont-panic-were-resetting-it": "Keine Panik, wir setzen es zurück ✌", - "drag-and-drop-your-files-or__legacy": "Legacy", "e-mail-adress": "E-Mail-Adresse", "edit-permissions": "Berechtigungen bearbeiten", "email_address_or_username": "E-Mail-Adresse/ Benutzername", "error_on_login": "😢Fehler beim Login", "faq": "FAQ", - "filepond__abort": "Abbrechen", - "filepond__cancel": "Abbrechen", - "filepond__error-during-load": "Fehler beim Laden", - "filepond__error-during-remove": "Fehler beim Löschen", - "filepond__error-during-revert": "Fehler beim Rückgängig machen", - "filepond__error-during-upload": "Fehler beim Hochladen", - "filepond__field-contains-invalid-files": "Invalide Dateien erkannt", - "filepond__loading": "Lade", - "filepond__remove": "Löschen", - "filepond__retry": "Erneut versuchen", - "filepond__size-not-available": "Größe ist nicht verfügbar", - "filepond__tap-to-cancel": "Zum Abbrechen hier tippen.", - "filepond__tap-to-retry": "Zum erneut versuchen hier tippen.", - "filepond__tap-to-undo": "Zum Rückgängig machen hier tippen.", - "filepond__undo": "Rückgängig", - "filepond__upload": "Hochladen", - "filepond__upload-cancelled": "Hochladen abgebrochen", - "filepond__upload-complete": "Hochladen abgeschlossen", - "filepond__uploading": "Wird hochgeladen", - "filepond__waiting-for-size": "Warte auf Dateigröße", "first-name": "Vorname", "first-name-is-required": "Vorname muss angegeben werden", - "forgot_password?": "Passwort vergessen?", + "forgot_password": "Passwort vergessen?", "general-stats": "Allgemeine Statistiken", "general_promise_error": "😢 Ein unbekannter Fehler ist aufgetreten", "go-to-login": "Zum Login", "goback": "Zur Startseite", "group": "Gruppe", "groups": "Gruppen", - "hallo": "hallo", "icon-image-credits": "Wir möchten uns außerdem für die verwendeten Icons und Bilder bedanken bei:", "import-runners": "Läufer:innen importieren", "import__target-organization": "Ziel Organisation", @@ -140,7 +116,6 @@ "privacy-loading": "Datenschutzerklärung lädt...", "profile-picture": "Profilbild", "read-license": "Lizenz-Text lesen", - "register": "Registrieren", "repo_link": "Link", "request-a-new-reset-mail": "Neue Reset-Mail anfordern", "reset-my-password": "Passwort zurücksetzen", @@ -152,7 +127,6 @@ "save-changes": "Änderungen speichern", "send-a-mail-to-lfk-odit-services": "Sende eine Mail an lfk@odit.services", "settings": "Einstellungen", - "signout": "Abmelden", "stats-are-being-loaded": "Die Statistiken werden geladen...", "successful-password-reset": "Passwort erfolgreich zurückgesetzt!", "team": "Team", diff --git a/src/locales/en.json b/src/locales/en.json index b46f3958..0de0ffe7 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -12,13 +12,11 @@ "attention": "Attention!", "author": "Author", "bitte-bestaetige-diese-laeufer-fuer-den-import": "Please confirm these runners for import.", - "browse": "Browse", "by": "by", "cancel": "Cancel", "cancel-delete": "Cancel Delete", "cancel-keep-team": "Cancel, keep team", "cannot-reset-your-password-directly": "Bummer. We unfortunately cannot reset your password directly. Please send us a mail and confirm your identity", - "changelog": "Changelog", "city": "City", "close": "Close", "confirm-delete": "Confirm Delete", @@ -71,43 +69,21 @@ "distance-in-km": "Distance in km", "dont-have-your-email-connected": "Don't have your email connected?", "dont-panic-were-resetting-it": "Don't panic, we're resetting it ✌", - "drag-and-drop-your-files-or__legacy": "Drag & Drop your files or", "e-mail-adress": "E-Mail Adress", "edit": "Edit", "edit-permissions": "edit permissions", "email_address_or_username": "Email / username", "error_on_login": "Error on login", "faq": "FAQ", - "filepond__abort": "Abort", - "filepond__cancel": "Cancel", - "filepond__error-during-load": "Error during load", - "filepond__error-during-remove": "Error during remove", - "filepond__error-during-revert": "Error during revert", - "filepond__error-during-upload": "Error during upload", - "filepond__field-contains-invalid-files": "Field contains invalid files", - "filepond__loading": "Loading", - "filepond__remove": "Remove", - "filepond__retry": "Retry", - "filepond__size-not-available": "Size not available", - "filepond__tap-to-cancel": "tap to cancel", - "filepond__tap-to-retry": "tap to retry", - "filepond__tap-to-undo": "tap to undo", - "filepond__undo": "Undo", - "filepond__upload": "Upload", - "filepond__upload-cancelled": "Upload cancelled", - "filepond__upload-complete": "Upload complete", - "filepond__uploading": "Uploading", - "filepond__waiting-for-size": "Waiting for size", "first-name": "First name", "first-name-is-required": "First Name is required", - "forgot_password?": "Forgot your password?", + "forgot_password": "Forgot your password?", "general-stats": "General Stats", "general_promise_error": "😢 Error", "go-to-login": "Go To Login", "goback": "Go Home", "group": "Group", "groups": "Groups", - "hallo": "hello", "icon-image-credits": "We also want to thank these projects for illustrations and icons:", "import-runners": "Import runners", "import__target-organization": "Target Organization", @@ -155,7 +131,6 @@ "privacy-loading": "Privacy loading...", "profile-picture": "Profile Picture", "read-license": "Read License", - "register": "Register", "repo_link": "Link", "request-a-new-reset-mail": "Request a new reset mail", "reset-my-password": "Reset my password", @@ -167,7 +142,6 @@ "save-changes": "Save Changes", "send-a-mail-to-lfk-odit-services": "send a mail to lfk@odit.services", "settings": "Settings", - "signout": "Sign out", "stats-are-being-loaded": "stats are being loaded...", "successful-password-reset": "Successful password reset!", "team": "Team", From 722feac8bd0a4be5214268c0bdb321243a4d602d Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Thu, 18 Feb 2021 17:35:46 +0100 Subject: [PATCH 03/17] Removed unused locales ref #69 --- src/components/auth/ForgotPassword.svelte | 2 +- src/components/auth/Login.svelte | 2 +- src/locales/de.json | 31 ++--------------------- src/locales/en.json | 29 +-------------------- 4 files changed, 5 insertions(+), 59 deletions(-) diff --git a/src/components/auth/ForgotPassword.svelte b/src/components/auth/ForgotPassword.svelte index 42a05d63..986e4fdd 100644 --- a/src/components/auth/ForgotPassword.svelte +++ b/src/components/auth/ForgotPassword.svelte @@ -56,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/locales/de.json b/src/locales/de.json index 97cad1e1..61753402 100644 --- a/src/locales/de.json +++ b/src/locales/de.json @@ -8,11 +8,9 @@ "application_name": "Lauf für Kaya! - Admin", "author": "Autor:in", "bitte-bestaetige-diese-laeufer-fuer-den-import": "Bitte die Läufer:innen für den Import bestätigen.", - "browse": "Durchsuchen", "by": "von", "cancel": "Abbrechen", "cannot-reset-your-password-directly": "Schade. \nWir können das Passwort leider nicht direkt zurücksetzen.\nBitte sende uns eine Mail in der du deine Identität bestätigst.", - "changelog": "Änderungsprotokoll", "close": "Schließen", "confirm-delete": "Löschung Bestätigen", "confirm-deletion": "Löschung Bestätigen", @@ -58,42 +56,20 @@ "distance-in-km": "Distanz (in KM)", "dont-have-your-email-connected": "Deine E-Mail ist nicht verknüpft?", "dont-panic-were-resetting-it": "Keine Panik, wir setzen es zurück ✌", - "drag-and-drop-your-files-or__legacy": "Legacy", "e-mail-adress": "E-Mail-Adresse", "edit-permissions": "Berechtigungen bearbeiten", "email_address_or_username": "E-Mail-Adresse/ Benutzername", "error_on_login": "😢Fehler beim Login", "faq": "FAQ", - "filepond__abort": "Abbrechen", - "filepond__cancel": "Abbrechen", - "filepond__error-during-load": "Fehler beim Laden", - "filepond__error-during-remove": "Fehler beim Löschen", - "filepond__error-during-revert": "Fehler beim Rückgängig machen", - "filepond__error-during-upload": "Fehler beim Hochladen", - "filepond__field-contains-invalid-files": "Invalide Dateien erkannt", - "filepond__loading": "Lade", - "filepond__remove": "Löschen", - "filepond__retry": "Erneut versuchen", - "filepond__size-not-available": "Größe ist nicht verfügbar", - "filepond__tap-to-cancel": "Zum Abbrechen hier tippen.", - "filepond__tap-to-retry": "Zum erneut versuchen hier tippen.", - "filepond__tap-to-undo": "Zum Rückgängig machen hier tippen.", - "filepond__undo": "Rückgängig", - "filepond__upload": "Hochladen", - "filepond__upload-cancelled": "Hochladen abgebrochen", - "filepond__upload-complete": "Hochladen abgeschlossen", - "filepond__uploading": "Wird hochgeladen", - "filepond__waiting-for-size": "Warte auf Dateigröße", "first-name": "Vorname", "first-name-is-required": "Vorname muss angegeben werden", - "forgot_password?": "Passwort vergessen?", + "forgot_password": "Passwort vergessen?", "general-stats": "Allgemeine Statistiken", "general_promise_error": "😢 Ein unbekannter Fehler ist aufgetreten", "go-to-login": "Zum Login", "goback": "Zur Startseite", "group": "Gruppe", "groups": "Gruppen", - "hallo": "hallo", "icon-image-credits": "Wir möchten uns außerdem für die verwendeten Icons und Bilder bedanken bei:", "import-runners": "Läufer:innen importieren", "import__target-organization": "Ziel Organisation", @@ -140,7 +116,6 @@ "privacy-loading": "Datenschutzerklärung lädt...", "profile-picture": "Profilbild", "read-license": "Lizenz-Text lesen", - "register": "Registrieren", "repo_link": "Link", "request-a-new-reset-mail": "Neue Reset-Mail anfordern", "reset-my-password": "Passwort zurücksetzen", @@ -152,7 +127,6 @@ "save-changes": "Änderungen speichern", "send-a-mail-to-lfk-odit-services": "Sende eine Mail an lfk@odit.services", "settings": "Einstellungen", - "signout": "Abmelden", "stats-are-being-loaded": "Die Statistiken werden geladen...", "successful-password-reset": "Passwort erfolgreich zurückgesetzt!", "team": "Team", @@ -176,6 +150,5 @@ "users": "Benutzer", "valid-email-is-required": "Es wird eine valide E-Mail Adresse benötigt", "welcome_wavinghand": "Willkommen 👋", - "you-can-now-use-your-new-password-to-log-in-to-your-account": "Du kannst dich jetzt mit deinem neuen Passwort anmelden! 🎉", - "your_profile": "Dein Profil" + "you-can-now-use-your-new-password-to-log-in-to-your-account": "Du kannst dich jetzt mit deinem neuen Passwort anmelden! 🎉" } \ No newline at end of file diff --git a/src/locales/en.json b/src/locales/en.json index b46f3958..0cd63974 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -12,13 +12,11 @@ "attention": "Attention!", "author": "Author", "bitte-bestaetige-diese-laeufer-fuer-den-import": "Please confirm these runners for import.", - "browse": "Browse", "by": "by", "cancel": "Cancel", "cancel-delete": "Cancel Delete", "cancel-keep-team": "Cancel, keep team", "cannot-reset-your-password-directly": "Bummer. We unfortunately cannot reset your password directly. Please send us a mail and confirm your identity", - "changelog": "Changelog", "city": "City", "close": "Close", "confirm-delete": "Confirm Delete", @@ -71,43 +69,21 @@ "distance-in-km": "Distance in km", "dont-have-your-email-connected": "Don't have your email connected?", "dont-panic-were-resetting-it": "Don't panic, we're resetting it ✌", - "drag-and-drop-your-files-or__legacy": "Drag & Drop your files or", "e-mail-adress": "E-Mail Adress", "edit": "Edit", "edit-permissions": "edit permissions", "email_address_or_username": "Email / username", "error_on_login": "Error on login", "faq": "FAQ", - "filepond__abort": "Abort", - "filepond__cancel": "Cancel", - "filepond__error-during-load": "Error during load", - "filepond__error-during-remove": "Error during remove", - "filepond__error-during-revert": "Error during revert", - "filepond__error-during-upload": "Error during upload", - "filepond__field-contains-invalid-files": "Field contains invalid files", - "filepond__loading": "Loading", - "filepond__remove": "Remove", - "filepond__retry": "Retry", - "filepond__size-not-available": "Size not available", - "filepond__tap-to-cancel": "tap to cancel", - "filepond__tap-to-retry": "tap to retry", - "filepond__tap-to-undo": "tap to undo", - "filepond__undo": "Undo", - "filepond__upload": "Upload", - "filepond__upload-cancelled": "Upload cancelled", - "filepond__upload-complete": "Upload complete", - "filepond__uploading": "Uploading", - "filepond__waiting-for-size": "Waiting for size", "first-name": "First name", "first-name-is-required": "First Name is required", - "forgot_password?": "Forgot your password?", + "forgot_password": "Forgot your password?", "general-stats": "General Stats", "general_promise_error": "😢 Error", "go-to-login": "Go To Login", "goback": "Go Home", "group": "Group", "groups": "Groups", - "hallo": "hello", "icon-image-credits": "We also want to thank these projects for illustrations and icons:", "import-runners": "Import runners", "import__target-organization": "Target Organization", @@ -155,7 +131,6 @@ "privacy-loading": "Privacy loading...", "profile-picture": "Profile Picture", "read-license": "Read License", - "register": "Register", "repo_link": "Link", "request-a-new-reset-mail": "Request a new reset mail", "reset-my-password": "Reset my password", @@ -167,7 +142,6 @@ "save-changes": "Save Changes", "send-a-mail-to-lfk-odit-services": "send a mail to lfk@odit.services", "settings": "Settings", - "signout": "Sign out", "stats-are-being-loaded": "stats are being loaded...", "successful-password-reset": "Successful password reset!", "team": "Team", @@ -198,6 +172,5 @@ "valid-zipcode-postal-code-is-required": "Valid zipcode/ postal code is required", "welcome_wavinghand": "Welcome 👋", "you-can-now-use-your-new-password-to-log-in-to-your-account": "You can now use your new password to log in to your account! 🎉", - "your_profile": "Your Profile", "zip-postal-code": "ZIP/ postal code" } \ No newline at end of file From 25ac84e5fddd0927dc4283836a36e0f15615609f Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Thu, 18 Feb 2021 17:45:27 +0100 Subject: [PATCH 04/17] Formatting ref #69 --- src/App.svelte | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/App.svelte b/src/App.svelte index cec35a20..0757a02b 100644 --- a/src/App.svelte +++ b/src/App.svelte @@ -52,9 +52,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(); From b195c707b05ffa415b50afdf4a532e03340e1ebf Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Thu, 18 Feb 2021 17:49:26 +0100 Subject: [PATCH 05/17] Fixed privacy/imprint fallback bug ref #69 --- src/components/general/Imprint.svelte | 3 +++ src/components/general/Privacy.svelte | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/components/general/Imprint.svelte b/src/components/general/Imprint.svelte index d050c3fe..33c878e6 100644 --- a/src/components/general/Imprint.svelte +++ b/src/components/general/Imprint.svelte @@ -6,6 +6,9 @@ let html = ""; async function load() { let md = await fetch("/imprint_" + getLocaleFromNavigator() + ".md"); + if((await md.text()).includes(" Date: Thu, 18 Feb 2021 18:09:57 +0100 Subject: [PATCH 06/17] =?UTF-8?q?=E2=9C=A8=20translation=20keys?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ref #69 --- src/components/base/NoComponentLoaded.svelte | 4 +- .../contacts/AddContactModal.svelte | 26 +-- .../contacts/ContactsOverview.svelte | 12 +- src/components/dashboard/Dashboard.svelte | 1 - .../dashboard/MainDashContent.svelte | 4 +- src/components/general/Settings.svelte | 4 +- src/components/orgs/AddOrgModal.svelte | 21 +- src/components/orgs/ConfirmOrgDeletion.svelte | 20 +- src/components/orgs/OrgDetail.svelte | 23 +- src/components/orgs/OrgOverview.svelte | 20 +- src/components/orgs/Orgs.svelte | 1 - src/components/orgs/OrgsEmptyState.svelte | 5 +- src/components/runners/AddRunnerModal.svelte | 20 +- .../runners/ImportRunnerModal.svelte | 10 +- src/components/runners/Runners.svelte | 4 +- .../runners/RunnersEmptyState.svelte | 8 +- src/components/runners/RunnersOverview.svelte | 207 ++++++++++-------- src/components/teams/AddTeamModal.svelte | 6 +- .../teams/ConfirmTeamDeletion.svelte | 16 +- src/components/teams/Teams.svelte | 8 +- src/components/teams/TeamsEmptyState.svelte | 4 +- src/components/teams/TeamsOverview.svelte | 19 +- src/components/tracks/AddTrackModal.svelte | 14 +- src/components/tracks/TracksOverview.svelte | 4 +- src/components/users/AddUserModal.svelte | 13 +- src/components/users/UserPermissions.svelte | 21 +- src/components/users/UsersEmptyState.svelte | 4 +- src/components/users/UsersOverview.svelte | 37 ++-- src/locales/en.json | 62 +++++- 29 files changed, 334 insertions(+), 264 deletions(-) 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 8419cdf8..c4458ad2 100644 --- a/src/components/orgs/AddOrgModal.svelte +++ b/src/components/orgs/AddOrgModal.svelte @@ -32,7 +32,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(); RunnerOrganizationService.runnerOrganizationControllerPost({ @@ -43,20 +43,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(); }); } @@ -101,23 +97,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 43df726a..7aaf12a9 100644 --- a/src/components/orgs/OrgDetail.svelte +++ b/src/components/orgs/OrgDetail.svelte @@ -41,21 +41,21 @@ ) .then((resp) => { Toastify({ - text: "Organization deleted", + text: $_("organization-deleted"), duration: 500, backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)", }).showToast(); location.replace("./"); }) .catch((err) => { - modal_open = true; - delete_org = original; - }); + modal_open = true; + delete_org = original; + }); } function submit() { if (data_loaded === true && save_enabled) { Toastify({ - text: "updating organization", + text: $_("updating-organization"), duration: 2500, }).showToast(); let postdata = orgdata; @@ -68,9 +68,8 @@ Object.assign(original, orgdata); original = orgdata; Object.assign(original, orgdata); - // Toastify({ - text: "updated organization", + text: $_("updated-organization"), duration: 2500, backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)", }).showToast(); @@ -158,7 +157,7 @@
  • - Home{$_('home')}
  • - Orgs{$_('organizations')}
    - + {:else} {#await promise} - organization detail is being loaded... + {$_('organization-detail-is-being-loaded')} {:catch error} {/await} diff --git a/src/components/orgs/OrgOverview.svelte b/src/components/orgs/OrgOverview.svelte index 7d4cd967..3843d31f 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')} @@ -105,7 +105,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}
    @@ -118,8 +118,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} 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/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}> + + +