Merge pull request 'i18n fixed + dependency bumps bugfix/99-i18n_run' (#102) from bugfix/99-i18n_run into dev
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #102
This commit is contained in:
commit
100094e803
23
package.json
23
package.json
@ -17,30 +17,29 @@
|
||||
"csvtojson": "^2.0.10",
|
||||
"gridjs": "3.3.0",
|
||||
"localforage": "1.9.0",
|
||||
"lodash.isequal": "^4.5.0",
|
||||
"marked": "^2.0.0",
|
||||
"marked": "^2.0.1",
|
||||
"svelte-focus-trap": "1.0.1",
|
||||
"svelte-i18n": "3.3.2",
|
||||
"svelte-i18n": "3.3.7",
|
||||
"svelte-select": "^3.17.0",
|
||||
"tailwindcss": "2.0.3",
|
||||
"tinro": "0.5.12",
|
||||
"tinro": "0.6.1",
|
||||
"toastify-js": "1.9.3",
|
||||
"validator": "13.5.2",
|
||||
"xlsx": "^0.16.9"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@odit/license-exporter": "^0.0.10",
|
||||
"@odit/license-exporter": "^0.0.11",
|
||||
"@snowpack/plugin-svelte": "3.5.2",
|
||||
"auto-changelog": "^2.2.1",
|
||||
"autoprefixer": "10.2.4",
|
||||
"autoprefixer": "10.2.5",
|
||||
"cross-env": "^7.0.3",
|
||||
"postcss": "8.2.6",
|
||||
"postcss": "8.2.8",
|
||||
"postcss-load-config": "3.0.1",
|
||||
"release-it": "^14.4.0",
|
||||
"snowpack": "3.0.11",
|
||||
"svelte": "3.32.3",
|
||||
"svelte-preprocess": "4.6.8",
|
||||
"workbox-cli": "6.1.0"
|
||||
"release-it": "^14.4.1",
|
||||
"snowpack": "3.0.13",
|
||||
"svelte": "3.35.0",
|
||||
"svelte-preprocess": "4.6.9",
|
||||
"workbox-cli": "6.1.2"
|
||||
},
|
||||
"release-it": {
|
||||
"git": {
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
<script>
|
||||
import { _ } from "svelte-i18n";
|
||||
import lodashIsEqual from "lodash.isequal";
|
||||
import store from "../../store";
|
||||
import {
|
||||
UserGroupService
|
||||
@ -32,7 +31,7 @@
|
||||
$: search_permission = "";
|
||||
$: original_data = {};
|
||||
$: editable = {};
|
||||
$: changes_performed = !lodashIsEqual(original_data, editable);
|
||||
$: changes_performed = !(JSON.stringify(original_data) == JSON.stringify(editable));
|
||||
$: isGroupnameValid = editable.name !== "";
|
||||
$: save_enabled =
|
||||
changes_performed && isGroupnameValid
|
||||
|
||||
@ -144,7 +144,7 @@
|
||||
<label
|
||||
for="donation_amount_eur"
|
||||
class="block text-sm font-medium text-gray-700">
|
||||
Distance</label>
|
||||
{$_('distance')}</label>
|
||||
<div class="mt-1 flex rounded-md shadow-sm">
|
||||
<input
|
||||
autocomplete="off"
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
<script>
|
||||
import { _ } from "svelte-i18n";
|
||||
import lodashIsEqual from "lodash.isequal";
|
||||
import store from "../../store";
|
||||
import isEmail from "validator/es/lib/isEmail";
|
||||
import { UserService, UserGroupService } from "@odit/lfk-client-js";
|
||||
@ -69,7 +68,7 @@
|
||||
UserGroupService.userGroupControllerGetAll().then((data) => {
|
||||
allgroups = data;
|
||||
});
|
||||
$: changes_performed = !lodashIsEqual(original_data, editable_userdata);
|
||||
$: changes_performed = !(JSON.stringify(original_data) == JSON.stringify(editable_userdata));
|
||||
$: groups_changed =
|
||||
JSON.stringify(usergroups_array) ===
|
||||
JSON.stringify(usergroups_array_original);
|
||||
|
||||
@ -6,6 +6,7 @@
|
||||
"active": "Aktiv",
|
||||
"add-donation": "Sponsoring erstellen",
|
||||
"add-donor": "Sponsor:in erstellen",
|
||||
"add-scan": "Scan erstellen",
|
||||
"add-user-group": "Neue Gruppe erstellen",
|
||||
"add-your-first-contact": "Erstelle den ersten Kontakt",
|
||||
"add-your-first-donor": "Erstelle die erste Sponsor:in",
|
||||
@ -15,6 +16,8 @@
|
||||
"add-your-first-team": "Erstelle das erste Team",
|
||||
"add-your-first-track": "Erstelle den ersten Track (Laufstrecke).",
|
||||
"add-your-first-user": "Erstelle die erste Benutzer:in",
|
||||
"add-your-fist-scan": "Füge deinene ersten Scan hinzu",
|
||||
"adding-scan": "Scan wird hinzugefügt",
|
||||
"address": "Adresse",
|
||||
"address-is-required": "Du musst eine Adresse angeben",
|
||||
"all-associated-donations-will-get-deleted-as-well": "Alle Sponsorings dieser Sponsor:in werden ebenfalls gelöscht",
|
||||
@ -60,6 +63,8 @@
|
||||
"create-a-new-fixed-donation": "Erstelle eine neue Festbetragsspende",
|
||||
"create-a-new-organization": "Neue Organisation anlegen",
|
||||
"create-a-new-runner": "Neue Läufer:in erstellen",
|
||||
"create-a-new-scan-fixed-only": "Neuen Scan erstellen (nur mit Festdistanz)",
|
||||
"create-a-new-scanstation": "Neue Station erstellen",
|
||||
"create-a-new-team": "Erstelle ein neues Team",
|
||||
"create-a-new-track": "Neuen Track erstellen",
|
||||
"create-a-new-user": "Neue Benutzer:in anlegen",
|
||||
@ -98,8 +103,11 @@
|
||||
"delete-group": "Gruppe löschen",
|
||||
"delete-organization": "Organisation löschen",
|
||||
"delete-runner": "Läufer:in löschen",
|
||||
"delete-scan": "Scan löschen",
|
||||
"delete-station": "Station löschen",
|
||||
"delete-team": "Team Löschen",
|
||||
"delete-user": "Benutzer:in löschen",
|
||||
"deleted-scan": "Scan wurde gelöscht",
|
||||
"dependency_name": "Name",
|
||||
"description": "Beschreibung",
|
||||
"description-optional": "Beschreibung (optional)",
|
||||
@ -108,6 +116,7 @@
|
||||
"distance": "Distanz",
|
||||
"distance-donation": "Sponsoring",
|
||||
"distance-in-km": "Distanz (in KM)",
|
||||
"distance-track": "Distanz (+Track)",
|
||||
"do-you-want-to-delete-the-organization-delete_org-name": "Möchtest du die Organisation {orgname} löschen?",
|
||||
"do-you-want-to-delete-the-team-delete_team-name": "Möchtest du das Team {teamname} löschen?",
|
||||
"do-you-want-to-delete-this-donor-with-all-related-donations": "Möchtest du diese Sponsor:in mit all ihren Sponsorings löschen?",
|
||||
@ -128,6 +137,7 @@
|
||||
"edit": "Bearbeiten",
|
||||
"edit-permissions": "Berechtigungen bearbeiten",
|
||||
"email_address_or_username": "E-Mail-Adresse/ Benutzername",
|
||||
"enabled": "aktiviert",
|
||||
"english": "Englisch",
|
||||
"error_on_login": "😢Fehler beim Login",
|
||||
"erteilte": "Direkt erteilte",
|
||||
@ -136,6 +146,7 @@
|
||||
"filter-by-organization-team": "Filtern nach Organisation / Team",
|
||||
"first-name": "Vorname",
|
||||
"first-name-is-required": "Vorname muss angegeben werden",
|
||||
"first-scan-of-the-day": "Erster Scan des Tages",
|
||||
"fixed-donation": "Festbetragsspende",
|
||||
"forgot_password": "Passwort vergessen?",
|
||||
"geerbte": "geerbte",
|
||||
@ -156,6 +167,7 @@
|
||||
"group-name-is-required": "Der Gruppenname muss angegeben werden.",
|
||||
"group-updated": "Gruppe aktualisiert",
|
||||
"groups": "Gruppen",
|
||||
"groups-are-being-loaded": "Gruppen werden geladen",
|
||||
"home": "Start",
|
||||
"icon-image-credits": "Wir möchten uns außerdem für die verwendeten Icons und Bilder bedanken bei:",
|
||||
"import-finished": "Import abgeschlossen",
|
||||
@ -166,9 +178,11 @@
|
||||
"inactive": "Inaktiv",
|
||||
"installed-version": "Installierte Version",
|
||||
"internal-error": "Interner Fehler",
|
||||
"invalid": "Ungültig",
|
||||
"invalid-mail-reset": "Das ist keine gültige E-Mail",
|
||||
"laeufer-hinzufuegen": "Läufer:in hinzufügen",
|
||||
"laeufer-importieren": "Läufer:innen importieren",
|
||||
"laptime": "Rundenzeit",
|
||||
"last-name": "Nachname",
|
||||
"last-name-is-required": "Nachname muss angegeben werden",
|
||||
"lfk-is-os": "Das \"Lauf für Kaya!\" Frontend ist (wie alle anderen Projekte für den \"LfK!\" auch) ein OpenSource Projekt.",
|
||||
@ -177,7 +191,9 @@
|
||||
"loading-contact-details": "Kontaktdaten werden geladen ...",
|
||||
"loading-donation-details": "Lade Sponsoringdetails",
|
||||
"loading-donor-details": "Lade Details",
|
||||
"loading-group-detail": "Lade Gruppendetails...",
|
||||
"loading-runners": "Läufer:innen werden geladen...",
|
||||
"loading-station-details": "Lade Scanstation-Details ...",
|
||||
"log_in": "Anmelden",
|
||||
"log_in_to_your_account": "Bitte melde dich an",
|
||||
"login_is_checked": "Login wird überprüft",
|
||||
@ -226,6 +242,7 @@
|
||||
"please-provide-a-password": "Bitte gebe ein Passwort an...",
|
||||
"please-provide-the-nessecary-information-to-add-a-new-donor": "Bitte mach die Notwendigen Angaben, um eine neue Sponsor:in zu erstellen",
|
||||
"please-provide-the-nessecary-information-to-create-a-new-donation": "Bitte gebe alle für das Sponsoring notwendigen Daten an.",
|
||||
"please-provide-the-nessecary-information-to-create-a-new-scan": "Bitte gebe alle notwendigen Informationen an, um einen neuen Scan zu erstellen.",
|
||||
"please-provide-the-required-csv-xlsx-file": "Bitte eine CSV oder XLSX Datei hochladen.",
|
||||
"please-provide-the-required-information-for-creating-a-new-user-group": "Bitte gebe alle für eine neue Gruppe notwendigen Informationen an.",
|
||||
"please-provide-the-required-information-to-add-a-new-contact": "Bitte gebe alle nötigen Informationen an, im den neuen Kontakt zu erstellen.",
|
||||
@ -255,6 +272,14 @@
|
||||
"runners-are-being-loaded": "Läufer:innen werden geladen ...",
|
||||
"save": "Speichern",
|
||||
"save-changes": "Änderungen speichern",
|
||||
"scan-added": "Scan hinzugefügt",
|
||||
"scan-is-being-updated": "Scan wird aktualisiert",
|
||||
"scan-with-fixed-distance": "Scan mit Festdistanz",
|
||||
"scans": "Scans",
|
||||
"scans-are-being-loaded": "Scans werden geladen",
|
||||
"scanstation": "Scanner Station",
|
||||
"scanstations": "Scanner Stationen",
|
||||
"scanstations-are-being-loaded": "Scannerstationen werden geladen...",
|
||||
"search-for-an-organization-by-name-or-id": "Suche eine Organisation (via Name oder Id)",
|
||||
"search-for-an-organization-or-team-by-name-or-id": "Suche eine Organisation oder ein Team (via Name oder Id)",
|
||||
"search-for-donor-name-or-id": "Suche eine Spender:in (via Name oder Id)",
|
||||
@ -276,18 +301,22 @@
|
||||
"teams": "Teams",
|
||||
"teams-are-being-loaded": "Teams werden geladen ...",
|
||||
"the-provided-phone-number-is-invalid-less-than-br-greater-than-please-enter-a-valid-international-number": "Die angegebene Telefonnummer ist nicht korrekt. <br /> Bitte gebe eine Telefonnummer im internationalen Format an...",
|
||||
"the-scans-distance-must-be-greater-than-0m": "Die Distanz muss größer als 0m sein.",
|
||||
"there-are-no-contacts-added-yet": "Es wurden noch keine Kontakte hinzugefügt.",
|
||||
"there-are-no-donors-yet": "Es gibt noch keine Sponsor:innen",
|
||||
"there-are-no-groups-yet": "Es gibt noch keine Gruppen",
|
||||
"there-are-no-organizations-added-yet": "Es wurden noch keine Organisationen hinzugefügt.",
|
||||
"there-are-no-runners-added-yet": "Es wurden noch keine Läufer:innen hinzugefügt.",
|
||||
"there-are-no-scans-yet": "Es gibt noch keine scans",
|
||||
"there-are-no-teams-added-yet": "Es wurden noch keine Teams hinzugefügt.",
|
||||
"there-are-no-users-added-yet": "Es wurden noch keine Benutzer hinzugefügt.",
|
||||
"this-might-take-a-moment": "Das könnte einen kleinen Moment dauern",
|
||||
"this-scanstation-is": "Diese Station ist",
|
||||
"total-distance": "gelaufene Strecke",
|
||||
"total-donation-amount": "Gesamtbetrag",
|
||||
"total-donations": "Spendensumme",
|
||||
"total-scans": "gesamte Scans",
|
||||
"track": "Track",
|
||||
"track-added": "Track hinzugefügt",
|
||||
"track-data-is-being-loaded": "Trackdaten werden geladen",
|
||||
"track-is-being-added": "Track wird hinzugefügt...",
|
||||
@ -299,6 +328,7 @@
|
||||
"updated-contact": "Kontakt aktualisiert!",
|
||||
"updated-donor": "Sponsor:in wurde aktualisiert",
|
||||
"updated-organization": "Organisation wurde aktualisiert",
|
||||
"updated-scan": "Scan wurde aktualisiert",
|
||||
"updateing-group": "Gruppe wird aktualisiert...",
|
||||
"updating-organization": "Organisation wird aktualisiert",
|
||||
"updating-permissions": "Berechtigungen werden aktualisiert...",
|
||||
@ -310,12 +340,14 @@
|
||||
"user-updated": "Benutzer:in wurde aktualisiert",
|
||||
"username": "Benutzername",
|
||||
"users": "Benutzer",
|
||||
"valid": "Gültig",
|
||||
"valid-city-is-required": "Du musst eine Stadt angeben",
|
||||
"valid-email-is-required": "Es wird eine valide E-Mail Adresse benötigt",
|
||||
"valid-international-phone-number-is-required": "Du musst eine Telefonnummer im internationalen Format angeben...",
|
||||
"valid-zipcode-postal-code-is-required": "Du musst eine valide Postleitzahl angeben",
|
||||
"verfuegbare": "Verfügbar",
|
||||
"welcome_wavinghand": "Willkommen 👋",
|
||||
"yes-i-copied-the-token": "Ja, ich habe den Token kopiert",
|
||||
"you-can-now-use-your-new-password-to-log-in-to-your-account": "Du kannst dich jetzt mit deinem neuen Passwort anmelden! 🎉",
|
||||
"you-have-to-provide-an-organization": "Du musst eine Organisation angeben",
|
||||
"zip-postal-code": "Postleitzahl"
|
||||
|
||||
@ -64,6 +64,7 @@
|
||||
"create-a-new-organization": "Create a new Organization",
|
||||
"create-a-new-runner": "Create a new Runner",
|
||||
"create-a-new-scan-fixed-only": "Create a new scan (fixed only)",
|
||||
"create-a-new-scanstation": "Create a new station",
|
||||
"create-a-new-team": "Create a new team",
|
||||
"create-a-new-track": "Create a new Track",
|
||||
"create-a-new-user": "Create a new User",
|
||||
@ -103,6 +104,7 @@
|
||||
"delete-organization": "Delete Organization",
|
||||
"delete-runner": "Delete Runner",
|
||||
"delete-scan": "Delete scan",
|
||||
"delete-station": "Delete station",
|
||||
"delete-team": "Delete Team",
|
||||
"delete-user": "Delete User",
|
||||
"deleted-scan": "Deleted scan",
|
||||
@ -135,6 +137,7 @@
|
||||
"edit": "Edit",
|
||||
"edit-permissions": "edit permissions",
|
||||
"email_address_or_username": "Email / username",
|
||||
"enabled": "enabled",
|
||||
"english": "English",
|
||||
"error_on_login": "Error on login",
|
||||
"erteilte": "Directly granted",
|
||||
@ -164,6 +167,7 @@
|
||||
"group-name-is-required": "Group name is required",
|
||||
"group-updated": "group updated",
|
||||
"groups": "Groups",
|
||||
"groups-are-being-loaded": "Groups are being loaded",
|
||||
"home": "Home",
|
||||
"icon-image-credits": "We also want to thank these projects for illustrations and icons:",
|
||||
"import-finished": "Import finished",
|
||||
@ -187,7 +191,9 @@
|
||||
"loading-contact-details": "Loading contact details...",
|
||||
"loading-donation-details": "Loading donation details",
|
||||
"loading-donor-details": "Loading donor details",
|
||||
"loading-group-detail": "Loading group detail...",
|
||||
"loading-runners": "loading runners...",
|
||||
"loading-station-details": "Loading station details",
|
||||
"log_in": "Log in",
|
||||
"log_in_to_your_account": "Log in to your account",
|
||||
"login_is_checked": "Login is being checked...",
|
||||
@ -271,6 +277,9 @@
|
||||
"scan-with-fixed-distance": "Scan with fixed distance",
|
||||
"scans": "Scans",
|
||||
"scans-are-being-loaded": "Scans are being loaded",
|
||||
"scanstation": "Scanstation",
|
||||
"scanstations": "Scanstations",
|
||||
"scanstations-are-being-loaded": "Loading scanstations...",
|
||||
"search-for-an-organization-by-name-or-id": "Search for an organization (by name or id)",
|
||||
"search-for-an-organization-or-team-by-name-or-id": "Search for an organization or team (by name or id)",
|
||||
"search-for-donor-name-or-id": "Search for donor (by name or id)",
|
||||
@ -302,6 +311,7 @@
|
||||
"there-are-no-teams-added-yet": "There are no teams added yet.",
|
||||
"there-are-no-users-added-yet": "There are no users added yet.",
|
||||
"this-might-take-a-moment": "This might take a moment 👀",
|
||||
"this-scanstation-is": "This scanstation is",
|
||||
"total-distance": "total distance",
|
||||
"total-donation-amount": "total donation amount",
|
||||
"total-donations": "total donations",
|
||||
@ -337,6 +347,7 @@
|
||||
"valid-zipcode-postal-code-is-required": "Valid zipcode/ postal code is required",
|
||||
"verfuegbare": "availdable",
|
||||
"welcome_wavinghand": "Welcome 👋",
|
||||
"yes-i-copied-the-token": "Yes, I copied the token",
|
||||
"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! 🎉",
|
||||
"you-have-to-provide-an-organization": "You have to provide an organization",
|
||||
"zip-postal-code": "ZIP/ postal code"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user