aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--fietsboek/locale/de/LC_MESSAGES/messages.mobin14476 -> 14524 bytes
-rw-r--r--fietsboek/locale/de/LC_MESSAGES/messages.po41
-rw-r--r--fietsboek/locale/en/LC_MESSAGES/messages.mobin13505 -> 13551 bytes
-rw-r--r--fietsboek/locale/en/LC_MESSAGES/messages.po38
-rw-r--r--fietsboek/locale/fietslog.pot38
-rw-r--r--fietsboek/models/track.py1
-rw-r--r--fietsboek/templates/home.jinja25
7 files changed, 69 insertions, 54 deletions
diff --git a/fietsboek/locale/de/LC_MESSAGES/messages.mo b/fietsboek/locale/de/LC_MESSAGES/messages.mo
index 10f468c..1a44e6b 100644
--- a/fietsboek/locale/de/LC_MESSAGES/messages.mo
+++ b/fietsboek/locale/de/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/fietsboek/locale/de/LC_MESSAGES/messages.po b/fietsboek/locale/de/LC_MESSAGES/messages.po
index cb62dbb..be0aca1 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: 2023-05-31 20:46+0200\n"
+"POT-Creation-Date: 2023-07-22 14:31+0200\n"
"PO-Revision-Date: 2022-07-02 17:35+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: de\n"
@@ -18,50 +18,54 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.12.1\n"
-#: fietsboek/actions.py:250
+#: fietsboek/actions.py:255
msgid "email.verify_mail.subject"
msgstr "Fietsboek Konto Bestätigung"
-#: fietsboek/actions.py:253
+#: fietsboek/actions.py:258
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:304
+#: fietsboek/util.py:306
msgid "password_constraint.mismatch"
msgstr "Passwörter stimmen nicht überein"
-#: fietsboek/util.py:306
+#: fietsboek/util.py:308
msgid "password_constraint.length"
msgstr "Passwort zu kurz"
-#: fietsboek/models/track.py:579
+#: fietsboek/models/track.py:589
msgid "tooltip.table.length"
msgstr "Länge"
-#: fietsboek/models/track.py:580
+#: fietsboek/models/track.py:590
+msgid "tooltip.table.people"
+msgstr "# Personen"
+
+#: fietsboek/models/track.py:591
msgid "tooltip.table.uphill"
msgstr "Bergauf"
-#: fietsboek/models/track.py:581
+#: fietsboek/models/track.py:592
msgid "tooltip.table.downhill"
msgstr "Bergab"
-#: fietsboek/models/track.py:582
+#: fietsboek/models/track.py:593
msgid "tooltip.table.moving_time"
msgstr "Fahrzeit"
-#: fietsboek/models/track.py:583
+#: fietsboek/models/track.py:594
msgid "tooltip.table.stopped_time"
msgstr "Haltezeit"
-#: fietsboek/models/track.py:585
+#: fietsboek/models/track.py:596
msgid "tooltip.table.max_speed"
msgstr "Maximalgeschwindigkeit"
-#: fietsboek/models/track.py:589
+#: fietsboek/models/track.py:600
msgid "tooltip.table.avg_speed"
msgstr "Durchschnittsgeschwindigkeit"
@@ -500,13 +504,13 @@ msgstr ""
"Links, um sie fortzusetzen:"
#: fietsboek/templates/home.jinja2:31 fietsboek/templates/home.jinja2:38
-#: fietsboek/templates/home.jinja2:56
+#: fietsboek/templates/home.jinja2:59
msgid "page.home.summary.track"
msgid_plural "page.home.summary.tracks"
msgstr[0] "%(num)d Strecke"
msgstr[1] "%(num)d Strecken"
-#: fietsboek/templates/home.jinja2:56
+#: fietsboek/templates/home.jinja2:59
msgid "page.home.total"
msgstr "Gesamt"
@@ -690,8 +694,7 @@ msgstr "Bestätigungsmail Erneut Senden"
#: fietsboek/templates/resend_verification.jinja2:6
msgid "page.resend_verification.info"
-msgstr ""
-"Hier kannst Du eine neue E-Mail zur Bestätigung Deines Kontos anfordern."
+msgstr "Hier kannst Du eine neue E-Mail zur Bestätigung Deines Kontos anfordern."
#: fietsboek/templates/resend_verification.jinja2:12
msgid "page.resend_verification.email"
@@ -873,15 +876,15 @@ msgstr "Strecke gelöscht"
msgid "flash.no_file_selected"
msgstr "Keine Datei ausgewählt"
-#: fietsboek/views/upload.py:62
+#: fietsboek/views/upload.py:65
msgid "flash.invalid_file"
msgstr "Ungültige GPX-Datei gesendet"
-#: fietsboek/views/upload.py:188
+#: fietsboek/views/upload.py:191
msgid "flash.upload_success"
msgstr "Hochladen erfolgreich"
-#: fietsboek/views/upload.py:207
+#: fietsboek/views/upload.py:210
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 df35686..2a6205f 100644
--- a/fietsboek/locale/en/LC_MESSAGES/messages.mo
+++ b/fietsboek/locale/en/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/fietsboek/locale/en/LC_MESSAGES/messages.po b/fietsboek/locale/en/LC_MESSAGES/messages.po
index 1cac820..6c13d78 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: 2023-05-31 20:46+0200\n"
+"POT-Creation-Date: 2023-07-22 14:31+0200\n"
"PO-Revision-Date: 2023-04-03 20:42+0200\n"
"Last-Translator: \n"
"Language: en\n"
@@ -18,50 +18,54 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.12.1\n"
-#: fietsboek/actions.py:250
+#: fietsboek/actions.py:255
msgid "email.verify_mail.subject"
msgstr "Fietsboek Account Verification"
-#: fietsboek/actions.py:253
+#: fietsboek/actions.py:258
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:304
+#: fietsboek/util.py:306
msgid "password_constraint.mismatch"
msgstr "Passwords don't match"
-#: fietsboek/util.py:306
+#: fietsboek/util.py:308
msgid "password_constraint.length"
msgstr "Password not long enough"
-#: fietsboek/models/track.py:579
+#: fietsboek/models/track.py:589
msgid "tooltip.table.length"
msgstr "Length"
-#: fietsboek/models/track.py:580
+#: fietsboek/models/track.py:590
+msgid "tooltip.table.people"
+msgstr "# People"
+
+#: fietsboek/models/track.py:591
msgid "tooltip.table.uphill"
msgstr "Uphill"
-#: fietsboek/models/track.py:581
+#: fietsboek/models/track.py:592
msgid "tooltip.table.downhill"
msgstr "Downhill"
-#: fietsboek/models/track.py:582
+#: fietsboek/models/track.py:593
msgid "tooltip.table.moving_time"
msgstr "Moving Time"
-#: fietsboek/models/track.py:583
+#: fietsboek/models/track.py:594
msgid "tooltip.table.stopped_time"
msgstr "Stopped Time"
-#: fietsboek/models/track.py:585
+#: fietsboek/models/track.py:596
msgid "tooltip.table.max_speed"
msgstr "Max Speed"
-#: fietsboek/models/track.py:589
+#: fietsboek/models/track.py:600
msgid "tooltip.table.avg_speed"
msgstr "Average Speed"
@@ -494,13 +498,13 @@ msgid "page.home.unfinished_uploads"
msgstr "You have unfinished uploads. Click on the links below to resume them:"
#: fietsboek/templates/home.jinja2:31 fietsboek/templates/home.jinja2:38
-#: fietsboek/templates/home.jinja2:56
+#: fietsboek/templates/home.jinja2:59
msgid "page.home.summary.track"
msgid_plural "page.home.summary.tracks"
msgstr[0] "%(num)d track"
msgstr[1] "%(num)d tracks"
-#: fietsboek/templates/home.jinja2:56
+#: fietsboek/templates/home.jinja2:59
msgid "page.home.total"
msgstr "Total"
@@ -861,15 +865,15 @@ msgstr "Track has been deleted"
msgid "flash.no_file_selected"
msgstr "No file selected"
-#: fietsboek/views/upload.py:62
+#: fietsboek/views/upload.py:65
msgid "flash.invalid_file"
msgstr "Invalid GPX file selected"
-#: fietsboek/views/upload.py:188
+#: fietsboek/views/upload.py:191
msgid "flash.upload_success"
msgstr "Upload successful"
-#: fietsboek/views/upload.py:207
+#: fietsboek/views/upload.py:210
msgid "flash.upload_cancelled"
msgstr "Upload cancelled"
diff --git a/fietsboek/locale/fietslog.pot b/fietsboek/locale/fietslog.pot
index 8d43284..f6577af 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: 2023-05-31 20:46+0200\n"
+"POT-Creation-Date: 2023-07-22 14:31+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,47 +17,51 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.12.1\n"
-#: fietsboek/actions.py:250
+#: fietsboek/actions.py:255
msgid "email.verify_mail.subject"
msgstr ""
-#: fietsboek/actions.py:253
+#: fietsboek/actions.py:258
msgid "email.verify.text"
msgstr ""
-#: fietsboek/util.py:304
+#: fietsboek/util.py:306
msgid "password_constraint.mismatch"
msgstr ""
-#: fietsboek/util.py:306
+#: fietsboek/util.py:308
msgid "password_constraint.length"
msgstr ""
-#: fietsboek/models/track.py:579
+#: fietsboek/models/track.py:589
msgid "tooltip.table.length"
msgstr ""
-#: fietsboek/models/track.py:580
+#: fietsboek/models/track.py:590
+msgid "tooltip.table.people"
+msgstr ""
+
+#: fietsboek/models/track.py:591
msgid "tooltip.table.uphill"
msgstr ""
-#: fietsboek/models/track.py:581
+#: fietsboek/models/track.py:592
msgid "tooltip.table.downhill"
msgstr ""
-#: fietsboek/models/track.py:582
+#: fietsboek/models/track.py:593
msgid "tooltip.table.moving_time"
msgstr ""
-#: fietsboek/models/track.py:583
+#: fietsboek/models/track.py:594
msgid "tooltip.table.stopped_time"
msgstr ""
-#: fietsboek/models/track.py:585
+#: fietsboek/models/track.py:596
msgid "tooltip.table.max_speed"
msgstr ""
-#: fietsboek/models/track.py:589
+#: fietsboek/models/track.py:600
msgid "tooltip.table.avg_speed"
msgstr ""
@@ -488,13 +492,13 @@ msgid "page.home.unfinished_uploads"
msgstr ""
#: fietsboek/templates/home.jinja2:31 fietsboek/templates/home.jinja2:38
-#: fietsboek/templates/home.jinja2:56
+#: fietsboek/templates/home.jinja2:59
msgid "page.home.summary.track"
msgid_plural "page.home.summary.tracks"
msgstr[0] ""
msgstr[1] ""
-#: fietsboek/templates/home.jinja2:56
+#: fietsboek/templates/home.jinja2:59
msgid "page.home.total"
msgstr ""
@@ -850,15 +854,15 @@ msgstr ""
msgid "flash.no_file_selected"
msgstr ""
-#: fietsboek/views/upload.py:62
+#: fietsboek/views/upload.py:65
msgid "flash.invalid_file"
msgstr ""
-#: fietsboek/views/upload.py:188
+#: fietsboek/views/upload.py:191
msgid "flash.upload_success"
msgstr ""
-#: fietsboek/views/upload.py:207
+#: fietsboek/views/upload.py:210
msgid "flash.upload_cancelled"
msgstr ""
diff --git a/fietsboek/models/track.py b/fietsboek/models/track.py
index 852eb14..53961c3 100644
--- a/fietsboek/models/track.py
+++ b/fietsboek/models/track.py
@@ -587,6 +587,7 @@ class TrackWithMetadata:
rows = [
(_("tooltip.table.length"), f"{number(round(self.length / 1000, 2))} km"),
+ (_("tooltip.table.people"), str(len(self.track.tagged_people) + 1)),
(_("tooltip.table.uphill"), f"{number(round(self.uphill, 2))} m"),
(_("tooltip.table.downhill"), f"{number(round(self.downhill, 2))} m"),
(_("tooltip.table.moving_time"), f"{self.moving_time}"),
diff --git a/fietsboek/templates/home.jinja2 b/fietsboek/templates/home.jinja2
index 53eefc7..9835cfb 100644
--- a/fietsboek/templates/home.jinja2
+++ b/fietsboek/templates/home.jinja2
@@ -44,7 +44,10 @@
<a href="{{ request.route_url('details', track_id=track.id) }}" data-bs-toggle="tooltip" data-bs-container="body" data-bs-html="true" title="{{ track.html_tooltip(request.localizer) }}">
{{ track.title | default(track.date, true) }}
</a>
- <span class="float-end">{{ (track.length / 1000) | round(2) | format_decimal }} km</span>
+ <span class="float-end">
+ {% if track.tagged_people %}{{ track.tagged_people | length + 1 }} <i class="bi bi-people-fill"></i> &nbsp;{% endif %}
+ {{ (track.length / 1000) | round(2) | format_decimal }} km
+ </span>
</span>
{% endfor %}
</div>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 12:04:41 +0000