From b1ac8ed4fe9b09b550c9e23b722e259c29589e6e Mon Sep 17 00:00:00 2001
From: cubicroot <github@cubicroot.xyz>
Date: Fri, 27 Dec 2024 21:07:50 +0100
Subject: [PATCH] fix locales & move btn to profile
---
src/plainui/jinja2/plainui/profile.html.j2 | 2 ++
src/plainui/jinja2/plainui/user.html.j2 | 3 ---
src/plainui/locale/de/LC_MESSAGES/django.po | 9 +++++----
src/plainui/locale/en/LC_MESSAGES/django.po | 11 ++++++-----
4 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/src/plainui/jinja2/plainui/profile.html.j2 b/src/plainui/jinja2/plainui/profile.html.j2
index 5bdaa3af0..ed0c7bf48 100644
--- a/src/plainui/jinja2/plainui/profile.html.j2
+++ b/src/plainui/jinja2/plainui/profile.html.j2
@@ -10,6 +10,7 @@
{% import "plainui/components/nav.html.j2" as navMacro with context %}
{% import "plainui/components/tagbox.html.j2" as tagMacros %}
{% import "plainui/components/badge_elements.html.j2" as badgeMacros with context %}
+{% import "plainui/components/buttons.html.j2" as btnMacros %}
{% block title %}
{{ conf.name }} - {{ _("Profile") }}
@@ -64,6 +65,7 @@
<h2 class="hub-head-main">{{ _("My Favorites") }}</h2>
<div class="hub-vlayout">
<h2 class="hub-section-title">{{ ("Events") }}</h2>
+ <div class="mb-2">{{ btnMacros.download(_("Schedule__download__ical") , hub_absolute('api:my-events-ical')) }}</div>
<div>{{ list_events.list(my_favorite_events, is_favorite_events, is_fahrplan_events) }}</div>
</div>
diff --git a/src/plainui/jinja2/plainui/user.html.j2 b/src/plainui/jinja2/plainui/user.html.j2
index 9eee9136b..fdf9f232c 100644
--- a/src/plainui/jinja2/plainui/user.html.j2
+++ b/src/plainui/jinja2/plainui/user.html.j2
@@ -6,7 +6,6 @@
{% import "plainui/components/tagbox.html.j2" as tagMacros %}
{% import "plainui/components/list_events.html.j2" as list_events with context %}
{% import "plainui/components/function_btns.html.j2" as fbtns with context %}
-{% import "plainui/components/buttons.html.j2" as btnMacros %}
{% extends "plainui/base.html.j2" %}
@@ -49,8 +48,6 @@
<div class="hub-card">
<div class="hub-vlayout">
<h2 class="hub-head-category">{{ _("Events") }}</h2>
- <div class="mb-2">{{ btnMacros.download(_("Schedule__download__ical") , hub_absolute('api:my-events-ical')) }}</div>
-
{{ list_events.list(events, is_favorite_events) }}
</div>
</div>
diff --git a/src/plainui/locale/de/LC_MESSAGES/django.po b/src/plainui/locale/de/LC_MESSAGES/django.po
index 0a9084c14..ddc0fb14c 100644
--- a/src/plainui/locale/de/LC_MESSAGES/django.po
+++ b/src/plainui/locale/de/LC_MESSAGES/django.po
@@ -995,16 +995,14 @@ msgstr ""
msgid "Your timezone is configured to %(user_timezone)s, conference timezone is %(conf_timezone)s, showing times in your timezone"
msgstr "Deine Zeitzone ist auf %(user_timezone)s konfiguriert, die Konferenz findet jedoch in %(conf_timezone)s statt - zeige die Uhrzeiten in deiner Zeitzone"
-msgid "Now: %(name)"
+#, python-format
+msgid "Now: %(name)s"
msgstr "Jetzt: %(name)s"
#, python-format
msgid "Next (%(time)s): %(name)s"
msgstr "Nächster (%(time)s): %(name)s"
-msgid "Schedule__download__ical"
-msgstr "iCalendar"
-
#, python-format
msgid "%(conf)s - Login"
msgstr ""
@@ -1031,6 +1029,9 @@ msgstr "Nachricht von %(user)s"
msgid "My Dashboard"
msgstr "Mein Dashboard"
+msgid "Schedule__download__ical"
+msgstr "iCalendar"
+
msgid "Project"
msgstr "Projekt"
diff --git a/src/plainui/locale/en/LC_MESSAGES/django.po b/src/plainui/locale/en/LC_MESSAGES/django.po
index c11208969..4378b28ca 100644
--- a/src/plainui/locale/en/LC_MESSAGES/django.po
+++ b/src/plainui/locale/en/LC_MESSAGES/django.po
@@ -995,16 +995,14 @@ msgstr ""
msgid "Your timezone is configured to %(user_timezone)s, conference timezone is %(conf_timezone)s, showing times in your timezone"
msgstr ""
-msgid "Now: %(name)"
-msgstr ""
+#, python-format
+msgid "Now: %(name)s"
+msgstr "Tag %(name)s"
#, python-format
msgid "Next (%(time)s): %(name)s"
msgstr ""
-msgid "Schedule__download__ical"
-msgstr "iCalendar"
-
#, python-format
msgid "%(conf)s - Login"
msgstr ""
@@ -1031,6 +1029,9 @@ msgstr ""
msgid "My Dashboard"
msgstr ""
+msgid "Schedule__download__ical"
+msgstr "iCalendar"
+
msgid "Project"
msgstr ""
--
GitLab