From e3b36434cb05feb2e6add2b6b229e83b9dccf825 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Thu, 8 Feb 2024 17:56:50 +0100 Subject: [PATCH 1/4] fix(activitypub): handle issue with AP Fetcher not catching some changeset errors Closes #1409 Signed-off-by: Thomas Citharel --- lib/federation/activity_pub/fetcher.ex | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/federation/activity_pub/fetcher.ex b/lib/federation/activity_pub/fetcher.ex index b017256db..425bb9b51 100644 --- a/lib/federation/activity_pub/fetcher.ex +++ b/lib/federation/activity_pub/fetcher.ex @@ -105,6 +105,9 @@ defmodule Mobilizon.Federation.ActivityPub.Fetcher do {:error, %Ecto.Changeset{} = err} -> {:error, err} + {:error, {:error, %Ecto.Changeset{} = err}} -> + {:error, err} + :error -> {:error, :transmogrifier_error} end From 80e3095b4c68c43609eb6559b4fe5b77802e8a7f Mon Sep 17 00:00:00 2001 From: 778a69cd <778a69cd@potsda.mn> Date: Thu, 8 Feb 2024 19:59:43 +0100 Subject: [PATCH 2/4] provide new location for vite manifest, as that changed in vite 5 --- config/config.exs | 2 +- config/e2e.exs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/config.exs b/config/config.exs index 3d180b27f..8e1dab1b8 100644 --- a/config/config.exs +++ b/config/config.exs @@ -134,7 +134,7 @@ config :vite_phx, environment: config_env(), # this manifest is different from the Phoenix "cache_manifest.json"! # optional - vite_manifest: "priv/static/manifest.json", + vite_manifest: "priv/static/.vite/manifest.json", # optional dev_server_address: "http://localhost:5173" diff --git a/config/e2e.exs b/config/e2e.exs index 848d5eaa2..5ee1b8c1c 100644 --- a/config/e2e.exs +++ b/config/e2e.exs @@ -25,7 +25,7 @@ config :vite_phx, release_app: :mobilizon, # Hard code :prod as an environment as :e2e will not be recongnized environment: :prod, - vite_manifest: "priv/static/manifest.json", + vite_manifest: "priv/static/.vite/manifest.json", phx_manifest: "priv/static/cache_manifest.json", dev_server_address: "http://localhost:5173" From f6435e621a808abcc796acbc54861257f5ed79bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bal=C3=A1zs=20Mesk=C3=B3?= Date: Thu, 8 Feb 2024 18:05:17 +0000 Subject: [PATCH 3/4] Translated using Weblate (Hungarian) Currently translated at 92.2% (1518 of 1646 strings) Translation: Mobilizon/Frontend Translate-URL: https://weblate.framasoft.org/projects/mobilizon/frontend/hu/ --- src/i18n/hu.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/i18n/hu.json b/src/i18n/hu.json index f280493c5..38ee1c9f8 100644 --- a/src/i18n/hu.json +++ b/src/i18n/hu.json @@ -457,7 +457,7 @@ "Getting location": "Hely lekérése", "Getting there": "Megközelítés", "Glossary": "Szójegyzék", - "Go": "Menj", + "Go": "Ugrás", "Go to the event page": "Ugrás az esemény oldalára", "Go!": "Gyerünk!", "Google Meet": "Google Meet", @@ -1122,8 +1122,8 @@ "This user doesn't have any profiles": "Ennek a felhasználónak nincsenek profilja", "This user was not found": "Ez a felhasználó nem található", "This website isn't moderated and the data that you enter will be automatically destroyed every day at 00:01 (Paris timezone).": "Ez a weboldal nincs moderálva, és a beírt adatok automatikusan meg lesznek semmisítve minden nap 00:01-kor (Párizs időzóna).", - "This week": "Ez a hét", - "This weekend": "Ez a hétvége", + "This week": "Ezen a héten", + "This weekend": "Ezen a hétvégén", "This will delete / anonymize all content (events, comments, messages, participations…) created from this identity.": "Ez törölni vagy névteleníteni fogja az ezzel a személyazonossággal létrehozott összes tartalmat (eseményeket, hozzászólásokat, üzeneteket, részvételeket…).", "Time in your timezone ({timezone})": "Az idő az Ön időzónájában ({timezone})", "Times in your timezone ({timezone})": "Az idők az Ön időzónájában ({timezone})", From 445ee92f2856a71e45bbe5f2d87b3a247833979c Mon Sep 17 00:00:00 2001 From: drkfrd Date: Thu, 8 Feb 2024 19:25:38 +0000 Subject: [PATCH 4/4] Translated using Weblate (Swedish) Currently translated at 94.5% (86 of 91 strings) Translation: Mobilizon/Activity Translate-URL: https://weblate.framasoft.org/projects/mobilizon/activity/sv/ --- priv/gettext/sv/LC_MESSAGES/activity.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/priv/gettext/sv/LC_MESSAGES/activity.po b/priv/gettext/sv/LC_MESSAGES/activity.po index 083303aee..69c53d136 100644 --- a/priv/gettext/sv/LC_MESSAGES/activity.po +++ b/priv/gettext/sv/LC_MESSAGES/activity.po @@ -8,7 +8,7 @@ ## to merge POT files into PO files. msgid "" msgstr "" -"PO-Revision-Date: 2024-01-19 09:47+0000\n" +"PO-Revision-Date: 2024-02-08 19:29+0000\n" "Last-Translator: drkfrd \n" "Language-Team: Swedish \n" @@ -510,7 +510,7 @@ msgstr "%{profile} nämnde dig i en kommentar under händelsen %{event}." #: lib/service/activity/renderer/conversation.ex:36 #, elixir-autogen, elixir-format msgid "%{profile} replied to your message" -msgstr "%{profil} svarade på ditt meddelande" +msgstr "%{profile} svarade på ditt meddelande" #: lib/web/templates/email/activity/_conversation_activity_item.html.heex:10 #, elixir-autogen, elixir-format, fuzzy @@ -530,7 +530,7 @@ msgstr "%{profile} skickade ett privat meddelande om händelsen %{event}" #: lib/service/activity/renderer/conversation.ex:23 #, elixir-autogen, elixir-format msgid "%{profile} sent you a message" -msgstr "%{profil} skickade ett meddelande till dig" +msgstr "%{profile} skickade ett meddelande till dig" #: lib/web/email/activity.ex:52 #, elixir-autogen, elixir-format