From 335f49ab11e238e6bac6e651c3d583704836761f Mon Sep 17 00:00:00 2001 From: Daniel Schadt Date: Sat, 1 Nov 2025 15:27:51 +0100 Subject: split track data and backups in storage breakdown --- fietsboek/locale/de/LC_MESSAGES/messages.mo | Bin 17892 -> 17985 bytes fietsboek/locale/de/LC_MESSAGES/messages.po | 146 ++++++++++++++-------------- fietsboek/locale/en/LC_MESSAGES/messages.mo | Bin 16808 -> 16894 bytes fietsboek/locale/en/LC_MESSAGES/messages.po | 146 ++++++++++++++-------------- fietsboek/locale/fietslog.pot | 144 ++++++++++++++------------- fietsboek/templates/admin_overview.jinja2 | 6 +- fietsboek/views/admin.py | 9 +- 7 files changed, 233 insertions(+), 218 deletions(-) diff --git a/fietsboek/locale/de/LC_MESSAGES/messages.mo b/fietsboek/locale/de/LC_MESSAGES/messages.mo index 6526f6f..22982c0 100644 Binary files a/fietsboek/locale/de/LC_MESSAGES/messages.mo and b/fietsboek/locale/de/LC_MESSAGES/messages.mo differ diff --git a/fietsboek/locale/de/LC_MESSAGES/messages.po b/fietsboek/locale/de/LC_MESSAGES/messages.po index f306a46..e9c65c6 100644 --- a/fietsboek/locale/de/LC_MESSAGES/messages.po +++ b/fietsboek/locale/de/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2025-06-12 22:39+0200\n" +"POT-Creation-Date: 2025-11-01 15:25+0100\n" "PO-Revision-Date: 2022-07-02 17:35+0200\n" "Last-Translator: FULL NAME \n" "Language: de\n" @@ -18,54 +18,54 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 2.17.0\n" -#: fietsboek/actions.py:278 +#: fietsboek/actions.py:265 msgid "email.verify_mail.subject" msgstr "Fietsboek Konto Bestätigung" -#: fietsboek/actions.py:281 +#: fietsboek/actions.py:268 msgid "email.verify.text" msgstr "" "Um Dein Fietsboek-Konto zu bestätigen, nutze diesen Link: {}\n" "\n" "Falls Du kein Konto angelegt hast, ignoriere diese E-Mail." -#: fietsboek/util.py:334 +#: fietsboek/util.py:297 msgid "password_constraint.mismatch" msgstr "Passwörter stimmen nicht überein" -#: fietsboek/util.py:336 +#: fietsboek/util.py:299 msgid "password_constraint.length" msgstr "Passwort zu kurz" -#: fietsboek/models/track.py:622 +#: fietsboek/models/track.py:725 msgid "tooltip.table.length" msgstr "Länge" -#: fietsboek/models/track.py:623 +#: fietsboek/models/track.py:726 msgid "tooltip.table.people" msgstr "# Personen" -#: fietsboek/models/track.py:624 +#: fietsboek/models/track.py:727 msgid "tooltip.table.uphill" msgstr "Bergauf" -#: fietsboek/models/track.py:625 +#: fietsboek/models/track.py:728 msgid "tooltip.table.downhill" msgstr "Bergab" -#: fietsboek/models/track.py:626 fietsboek/templates/home.jinja2:7 +#: fietsboek/models/track.py:729 fietsboek/templates/home.jinja2:7 msgid "tooltip.table.moving_time" msgstr "Fahrzeit" -#: fietsboek/models/track.py:627 fietsboek/templates/home.jinja2:8 +#: fietsboek/models/track.py:730 fietsboek/templates/home.jinja2:8 msgid "tooltip.table.stopped_time" msgstr "Haltezeit" -#: fietsboek/models/track.py:629 +#: fietsboek/models/track.py:732 msgid "tooltip.table.max_speed" msgstr "Maximalgeschwindigkeit" -#: fietsboek/models/track.py:633 +#: fietsboek/models/track.py:736 msgid "tooltip.table.avg_speed" msgstr "Durchschnittsgeschwindigkeit" @@ -176,22 +176,26 @@ msgid "admin.overview.last_cronjob" msgstr "Letzter Cronjob" #: fietsboek/templates/admin_overview.jinja2:55 -msgid "admin.overview.storage_graph.label.gpx" -msgstr "GPX" +msgid "admin.overview.storage_graph.label.track_data" +msgstr "Streckendaten" #: fietsboek/templates/admin_overview.jinja2:56 +msgid "admin.overview.storage_graph.label.backups" +msgstr "Sicherungskopien" + +#: fietsboek/templates/admin_overview.jinja2:57 msgid "admin.overview.storage_graph.label.images" msgstr "Bilder" -#: fietsboek/templates/admin_overview.jinja2:57 +#: fietsboek/templates/admin_overview.jinja2:58 msgid "admin.overview.storage_graph.label.previews" msgstr "Vorschaubilder" -#: fietsboek/templates/admin_overview.jinja2:58 +#: fietsboek/templates/admin_overview.jinja2:59 msgid "admin.overview.storage_graph.label.user_maps" msgstr "Nutzerkarten" -#: fietsboek/templates/admin_overview.jinja2:84 +#: fietsboek/templates/admin_overview.jinja2:86 msgid "admin.overview.storage_graph.title" msgstr "Speicherübersicht" @@ -291,52 +295,52 @@ msgstr "Dies ist eine Aufnahme einer Strecke" msgid "page.browse.synthetic_tooltip" msgstr "Dies ist eine geplante Strecke" -#: fietsboek/templates/browse.jinja2:162 fietsboek/templates/details.jinja2:103 +#: fietsboek/templates/browse.jinja2:162 fietsboek/templates/details.jinja2:120 #: fietsboek/templates/profile_overview.jinja2:20 msgid "page.details.date" msgstr "Datum" -#: fietsboek/templates/browse.jinja2:164 fietsboek/templates/details.jinja2:117 +#: fietsboek/templates/browse.jinja2:164 fietsboek/templates/details.jinja2:134 #: fietsboek/templates/profile_overview.jinja2:22 msgid "page.details.length" msgstr "Länge" -#: fietsboek/templates/browse.jinja2:169 fietsboek/templates/details.jinja2:108 +#: fietsboek/templates/browse.jinja2:169 fietsboek/templates/details.jinja2:125 #: fietsboek/templates/profile_overview.jinja2:26 msgid "page.details.start_time" msgstr "Startzeit" -#: fietsboek/templates/browse.jinja2:171 fietsboek/templates/details.jinja2:112 +#: fietsboek/templates/browse.jinja2:171 fietsboek/templates/details.jinja2:129 #: fietsboek/templates/profile_overview.jinja2:28 msgid "page.details.end_time" msgstr "Endzeit" -#: fietsboek/templates/browse.jinja2:176 fietsboek/templates/details.jinja2:121 +#: fietsboek/templates/browse.jinja2:176 fietsboek/templates/details.jinja2:138 #: fietsboek/templates/profile_overview.jinja2:32 msgid "page.details.uphill" msgstr "Bergauf" -#: fietsboek/templates/browse.jinja2:178 fietsboek/templates/details.jinja2:125 +#: fietsboek/templates/browse.jinja2:178 fietsboek/templates/details.jinja2:142 #: fietsboek/templates/profile_overview.jinja2:34 msgid "page.details.downhill" msgstr "Bergab" -#: fietsboek/templates/browse.jinja2:183 fietsboek/templates/details.jinja2:130 +#: fietsboek/templates/browse.jinja2:183 fietsboek/templates/details.jinja2:147 #: fietsboek/templates/profile_overview.jinja2:38 msgid "page.details.moving_time" msgstr "Fahrzeit" -#: fietsboek/templates/browse.jinja2:185 fietsboek/templates/details.jinja2:134 +#: fietsboek/templates/browse.jinja2:185 fietsboek/templates/details.jinja2:151 #: fietsboek/templates/profile_overview.jinja2:40 msgid "page.details.stopped_time" msgstr "Haltezeit" -#: fietsboek/templates/browse.jinja2:189 fietsboek/templates/details.jinja2:138 +#: fietsboek/templates/browse.jinja2:189 fietsboek/templates/details.jinja2:155 #: fietsboek/templates/profile_overview.jinja2:44 msgid "page.details.max_speed" msgstr "maximale Geschwindigkeit" -#: fietsboek/templates/browse.jinja2:191 fietsboek/templates/details.jinja2:142 +#: fietsboek/templates/browse.jinja2:191 fietsboek/templates/details.jinja2:159 #: fietsboek/templates/profile_overview.jinja2:46 msgid "page.details.avg_speed" msgstr "durchschnittliche Geschwindigkeit" @@ -411,90 +415,90 @@ msgstr "Passwort wiederholen" msgid "page.create_account.create" msgstr "Erstellen" -#: fietsboek/templates/details.jinja2:7 +#: fietsboek/templates/details.jinja2:24 msgid "page.details.title" msgstr "Details" -#: fietsboek/templates/details.jinja2:20 +#: fietsboek/templates/details.jinja2:37 msgid "page.details.edit" msgstr "Bearbeiten" -#: fietsboek/templates/details.jinja2:21 +#: fietsboek/templates/details.jinja2:38 msgid "page.details.share" msgstr "Teilen" -#: fietsboek/templates/details.jinja2:22 +#: fietsboek/templates/details.jinja2:39 msgid "page.details.delete" msgstr "Löschen" -#: fietsboek/templates/details.jinja2:28 +#: fietsboek/templates/details.jinja2:45 msgid "page.details.sharelink.title" msgstr "Link zum Teilen" -#: fietsboek/templates/details.jinja2:32 +#: fietsboek/templates/details.jinja2:49 msgid "page.details.sharelink.info" msgstr "Jeder mit Zugang zu diesem Link kann die Strecke ansehen!" -#: fietsboek/templates/details.jinja2:39 +#: fietsboek/templates/details.jinja2:56 msgid "page.details.sharelink.invalidate" msgstr "Link invalidieren" -#: fietsboek/templates/details.jinja2:41 +#: fietsboek/templates/details.jinja2:58 msgid "page.details.sharelink.close" msgstr "Schließen" -#: fietsboek/templates/details.jinja2:51 +#: fietsboek/templates/details.jinja2:68 msgid "page.details.delete.title" msgstr "Strecke Löschen" -#: fietsboek/templates/details.jinja2:55 +#: fietsboek/templates/details.jinja2:72 msgid "page.details.delete.info" msgstr "Das Löschen der Strecke wird alle damit verbundenen Informationen löschen!" -#: fietsboek/templates/details.jinja2:60 +#: fietsboek/templates/details.jinja2:77 msgid "page.details.delete.delete" msgstr "Löschen" -#: fietsboek/templates/details.jinja2:62 +#: fietsboek/templates/details.jinja2:79 msgid "page.details.delete.close" msgstr "Abbrechen" -#: fietsboek/templates/details.jinja2:81 +#: fietsboek/templates/details.jinja2:98 msgid "page.details.tags" msgstr "Schlagwörter" -#: fietsboek/templates/details.jinja2:91 fietsboek/templates/edit.jinja2:10 +#: fietsboek/templates/details.jinja2:108 fietsboek/templates/edit.jinja2:10 #: fietsboek/templates/finish_upload.jinja2:10 msgid "page.noscript" msgstr "" "JavaScript ist deaktiviert, zum Nutzen aller Funktionen bitte JavaScript " "aktivieren" -#: fietsboek/templates/details.jinja2:97 +#: fietsboek/templates/details.jinja2:114 msgid "page.details.download" msgstr "Herunterladen" -#: fietsboek/templates/details.jinja2:187 +#: fietsboek/templates/details.jinja2:204 msgid "page.details.comments" msgstr "Kommentare" -#: fietsboek/templates/details.jinja2:191 +#: fietsboek/templates/details.jinja2:208 msgid "page.details.comments.author" msgstr "Kommentar von {}" -#: fietsboek/templates/details.jinja2:208 +#: fietsboek/templates/details.jinja2:225 msgid "page.details.comments.new.title" msgstr "Kommentar erstellen" -#: fietsboek/templates/details.jinja2:211 +#: fietsboek/templates/details.jinja2:228 msgid "page.details.comments.new.input_title" msgstr "Titel" -#: fietsboek/templates/details.jinja2:212 +#: fietsboek/templates/details.jinja2:229 msgid "page.details.comments.new.input_comment" msgstr "Kommentar" -#: fietsboek/templates/details.jinja2:215 +#: fietsboek/templates/details.jinja2:232 msgid "page.details.comments.new.submit" msgstr "Absenden" @@ -664,51 +668,51 @@ msgstr[1] "%(num)d Strecken" msgid "page.home.total" msgstr "Gesamt" -#: fietsboek/templates/layout.jinja2:43 +#: fietsboek/templates/layout.jinja2:44 msgid "page.navbar.toggle" msgstr "Navigation umschalten" -#: fietsboek/templates/layout.jinja2:54 +#: fietsboek/templates/layout.jinja2:55 msgid "page.navbar.home" msgstr "Startseite" -#: fietsboek/templates/layout.jinja2:57 +#: fietsboek/templates/layout.jinja2:58 msgid "page.navbar.browse" msgstr "Stöbern" -#: fietsboek/templates/layout.jinja2:61 +#: fietsboek/templates/layout.jinja2:62 msgid "page.navbar.upload" msgstr "Hochladen" -#: fietsboek/templates/layout.jinja2:70 +#: fietsboek/templates/layout.jinja2:71 msgid "page.navbar.user" msgstr "Nutzer" -#: fietsboek/templates/layout.jinja2:74 +#: fietsboek/templates/layout.jinja2:75 msgid "page.navbar.welcome_user" msgstr "Willkommen, {}!" -#: fietsboek/templates/layout.jinja2:77 +#: fietsboek/templates/layout.jinja2:78 msgid "page.navbar.logout" msgstr "Abmelden" -#: fietsboek/templates/layout.jinja2:80 +#: fietsboek/templates/layout.jinja2:81 msgid "page.navbar.profile" msgstr "Profil" -#: fietsboek/templates/layout.jinja2:83 +#: fietsboek/templates/layout.jinja2:84 msgid "page.navbar.user_data" msgstr "Persönliche Daten" -#: fietsboek/templates/layout.jinja2:87 +#: fietsboek/templates/layout.jinja2:88 msgid "page.navbar.admin" msgstr "Admin" -#: fietsboek/templates/layout.jinja2:93 +#: fietsboek/templates/layout.jinja2:94 msgid "page.navbar.login" msgstr "Anmelden" -#: fietsboek/templates/layout.jinja2:97 +#: fietsboek/templates/layout.jinja2:98 msgid "page.navbar.create_account" msgstr "Konto Erstellen" @@ -976,11 +980,11 @@ msgstr "" "Diese Transformation passt die Höhenangabe für Punkte an, bei denen die " "Höhenangabe fehlt." -#: fietsboek/transformers/elevation.py:116 +#: fietsboek/transformers/elevation.py:109 msgid "transformers.fix-elevation-jumps" msgstr "Höhensprünge beheben" -#: fietsboek/transformers/elevation.py:120 +#: fietsboek/transformers/elevation.py:113 msgid "transformers.fix-elevation-jumps.description" msgstr "" "Diese Transformation passt die Höhenangabe für Punkte an, bei denen die " @@ -998,15 +1002,15 @@ msgstr "Ungültige E-Mail-Adresse" msgid "flash.a_confirmation_link_has_been_sent" msgstr "Ein Bestätigungslink wurde versandt" -#: fietsboek/views/admin.py:156 +#: fietsboek/views/admin.py:168 msgid "flash.badge_added" msgstr "Wappen hinzugefügt" -#: fietsboek/views/admin.py:180 +#: fietsboek/views/admin.py:192 msgid "flash.badge_modified" msgstr "Wappen bearbeitet" -#: fietsboek/views/admin.py:200 +#: fietsboek/views/admin.py:212 msgid "flash.badge_deleted" msgstr "Wappen gelöscht" @@ -1066,23 +1070,23 @@ msgstr "E-Mail-Adresse bestätigt" msgid "flash.password_updated" msgstr "Passwort aktualisiert" -#: fietsboek/views/detail.py:166 +#: fietsboek/views/detail.py:189 msgid "flash.track_deleted" msgstr "Strecke gelöscht" -#: fietsboek/views/edit.py:100 fietsboek/views/upload.py:66 +#: fietsboek/views/edit.py:97 fietsboek/views/upload.py:63 msgid "flash.invalid_file" msgstr "Ungültige GPX-Datei gesendet" -#: fietsboek/views/upload.py:54 +#: fietsboek/views/upload.py:53 msgid "flash.no_file_selected" msgstr "Keine Datei ausgewählt" -#: fietsboek/views/upload.py:194 +#: fietsboek/views/upload.py:182 msgid "flash.upload_success" msgstr "Hochladen erfolgreich" -#: fietsboek/views/upload.py:213 +#: fietsboek/views/upload.py:201 msgid "flash.upload_cancelled" msgstr "Hochladen abgebrochen" diff --git a/fietsboek/locale/en/LC_MESSAGES/messages.mo b/fietsboek/locale/en/LC_MESSAGES/messages.mo index 18f473c..d54ad31 100644 Binary files a/fietsboek/locale/en/LC_MESSAGES/messages.mo and b/fietsboek/locale/en/LC_MESSAGES/messages.mo differ diff --git a/fietsboek/locale/en/LC_MESSAGES/messages.po b/fietsboek/locale/en/LC_MESSAGES/messages.po index 89e183d..7ccdf1c 100644 --- a/fietsboek/locale/en/LC_MESSAGES/messages.po +++ b/fietsboek/locale/en/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2025-06-12 22:39+0200\n" +"POT-Creation-Date: 2025-11-01 15:25+0100\n" "PO-Revision-Date: 2023-04-03 20:42+0200\n" "Last-Translator: \n" "Language: en\n" @@ -18,54 +18,54 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 2.17.0\n" -#: fietsboek/actions.py:278 +#: fietsboek/actions.py:265 msgid "email.verify_mail.subject" msgstr "Fietsboek Account Verification" -#: fietsboek/actions.py:281 +#: fietsboek/actions.py:268 msgid "email.verify.text" msgstr "" "To verify your Fietsboek account, please use this link: {}\n" "\n" "If you did not create an account, ignore this email." -#: fietsboek/util.py:334 +#: fietsboek/util.py:297 msgid "password_constraint.mismatch" msgstr "Passwords don't match" -#: fietsboek/util.py:336 +#: fietsboek/util.py:299 msgid "password_constraint.length" msgstr "Password not long enough" -#: fietsboek/models/track.py:622 +#: fietsboek/models/track.py:725 msgid "tooltip.table.length" msgstr "Length" -#: fietsboek/models/track.py:623 +#: fietsboek/models/track.py:726 msgid "tooltip.table.people" msgstr "# People" -#: fietsboek/models/track.py:624 +#: fietsboek/models/track.py:727 msgid "tooltip.table.uphill" msgstr "Uphill" -#: fietsboek/models/track.py:625 +#: fietsboek/models/track.py:728 msgid "tooltip.table.downhill" msgstr "Downhill" -#: fietsboek/models/track.py:626 fietsboek/templates/home.jinja2:7 +#: fietsboek/models/track.py:729 fietsboek/templates/home.jinja2:7 msgid "tooltip.table.moving_time" msgstr "Moving Time" -#: fietsboek/models/track.py:627 fietsboek/templates/home.jinja2:8 +#: fietsboek/models/track.py:730 fietsboek/templates/home.jinja2:8 msgid "tooltip.table.stopped_time" msgstr "Stopped Time" -#: fietsboek/models/track.py:629 +#: fietsboek/models/track.py:732 msgid "tooltip.table.max_speed" msgstr "Max Speed" -#: fietsboek/models/track.py:633 +#: fietsboek/models/track.py:736 msgid "tooltip.table.avg_speed" msgstr "Average Speed" @@ -176,22 +176,26 @@ msgid "admin.overview.last_cronjob" msgstr "Last cronjob" #: fietsboek/templates/admin_overview.jinja2:55 -msgid "admin.overview.storage_graph.label.gpx" -msgstr "GPX" +msgid "admin.overview.storage_graph.label.track_data" +msgstr "Track data" #: fietsboek/templates/admin_overview.jinja2:56 +msgid "admin.overview.storage_graph.label.backups" +msgstr "File backups" + +#: fietsboek/templates/admin_overview.jinja2:57 msgid "admin.overview.storage_graph.label.images" msgstr "Images" -#: fietsboek/templates/admin_overview.jinja2:57 +#: fietsboek/templates/admin_overview.jinja2:58 msgid "admin.overview.storage_graph.label.previews" msgstr "Preview images" -#: fietsboek/templates/admin_overview.jinja2:58 +#: fietsboek/templates/admin_overview.jinja2:59 msgid "admin.overview.storage_graph.label.user_maps" msgstr "User maps" -#: fietsboek/templates/admin_overview.jinja2:84 +#: fietsboek/templates/admin_overview.jinja2:86 msgid "admin.overview.storage_graph.title" msgstr "Storage breakdown" @@ -291,52 +295,52 @@ msgstr "This is a recording of a track" msgid "page.browse.synthetic_tooltip" msgstr "This is a pre-planned track" -#: fietsboek/templates/browse.jinja2:162 fietsboek/templates/details.jinja2:103 +#: fietsboek/templates/browse.jinja2:162 fietsboek/templates/details.jinja2:120 #: fietsboek/templates/profile_overview.jinja2:20 msgid "page.details.date" msgstr "Date" -#: fietsboek/templates/browse.jinja2:164 fietsboek/templates/details.jinja2:117 +#: fietsboek/templates/browse.jinja2:164 fietsboek/templates/details.jinja2:134 #: fietsboek/templates/profile_overview.jinja2:22 msgid "page.details.length" msgstr "Length" -#: fietsboek/templates/browse.jinja2:169 fietsboek/templates/details.jinja2:108 +#: fietsboek/templates/browse.jinja2:169 fietsboek/templates/details.jinja2:125 #: fietsboek/templates/profile_overview.jinja2:26 msgid "page.details.start_time" msgstr "Record Start" -#: fietsboek/templates/browse.jinja2:171 fietsboek/templates/details.jinja2:112 +#: fietsboek/templates/browse.jinja2:171 fietsboek/templates/details.jinja2:129 #: fietsboek/templates/profile_overview.jinja2:28 msgid "page.details.end_time" msgstr "Record End" -#: fietsboek/templates/browse.jinja2:176 fietsboek/templates/details.jinja2:121 +#: fietsboek/templates/browse.jinja2:176 fietsboek/templates/details.jinja2:138 #: fietsboek/templates/profile_overview.jinja2:32 msgid "page.details.uphill" msgstr "Uphill" -#: fietsboek/templates/browse.jinja2:178 fietsboek/templates/details.jinja2:125 +#: fietsboek/templates/browse.jinja2:178 fietsboek/templates/details.jinja2:142 #: fietsboek/templates/profile_overview.jinja2:34 msgid "page.details.downhill" msgstr "Downhill" -#: fietsboek/templates/browse.jinja2:183 fietsboek/templates/details.jinja2:130 +#: fietsboek/templates/browse.jinja2:183 fietsboek/templates/details.jinja2:147 #: fietsboek/templates/profile_overview.jinja2:38 msgid "page.details.moving_time" msgstr "Moving Time" -#: fietsboek/templates/browse.jinja2:185 fietsboek/templates/details.jinja2:134 +#: fietsboek/templates/browse.jinja2:185 fietsboek/templates/details.jinja2:151 #: fietsboek/templates/profile_overview.jinja2:40 msgid "page.details.stopped_time" msgstr "Stopped Time" -#: fietsboek/templates/browse.jinja2:189 fietsboek/templates/details.jinja2:138 +#: fietsboek/templates/browse.jinja2:189 fietsboek/templates/details.jinja2:155 #: fietsboek/templates/profile_overview.jinja2:44 msgid "page.details.max_speed" msgstr "Max Speed" -#: fietsboek/templates/browse.jinja2:191 fietsboek/templates/details.jinja2:142 +#: fietsboek/templates/browse.jinja2:191 fietsboek/templates/details.jinja2:159 #: fietsboek/templates/profile_overview.jinja2:46 msgid "page.details.avg_speed" msgstr "Average Speed" @@ -409,88 +413,88 @@ msgstr "Repeat password" msgid "page.create_account.create" msgstr "Create" -#: fietsboek/templates/details.jinja2:7 +#: fietsboek/templates/details.jinja2:24 msgid "page.details.title" msgstr "Track Details" -#: fietsboek/templates/details.jinja2:20 +#: fietsboek/templates/details.jinja2:37 msgid "page.details.edit" msgstr "Edit" -#: fietsboek/templates/details.jinja2:21 +#: fietsboek/templates/details.jinja2:38 msgid "page.details.share" msgstr "Share" -#: fietsboek/templates/details.jinja2:22 +#: fietsboek/templates/details.jinja2:39 msgid "page.details.delete" msgstr "Delete" -#: fietsboek/templates/details.jinja2:28 +#: fietsboek/templates/details.jinja2:45 msgid "page.details.sharelink.title" msgstr "Share Link" -#: fietsboek/templates/details.jinja2:32 +#: fietsboek/templates/details.jinja2:49 msgid "page.details.sharelink.info" msgstr "Everyone with access to this link can view the track!" -#: fietsboek/templates/details.jinja2:39 +#: fietsboek/templates/details.jinja2:56 msgid "page.details.sharelink.invalidate" msgstr "Invalidate link" -#: fietsboek/templates/details.jinja2:41 +#: fietsboek/templates/details.jinja2:58 msgid "page.details.sharelink.close" msgstr "Close" -#: fietsboek/templates/details.jinja2:51 +#: fietsboek/templates/details.jinja2:68 msgid "page.details.delete.title" msgstr "Delete Track" -#: fietsboek/templates/details.jinja2:55 +#: fietsboek/templates/details.jinja2:72 msgid "page.details.delete.info" msgstr "Deleting this track will remove all associated information with it!" -#: fietsboek/templates/details.jinja2:60 +#: fietsboek/templates/details.jinja2:77 msgid "page.details.delete.delete" msgstr "Delete" -#: fietsboek/templates/details.jinja2:62 +#: fietsboek/templates/details.jinja2:79 msgid "page.details.delete.close" msgstr "Abort" -#: fietsboek/templates/details.jinja2:81 +#: fietsboek/templates/details.jinja2:98 msgid "page.details.tags" msgstr "Tagged as" -#: fietsboek/templates/details.jinja2:91 fietsboek/templates/edit.jinja2:10 +#: fietsboek/templates/details.jinja2:108 fietsboek/templates/edit.jinja2:10 #: fietsboek/templates/finish_upload.jinja2:10 msgid "page.noscript" msgstr "JavaScript is disabled, please enable JavaScript" -#: fietsboek/templates/details.jinja2:97 +#: fietsboek/templates/details.jinja2:114 msgid "page.details.download" msgstr "Download Tour" -#: fietsboek/templates/details.jinja2:187 +#: fietsboek/templates/details.jinja2:204 msgid "page.details.comments" msgstr "Comments" -#: fietsboek/templates/details.jinja2:191 +#: fietsboek/templates/details.jinja2:208 msgid "page.details.comments.author" msgstr "Comment by {}" -#: fietsboek/templates/details.jinja2:208 +#: fietsboek/templates/details.jinja2:225 msgid "page.details.comments.new.title" msgstr "Create a new comment" -#: fietsboek/templates/details.jinja2:211 +#: fietsboek/templates/details.jinja2:228 msgid "page.details.comments.new.input_title" msgstr "Title" -#: fietsboek/templates/details.jinja2:212 +#: fietsboek/templates/details.jinja2:229 msgid "page.details.comments.new.input_comment" msgstr "Comment" -#: fietsboek/templates/details.jinja2:215 +#: fietsboek/templates/details.jinja2:232 msgid "page.details.comments.new.submit" msgstr "Submit" @@ -658,51 +662,51 @@ msgstr[1] "%(num)d tracks" msgid "page.home.total" msgstr "Total" -#: fietsboek/templates/layout.jinja2:43 +#: fietsboek/templates/layout.jinja2:44 msgid "page.navbar.toggle" msgstr "Toggle navigation" -#: fietsboek/templates/layout.jinja2:54 +#: fietsboek/templates/layout.jinja2:55 msgid "page.navbar.home" msgstr "Home" -#: fietsboek/templates/layout.jinja2:57 +#: fietsboek/templates/layout.jinja2:58 msgid "page.navbar.browse" msgstr "Browse" -#: fietsboek/templates/layout.jinja2:61 +#: fietsboek/templates/layout.jinja2:62 msgid "page.navbar.upload" msgstr "Upload" -#: fietsboek/templates/layout.jinja2:70 +#: fietsboek/templates/layout.jinja2:71 msgid "page.navbar.user" msgstr "User" -#: fietsboek/templates/layout.jinja2:74 +#: fietsboek/templates/layout.jinja2:75 msgid "page.navbar.welcome_user" msgstr "Welcome, {}!" -#: fietsboek/templates/layout.jinja2:77 +#: fietsboek/templates/layout.jinja2:78 msgid "page.navbar.logout" msgstr "Logout" -#: fietsboek/templates/layout.jinja2:80 +#: fietsboek/templates/layout.jinja2:81 msgid "page.navbar.profile" msgstr "Profile" -#: fietsboek/templates/layout.jinja2:83 +#: fietsboek/templates/layout.jinja2:84 msgid "page.navbar.user_data" msgstr "Personal Data" -#: fietsboek/templates/layout.jinja2:87 +#: fietsboek/templates/layout.jinja2:88 msgid "page.navbar.admin" msgstr "Admin" -#: fietsboek/templates/layout.jinja2:93 +#: fietsboek/templates/layout.jinja2:94 msgid "page.navbar.login" msgstr "Login" -#: fietsboek/templates/layout.jinja2:97 +#: fietsboek/templates/layout.jinja2:98 msgid "page.navbar.create_account" msgstr "Create Account" @@ -968,11 +972,11 @@ msgstr "Fix null elevation" msgid "transformers.fix-null-elevation.description" msgstr "This transformer fixes the elevation of points whose elevation is unset." -#: fietsboek/transformers/elevation.py:116 +#: fietsboek/transformers/elevation.py:109 msgid "transformers.fix-elevation-jumps" msgstr "Fix elevation jumps" -#: fietsboek/transformers/elevation.py:120 +#: fietsboek/transformers/elevation.py:113 msgid "transformers.fix-elevation-jumps.description" msgstr "This transformer fixes abrupt jumps in the elevation value." @@ -988,15 +992,15 @@ msgstr "Invalid email" msgid "flash.a_confirmation_link_has_been_sent" msgstr "A confirmation link has been sent" -#: fietsboek/views/admin.py:156 +#: fietsboek/views/admin.py:168 msgid "flash.badge_added" msgstr "Badge has been added" -#: fietsboek/views/admin.py:180 +#: fietsboek/views/admin.py:192 msgid "flash.badge_modified" msgstr "Badge has been modified" -#: fietsboek/views/admin.py:200 +#: fietsboek/views/admin.py:212 msgid "flash.badge_deleted" msgstr "Badge has been deleted" @@ -1055,23 +1059,23 @@ msgstr "Your email address has been verified" msgid "flash.password_updated" msgstr "Password has been updated" -#: fietsboek/views/detail.py:166 +#: fietsboek/views/detail.py:189 msgid "flash.track_deleted" msgstr "Track has been deleted" -#: fietsboek/views/edit.py:100 fietsboek/views/upload.py:66 +#: fietsboek/views/edit.py:97 fietsboek/views/upload.py:63 msgid "flash.invalid_file" msgstr "Invalid GPX file selected" -#: fietsboek/views/upload.py:54 +#: fietsboek/views/upload.py:53 msgid "flash.no_file_selected" msgstr "No file selected" -#: fietsboek/views/upload.py:194 +#: fietsboek/views/upload.py:182 msgid "flash.upload_success" msgstr "Upload successful" -#: fietsboek/views/upload.py:213 +#: fietsboek/views/upload.py:201 msgid "flash.upload_cancelled" msgstr "Upload cancelled" diff --git a/fietsboek/locale/fietslog.pot b/fietsboek/locale/fietslog.pot index 6383760..cedd3ac 100644 --- a/fietsboek/locale/fietslog.pot +++ b/fietsboek/locale/fietslog.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2025-06-12 22:39+0200\n" +"POT-Creation-Date: 2025-11-01 15:25+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,51 +17,51 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 2.17.0\n" -#: fietsboek/actions.py:278 +#: fietsboek/actions.py:265 msgid "email.verify_mail.subject" msgstr "" -#: fietsboek/actions.py:281 +#: fietsboek/actions.py:268 msgid "email.verify.text" msgstr "" -#: fietsboek/util.py:334 +#: fietsboek/util.py:297 msgid "password_constraint.mismatch" msgstr "" -#: fietsboek/util.py:336 +#: fietsboek/util.py:299 msgid "password_constraint.length" msgstr "" -#: fietsboek/models/track.py:622 +#: fietsboek/models/track.py:725 msgid "tooltip.table.length" msgstr "" -#: fietsboek/models/track.py:623 +#: fietsboek/models/track.py:726 msgid "tooltip.table.people" msgstr "" -#: fietsboek/models/track.py:624 +#: fietsboek/models/track.py:727 msgid "tooltip.table.uphill" msgstr "" -#: fietsboek/models/track.py:625 +#: fietsboek/models/track.py:728 msgid "tooltip.table.downhill" msgstr "" -#: fietsboek/models/track.py:626 fietsboek/templates/home.jinja2:7 +#: fietsboek/models/track.py:729 fietsboek/templates/home.jinja2:7 msgid "tooltip.table.moving_time" msgstr "" -#: fietsboek/models/track.py:627 fietsboek/templates/home.jinja2:8 +#: fietsboek/models/track.py:730 fietsboek/templates/home.jinja2:8 msgid "tooltip.table.stopped_time" msgstr "" -#: fietsboek/models/track.py:629 +#: fietsboek/models/track.py:732 msgid "tooltip.table.max_speed" msgstr "" -#: fietsboek/models/track.py:633 +#: fietsboek/models/track.py:736 msgid "tooltip.table.avg_speed" msgstr "" @@ -170,22 +170,26 @@ msgid "admin.overview.last_cronjob" msgstr "" #: fietsboek/templates/admin_overview.jinja2:55 -msgid "admin.overview.storage_graph.label.gpx" +msgid "admin.overview.storage_graph.label.track_data" msgstr "" #: fietsboek/templates/admin_overview.jinja2:56 -msgid "admin.overview.storage_graph.label.images" +msgid "admin.overview.storage_graph.label.backups" msgstr "" #: fietsboek/templates/admin_overview.jinja2:57 -msgid "admin.overview.storage_graph.label.previews" +msgid "admin.overview.storage_graph.label.images" msgstr "" #: fietsboek/templates/admin_overview.jinja2:58 +msgid "admin.overview.storage_graph.label.previews" +msgstr "" + +#: fietsboek/templates/admin_overview.jinja2:59 msgid "admin.overview.storage_graph.label.user_maps" msgstr "" -#: fietsboek/templates/admin_overview.jinja2:84 +#: fietsboek/templates/admin_overview.jinja2:86 msgid "admin.overview.storage_graph.title" msgstr "" @@ -285,52 +289,52 @@ msgstr "" msgid "page.browse.synthetic_tooltip" msgstr "" -#: fietsboek/templates/browse.jinja2:162 fietsboek/templates/details.jinja2:103 +#: fietsboek/templates/browse.jinja2:162 fietsboek/templates/details.jinja2:120 #: fietsboek/templates/profile_overview.jinja2:20 msgid "page.details.date" msgstr "" -#: fietsboek/templates/browse.jinja2:164 fietsboek/templates/details.jinja2:117 +#: fietsboek/templates/browse.jinja2:164 fietsboek/templates/details.jinja2:134 #: fietsboek/templates/profile_overview.jinja2:22 msgid "page.details.length" msgstr "" -#: fietsboek/templates/browse.jinja2:169 fietsboek/templates/details.jinja2:108 +#: fietsboek/templates/browse.jinja2:169 fietsboek/templates/details.jinja2:125 #: fietsboek/templates/profile_overview.jinja2:26 msgid "page.details.start_time" msgstr "" -#: fietsboek/templates/browse.jinja2:171 fietsboek/templates/details.jinja2:112 +#: fietsboek/templates/browse.jinja2:171 fietsboek/templates/details.jinja2:129 #: fietsboek/templates/profile_overview.jinja2:28 msgid "page.details.end_time" msgstr "" -#: fietsboek/templates/browse.jinja2:176 fietsboek/templates/details.jinja2:121 +#: fietsboek/templates/browse.jinja2:176 fietsboek/templates/details.jinja2:138 #: fietsboek/templates/profile_overview.jinja2:32 msgid "page.details.uphill" msgstr "" -#: fietsboek/templates/browse.jinja2:178 fietsboek/templates/details.jinja2:125 +#: fietsboek/templates/browse.jinja2:178 fietsboek/templates/details.jinja2:142 #: fietsboek/templates/profile_overview.jinja2:34 msgid "page.details.downhill" msgstr "" -#: fietsboek/templates/browse.jinja2:183 fietsboek/templates/details.jinja2:130 +#: fietsboek/templates/browse.jinja2:183 fietsboek/templates/details.jinja2:147 #: fietsboek/templates/profile_overview.jinja2:38 msgid "page.details.moving_time" msgstr "" -#: fietsboek/templates/browse.jinja2:185 fietsboek/templates/details.jinja2:134 +#: fietsboek/templates/browse.jinja2:185 fietsboek/templates/details.jinja2:151 #: fietsboek/templates/profile_overview.jinja2:40 msgid "page.details.stopped_time" msgstr "" -#: fietsboek/templates/browse.jinja2:189 fietsboek/templates/details.jinja2:138 +#: fietsboek/templates/browse.jinja2:189 fietsboek/templates/details.jinja2:155 #: fietsboek/templates/profile_overview.jinja2:44 msgid "page.details.max_speed" msgstr "" -#: fietsboek/templates/browse.jinja2:191 fietsboek/templates/details.jinja2:142 +#: fietsboek/templates/browse.jinja2:191 fietsboek/templates/details.jinja2:159 #: fietsboek/templates/profile_overview.jinja2:46 msgid "page.details.avg_speed" msgstr "" @@ -403,88 +407,88 @@ msgstr "" msgid "page.create_account.create" msgstr "" -#: fietsboek/templates/details.jinja2:7 +#: fietsboek/templates/details.jinja2:24 msgid "page.details.title" msgstr "" -#: fietsboek/templates/details.jinja2:20 +#: fietsboek/templates/details.jinja2:37 msgid "page.details.edit" msgstr "" -#: fietsboek/templates/details.jinja2:21 +#: fietsboek/templates/details.jinja2:38 msgid "page.details.share" msgstr "" -#: fietsboek/templates/details.jinja2:22 +#: fietsboek/templates/details.jinja2:39 msgid "page.details.delete" msgstr "" -#: fietsboek/templates/details.jinja2:28 +#: fietsboek/templates/details.jinja2:45 msgid "page.details.sharelink.title" msgstr "" -#: fietsboek/templates/details.jinja2:32 +#: fietsboek/templates/details.jinja2:49 msgid "page.details.sharelink.info" msgstr "" -#: fietsboek/templates/details.jinja2:39 +#: fietsboek/templates/details.jinja2:56 msgid "page.details.sharelink.invalidate" msgstr "" -#: fietsboek/templates/details.jinja2:41 +#: fietsboek/templates/details.jinja2:58 msgid "page.details.sharelink.close" msgstr "" -#: fietsboek/templates/details.jinja2:51 +#: fietsboek/templates/details.jinja2:68 msgid "page.details.delete.title" msgstr "" -#: fietsboek/templates/details.jinja2:55 +#: fietsboek/templates/details.jinja2:72 msgid "page.details.delete.info" msgstr "" -#: fietsboek/templates/details.jinja2:60 +#: fietsboek/templates/details.jinja2:77 msgid "page.details.delete.delete" msgstr "" -#: fietsboek/templates/details.jinja2:62 +#: fietsboek/templates/details.jinja2:79 msgid "page.details.delete.close" msgstr "" -#: fietsboek/templates/details.jinja2:81 +#: fietsboek/templates/details.jinja2:98 msgid "page.details.tags" msgstr "" -#: fietsboek/templates/details.jinja2:91 fietsboek/templates/edit.jinja2:10 +#: fietsboek/templates/details.jinja2:108 fietsboek/templates/edit.jinja2:10 #: fietsboek/templates/finish_upload.jinja2:10 msgid "page.noscript" msgstr "" -#: fietsboek/templates/details.jinja2:97 +#: fietsboek/templates/details.jinja2:114 msgid "page.details.download" msgstr "" -#: fietsboek/templates/details.jinja2:187 +#: fietsboek/templates/details.jinja2:204 msgid "page.details.comments" msgstr "" -#: fietsboek/templates/details.jinja2:191 +#: fietsboek/templates/details.jinja2:208 msgid "page.details.comments.author" msgstr "" -#: fietsboek/templates/details.jinja2:208 +#: fietsboek/templates/details.jinja2:225 msgid "page.details.comments.new.title" msgstr "" -#: fietsboek/templates/details.jinja2:211 +#: fietsboek/templates/details.jinja2:228 msgid "page.details.comments.new.input_title" msgstr "" -#: fietsboek/templates/details.jinja2:212 +#: fietsboek/templates/details.jinja2:229 msgid "page.details.comments.new.input_comment" msgstr "" -#: fietsboek/templates/details.jinja2:215 +#: fietsboek/templates/details.jinja2:232 msgid "page.details.comments.new.submit" msgstr "" @@ -650,51 +654,51 @@ msgstr[1] "" msgid "page.home.total" msgstr "" -#: fietsboek/templates/layout.jinja2:43 +#: fietsboek/templates/layout.jinja2:44 msgid "page.navbar.toggle" msgstr "" -#: fietsboek/templates/layout.jinja2:54 +#: fietsboek/templates/layout.jinja2:55 msgid "page.navbar.home" msgstr "" -#: fietsboek/templates/layout.jinja2:57 +#: fietsboek/templates/layout.jinja2:58 msgid "page.navbar.browse" msgstr "" -#: fietsboek/templates/layout.jinja2:61 +#: fietsboek/templates/layout.jinja2:62 msgid "page.navbar.upload" msgstr "" -#: fietsboek/templates/layout.jinja2:70 +#: fietsboek/templates/layout.jinja2:71 msgid "page.navbar.user" msgstr "" -#: fietsboek/templates/layout.jinja2:74 +#: fietsboek/templates/layout.jinja2:75 msgid "page.navbar.welcome_user" msgstr "" -#: fietsboek/templates/layout.jinja2:77 +#: fietsboek/templates/layout.jinja2:78 msgid "page.navbar.logout" msgstr "" -#: fietsboek/templates/layout.jinja2:80 +#: fietsboek/templates/layout.jinja2:81 msgid "page.navbar.profile" msgstr "" -#: fietsboek/templates/layout.jinja2:83 +#: fietsboek/templates/layout.jinja2:84 msgid "page.navbar.user_data" msgstr "" -#: fietsboek/templates/layout.jinja2:87 +#: fietsboek/templates/layout.jinja2:88 msgid "page.navbar.admin" msgstr "" -#: fietsboek/templates/layout.jinja2:93 +#: fietsboek/templates/layout.jinja2:94 msgid "page.navbar.login" msgstr "" -#: fietsboek/templates/layout.jinja2:97 +#: fietsboek/templates/layout.jinja2:98 msgid "page.navbar.create_account" msgstr "" @@ -954,11 +958,11 @@ msgstr "" msgid "transformers.fix-null-elevation.description" msgstr "" -#: fietsboek/transformers/elevation.py:116 +#: fietsboek/transformers/elevation.py:109 msgid "transformers.fix-elevation-jumps" msgstr "" -#: fietsboek/transformers/elevation.py:120 +#: fietsboek/transformers/elevation.py:113 msgid "transformers.fix-elevation-jumps.description" msgstr "" @@ -974,15 +978,15 @@ msgstr "" msgid "flash.a_confirmation_link_has_been_sent" msgstr "" -#: fietsboek/views/admin.py:156 +#: fietsboek/views/admin.py:168 msgid "flash.badge_added" msgstr "" -#: fietsboek/views/admin.py:180 +#: fietsboek/views/admin.py:192 msgid "flash.badge_modified" msgstr "" -#: fietsboek/views/admin.py:200 +#: fietsboek/views/admin.py:212 msgid "flash.badge_deleted" msgstr "" @@ -1038,23 +1042,23 @@ msgstr "" msgid "flash.password_updated" msgstr "" -#: fietsboek/views/detail.py:166 +#: fietsboek/views/detail.py:189 msgid "flash.track_deleted" msgstr "" -#: fietsboek/views/edit.py:100 fietsboek/views/upload.py:66 +#: fietsboek/views/edit.py:97 fietsboek/views/upload.py:63 msgid "flash.invalid_file" msgstr "" -#: fietsboek/views/upload.py:54 +#: fietsboek/views/upload.py:53 msgid "flash.no_file_selected" msgstr "" -#: fietsboek/views/upload.py:194 +#: fietsboek/views/upload.py:182 msgid "flash.upload_success" msgstr "" -#: fietsboek/views/upload.py:213 +#: fietsboek/views/upload.py:201 msgid "flash.upload_cancelled" msgstr "" diff --git a/fietsboek/templates/admin_overview.jinja2 b/fietsboek/templates/admin_overview.jinja2 index 18a7633..e93e997 100644 --- a/fietsboek/templates/admin_overview.jinja2 +++ b/fietsboek/templates/admin_overview.jinja2 @@ -52,7 +52,8 @@ (function() { const data = { labels: [ - {{ _("admin.overview.storage_graph.label.gpx") | tojson }}, + {{ _("admin.overview.storage_graph.label.track_data") | tojson }}, + {{ _("admin.overview.storage_graph.label.backups") | tojson }}, {{ _("admin.overview.storage_graph.label.images") | tojson }}, {{ _("admin.overview.storage_graph.label.previews") | tojson }}, {{ _("admin.overview.storage_graph.label.user_maps") | tojson }} @@ -61,7 +62,8 @@ { label: "MiB", data: [ - {{ (size_breakdown.gpx_files / 1024 / 1024) | tojson }}, + {{ (size_breakdown.track_data / 1024 / 1024) | tojson }}, + {{ (size_breakdown.backups / 1024 / 1024) | tojson }}, {{ (size_breakdown.image_files / 1024 / 1024) | tojson }}, {{ (size_breakdown.preview_files / 1024 / 1024) | tojson }}, {{ (size_breakdown.user_maps / 1024 / 1024) | tojson }} diff --git a/fietsboek/views/admin.py b/fietsboek/views/admin.py index 3f036e2..b743c85 100644 --- a/fietsboek/views/admin.py +++ b/fietsboek/views/admin.py @@ -33,7 +33,8 @@ def _safe_size(path: Path) -> int: class SizeBreakdown: """A breakdown of what objects take how much storage.""" - gpx_files: int = 0 + track_data: int = 0 + backups: int = 0 image_files: int = 0 preview_files: int = 0 user_maps: int = 0 @@ -46,16 +47,16 @@ def _get_size_breakdown(dbsession, data_manager): if dialect == "sqlite": query = text("""SELECT SUM("pgsize") FROM "dbstat" WHERE name='track_points';""") result = dbsession.execute(query).scalar_one() - breakdown.gpx_files += result + breakdown.track_data += result elif dialect == "postgresql": database_name = dbsession.bind.url.database query = text(f"""SELECT pg_relation_size('track_points');""") result = dbsession.execute(query).scalar_one() - breakdown.gpx_files += result + breakdown.track_data += result for track_id in data_manager.list_tracks(): track = data_manager.open(track_id) - breakdown.gpx_files += _safe_size(track.backup_path()) + breakdown.backups += _safe_size(track.backup_path()) breakdown.preview_files += _safe_size(track.preview_path()) for image_id in track.images(): breakdown.image_files += _safe_size(track.image_path(image_id)) -- cgit v1.2.3