From 8ce084525e275d98af1ed3cb2dbab94df5d9004d Mon Sep 17 00:00:00 2001 From: Helge Jung <hej@c3pb.de> Date: Wed, 4 Sep 2024 22:25:06 +0200 Subject: [PATCH] ensure all hub_absolute() calls follow archive_mode for i18n --- src/core/models/events.py | 2 +- src/core/models/projects.py | 4 ++-- src/core/models/users.py | 2 +- src/plainui/jinja2/plainui/components/function_btns.html | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/core/models/events.py b/src/core/models/events.py index 7d7f35c55..be91551a4 100644 --- a/src/core/models/events.py +++ b/src/core/models/events.py @@ -222,7 +222,7 @@ class Event(TaggedItemMixin, BackendMixin, models.Model): def get_absolute_url(self): from core.templatetags.hub_absolute import hub_absolute - return hub_absolute('plainui:event', event_slug=self.slug, i18n=False) + return hub_absolute('plainui:event', event_slug=self.slug, i18n=settings.ARCHIVE_MODE) @property def public_speakers(self) -> list: diff --git a/src/core/models/projects.py b/src/core/models/projects.py index 4475b0952..e2b808b8c 100644 --- a/src/core/models/projects.py +++ b/src/core/models/projects.py @@ -130,8 +130,8 @@ class Project(TaggedItemMixin, models.Model): from core.templatetags.hub_absolute import hub_absolute if self.assembly: - return hub_absolute('plainui:project', slug=self.slug, i18n=False) - return hub_absolute('plainui:so_project', slug=self.slug, i18n=False) + return hub_absolute('plainui:project', slug=self.slug, i18n=settings.ARCHIVE_MODE) + return hub_absolute('plainui:so_project', slug=self.slug, i18n=settings.ARCHIVE_MODE) def get_state_display(self): return 'blocked' if self.blocked else 'public' if self.is_public else 'private' diff --git a/src/core/models/users.py b/src/core/models/users.py index 178bab197..a0abf1fad 100644 --- a/src/core/models/users.py +++ b/src/core/models/users.py @@ -225,7 +225,7 @@ class PlatformUser(AbstractUser): def get_absolute_url(self): from core.templatetags.hub_absolute import hub_absolute - return hub_absolute('plainui:user', user_slug=self.slug, i18n=False) + return hub_absolute('plainui:user', user_slug=self.slug, i18n=settings.ARCHIVE_MODE) def get_character_layers(self): info = self.avatar_config or {} diff --git a/src/plainui/jinja2/plainui/components/function_btns.html b/src/plainui/jinja2/plainui/components/function_btns.html index 08aeff647..d439e7bd7 100644 --- a/src/plainui/jinja2/plainui/components/function_btns.html +++ b/src/plainui/jinja2/plainui/components/function_btns.html @@ -60,7 +60,7 @@ {%- endmacro %} {% macro share(view_name, title=_("share this "), color="transparent") -%} - <a href="{{ hub_absolute(view_name, i18n=False, **kwargs) }}" class="me-2 btn-icon-big btn btn-{{ color }}" title="{{ title }}" target="_blank"> + <a href="{{ hub_absolute(view_name, i18n=archive_mode, **kwargs) }}" class="me-2 btn-icon-big btn btn-{{ color }}" title="{{ title }}" target="_blank"> <svg width="1.25rem" height="1.25rem" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 500 500" style="enable-background:new 0 0 500 500" fill="currentColor"> <style>.st0{display:none}.st1{display:inline}.st2{fill:none;stroke:#000;stroke-width:18;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10}</style> <path d="M353.7 304.47c-18.9 0-36.76 8.05-49.34 22.15l-94.88-54.78c2.34-6.85 3.52-14 3.52-21.28 0-6.12-.84-12.17-2.5-18.03l97.13-56.08c12.43 12.11 28.71 18.75 46.08 18.75 36.47 0 66.14-29.67 66.14-66.14s-29.67-66.14-66.14-66.14-66.14 29.67-66.14 66.14c0 5.69.74 11.35 2.19 16.86l-97.68 56.4c-12.32-11.56-28.29-17.91-45.21-17.91-36.47 0-66.14 29.67-66.14 66.14s29.67 66.14 66.14 66.14c15.6 0 30.65-5.52 42.58-15.58l99.25 57.3a66.01 66.01 0 0 0-1.14 12.19c0 36.47 29.67 66.14 66.14 66.14s66.14-29.67 66.14-66.14-29.67-66.13-66.14-66.13zm30.77 66.15c0 16.96-13.8 30.77-30.77 30.77s-30.77-13.8-30.77-30.77 13.8-30.77 30.77-30.77 30.77 13.8 30.77 30.77zm-61.53-241.56c0-16.97 13.8-30.77 30.77-30.77s30.77 13.8 30.77 30.77-13.8 30.77-30.77 30.77-30.77-13.8-30.77-30.77zm-145.31 121.5c0 16.96-13.8 30.77-30.77 30.77s-30.77-13.8-30.77-30.77 13.8-30.77 30.77-30.77c16.97.01 30.77 13.81 30.77 30.77z"/> -- GitLab